From ec783228a3eb9f29e99eaaa9d2410a5f4f24a62e Mon Sep 17 00:00:00 2001 From: Mark Drilling Date: Tue, 6 Nov 2018 16:38:01 -0600 Subject: [PATCH] Mods for ng-packagr build --- ui/src/app/app-routing.module.ts | 8 +- ui/src/app/app.component.spec.ts | 6 +- ui/src/app/app.module.ts | 12 +- .../add-connection-wizard.component.ts | 36 ++--- .../add-connection.component.ts | 2 +- .../connection-type-card.component.ts | 10 +- .../connection-type-cards.component.ts | 2 +- .../connection-card.component.spec.ts | 6 +- .../connection-card.component.ts | 18 +-- .../connections-cards.component.spec.ts | 6 +- .../connections-cards.component.ts | 8 +- .../connection-details.component.ts | 4 +- .../connections-list.component.spec.ts | 4 +- .../connections-list.component.ts | 14 +- .../connections/connections-routing.module.ts | 6 +- .../connections/connections.component.spec.ts | 30 ++-- .../app/connections/connections.component.ts | 46 +++--- ui/src/app/connections/connections.module.ts | 48 +++--- .../shared/connection-status.spec.ts | 2 +- .../connections/shared/connection-status.ts | 36 ++--- .../shared/connection-type.model.ts | 14 +- .../shared/connection.model.spec.ts | 2 +- .../connections/shared/connection.model.ts | 82 +++++----- .../shared/connection.service.spec.ts | 10 +- .../connections/shared/connection.service.ts | 88 +++++------ .../shared/mock-connection.service.ts | 59 ++++--- .../shared/new-connection.model.ts | 12 +- .../shared/schema-node.model.spec.ts | 2 +- .../connections/shared/schema-node.model.ts | 38 ++--- .../service-catalog-source.model.spec.ts | 2 +- .../shared/service-catalog-source.model.ts | 30 ++-- .../about-dialog.component.spec.ts | 12 +- .../about-dialog/about-dialog.component.ts | 8 +- ui/src/app/core/about-dialog/about.model.ts | 2 +- .../core/about-dialog/about.service.spec.ts | 8 +- ui/src/app/core/about-dialog/about.service.ts | 10 +- .../core/about-dialog/mock-about.service.ts | 8 +- ui/src/app/core/api.service.spec.ts | 8 +- ui/src/app/core/api.service.ts | 8 +- ui/src/app/core/app-settings.service.spec.ts | 2 +- ui/src/app/core/app-settings.service.ts | 20 +-- ui/src/app/core/core.module.ts | 34 ++-- ui/src/app/core/logger.service.spec.ts | 2 +- ui/src/app/core/logger.service.ts | 12 +- ui/src/app/core/mock-app-settings.service.ts | 6 +- ui/src/app/core/selection.service.ts | 34 ++-- ui/src/app/core/utils/array-utils.ts | 8 +- .../vertical-nav.component.spec.ts | 12 +- .../vertical-nav/vertical-nav.component.ts | 10 +- .../create-views-dialog.component.spec.ts | 18 +-- .../create-views-dialog.component.ts | 38 ++--- .../create-views-result.model.ts | 14 +- .../create-views-dialog/new-view.model.ts | 22 +-- .../dataservice-card.component.spec.ts | 20 +-- .../dataservice-card.component.ts | 30 ++-- .../dataservices-cards.component.spec.ts | 8 +- .../dataservices-cards.component.ts | 10 +- .../dataservices-details.component.ts | 4 +- .../dataservices-list.component.spec.ts | 22 +-- .../dataservices-list.component.ts | 16 +- .../views-content.component.ts | 16 +- .../dataservices-routing.module.ts | 8 +- .../dataservices.component.spec.ts | 40 ++--- .../dataservices/dataservices.component.ts | 108 ++++++------- .../app/dataservices/dataservices.module.ts | 88 +++++------ .../odata-control/odata-control.component.ts | 30 ++-- .../odata-control/odata-entity.model.ts | 2 +- .../odata-control/odata-where.model.ts | 2 +- .../dataservices/odata-control/odata.model.ts | 6 +- .../selected-node.component.spec.ts | 2 +- .../selected-node/selected-node.component.ts | 4 +- .../selected-nodes-list.component.spec.ts | 2 +- .../selected-nodes-list.component.ts | 5 +- .../set-description-dialog.component.spec.ts | 4 +- .../set-description-dialog.component.ts | 4 +- .../dataservices/shared/column-data.model.ts | 8 +- .../dataservices/shared/column.model.spec.ts | 2 +- .../app/dataservices/shared/column.model.ts | 22 +-- .../shared/composition-operator.enum.ts | 19 --- .../shared/composition-type.enum.ts | 17 -- .../shared/composition.model.spec.ts | 6 +- .../dataservices/shared/composition.model.ts | 54 ++++--- .../shared/connection-summary.model.spec.ts | 2 +- .../shared/connection-summary.model.ts | 20 +-- .../shared/dataservice.model.spec.ts | 6 +- .../dataservices/shared/dataservice.model.ts | 84 +++++----- .../shared/dataservice.service.spec.ts | 14 +- .../shared/dataservice.service.ts | 118 ++++++-------- .../shared/mock-dataservice.service.ts | 64 ++++---- .../dataservices/shared/mock-vdb.service.ts | 81 ++++------ .../shared/new-dataservice.model.ts | 8 +- .../app/dataservices/shared/node-selector.ts | 6 +- .../dataservices/shared/notifier.service.ts | 20 +-- ui/src/app/dataservices/shared/path-utils.ts | 16 +- .../shared/projected-column.model.spec.ts | 2 +- .../shared/projected-column.model.ts | 14 +- .../shared/query-results.model.spec.ts | 2 +- .../shared/query-results.model.ts | 16 +- .../app/dataservices/shared/row-data.model.ts | 4 +- .../app/dataservices/shared/sql-view.model.ts | 4 +- .../shared/vdb-model-source.model.ts | 28 ++-- .../dataservices/shared/vdb-model.model.ts | 24 +-- .../shared/vdb-status.model.spec.ts | 2 +- .../dataservices/shared/vdb-status.model.ts | 34 ++-- ui/src/app/dataservices/shared/vdb.model.ts | 44 +++--- .../dataservices/shared/vdb.service.spec.ts | 10 +- ui/src/app/dataservices/shared/vdb.service.ts | 107 ++++++------- .../shared/view-definition.model.spec.ts | 6 +- .../shared/view-definition.model.ts | 117 ++++++++------ .../shared/view-editor-state.model.spec.ts | 6 +- .../shared/view-editor-state.model.ts | 27 ++-- .../dataservices/shared/virt-route.model.ts | 20 +-- .../shared/virtualization.model.spec.ts | 4 +- .../shared/virtualization.model.ts | 26 ++-- .../sql-control/sql-control.component.spec.ts | 22 +-- .../sql-control/sql-control.component.ts | 18 +-- .../test-dataservice.component.spec.ts | 24 +-- .../test-dataservice.component.ts | 16 +- .../add-composition-wizard.component.spec.ts | 16 +- .../add-composition-wizard.component.ts | 67 ++++---- .../command/add-composition-command.ts | 25 +-- .../command/add-sources-command.ts | 25 +-- .../command/command-factory.spec.ts | 14 +- .../view-editor/command/command-factory.ts | 69 ++++----- .../view-editor/command/command.ts | 28 +--- .../view-editor/command/no-op-command.ts | 17 +- .../command/remove-composition-command.ts | 24 ++- .../command/remove-sources-command.ts | 22 ++- .../command/undo-redo/undo-manager.spec.ts | 10 +- .../command/undo-redo/undo-manager.ts | 34 ++-- .../command/undo-redo/undo-node.ts | 12 +- .../command/undo-redo/undoable.spec.ts | 6 +- .../view-editor/command/undo-redo/undoable.ts | 14 +- .../update-projected-columns-command.ts | 31 ++-- .../update-view-description-command.ts | 16 +- .../command/update-view-name-command.ts | 16 +- .../connection-table-dialog.component.spec.ts | 16 +- .../connection-table-dialog.component.ts | 18 +-- ...connection-tree-selector.component.spec.ts | 16 +- .../connection-tree-selector.component.ts | 6 +- .../create-view-dialog.component.spec.ts | 12 +- .../create-view-dialog.component.ts | 12 +- .../editor-views.component.spec.ts | 26 ++-- .../editor-views/editor-views.component.ts | 12 +- .../message-log/message-log.component.spec.ts | 22 +-- .../message-log/message-log.component.ts | 10 +- .../editor-views/message-log/message.ts | 32 ++-- .../editor-views/message-log/problem.ts | 10 +- .../view-preview.component.spec.ts | 22 +-- .../view-preview/view-preview.component.ts | 32 ++-- .../event/view-editor-event-type.enum.ts | 10 +- .../view-editor/event/view-editor-event.ts | 64 ++++---- .../view-editor/view-canvas/canvas.service.ts | 12 +- .../view-canvas/event/view-canvas-event.ts | 17 +- .../view-canvas/models/canvas-graph.ts | 6 +- .../view-canvas/models/canvas-link.ts | 2 +- .../view-canvas/models/canvas-node.spec.ts | 2 +- .../view-canvas/models/canvas-node.ts | 8 +- .../view-canvas/view-canvas.component.spec.ts | 36 ++--- .../view-canvas/view-canvas.component.ts | 64 ++++---- .../visuals/graph/graph-visual.component.ts | 4 +- .../visuals/link/link-visual.component.ts | 2 +- .../visuals/node/node-visual.component.ts | 6 +- .../view-editor-header.component.spec.ts | 24 +-- .../view-editor-header.component.ts | 6 +- .../view-editor/view-editor.component.spec.ts | 40 ++--- .../view-editor/view-editor.component.ts | 88 +++++------ .../view-editor/view-editor.service.spec.ts | 20 +-- .../view-editor/view-editor.service.ts | 145 +++++++++--------- ...projected-columns-editor.component.spec.ts | 20 +-- .../projected-columns-editor.component.ts | 40 ++--- .../property-editor.component.spec.ts | 20 +-- .../property-editor.component.ts | 19 ++- .../property-editor/selection-item.model.ts | 20 +-- .../view-property-editors.component.spec.ts | 24 +-- .../view-property-editors.component.ts | 10 +- .../view-editor/view-validator.ts | 12 +- .../views-list/views-list.component.spec.ts | 32 ++-- .../views-list/views-list.component.ts | 70 ++++----- ui/src/app/shared/abstract-page.component.ts | 7 +- ui/src/app/shared/id-filter.ts | 10 +- ui/src/app/shared/identifiable.ts | 9 +- .../page-error/page-error.component.spec.ts | 2 +- .../shared/page-error/page-error.component.ts | 3 - .../page-not-found.component.spec.ts | 2 +- .../property-control-type.enum.ts | 50 +++--- .../property-definition.model.ts | 60 ++++---- .../property-form-property.component.html | 2 +- .../property-form-property.component.spec.ts | 2 +- .../property-form-property.component.ts | 21 ++- .../property-form.component.spec.ts | 4 +- .../property-form/property-form.component.ts | 4 +- ui/src/app/shared/shared.module.ts | 4 +- ui/src/app/shared/test-data.service.spec.ts | 2 +- ui/src/app/shared/test-data.service.ts | 66 ++++---- ui/src/environments/environment.prod.ts | 2 +- ui/src/environments/environment.ts | 2 +- 197 files changed, 2025 insertions(+), 2256 deletions(-) diff --git a/ui/src/app/app-routing.module.ts b/ui/src/app/app-routing.module.ts index e6757aaa..1b99a4a1 100644 --- a/ui/src/app/app-routing.module.ts +++ b/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" }, diff --git a/ui/src/app/app.component.spec.ts b/ui/src/app/app.component.spec.ts index 4719131d..09b4d446 100644 --- a/ui/src/app/app.component.spec.ts +++ b/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"; diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts index a5548801..5338036d 100644 --- a/ui/src/app/app.module.ts +++ b/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: [ diff --git a/ui/src/app/connections/add-connection-wizard/add-connection-wizard.component.ts b/ui/src/app/connections/add-connection-wizard/add-connection-wizard.component.ts index 34069984..7433fe8a 100644 --- a/ui/src/app/connections/add-connection-wizard/add-connection-wizard.component.ts +++ b/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; diff --git a/ui/src/app/connections/add-connection/add-connection.component.ts b/ui/src/app/connections/add-connection/add-connection.component.ts index 947a782d..740c1c43 100644 --- a/ui/src/app/connections/add-connection/add-connection.component.ts +++ b/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", diff --git a/ui/src/app/connections/connection-type-cards/connection-type-card/connection-type-card.component.ts b/ui/src/app/connections/connection-type-cards/connection-type-card/connection-type-card.component.ts index d3cb6f56..cd53246e 100644 --- a/ui/src/app/connections/connection-type-cards/connection-type-card/connection-type-card.component.ts +++ b/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; diff --git a/ui/src/app/connections/connection-type-cards/connection-type-cards.component.ts b/ui/src/app/connections/connection-type-cards/connection-type-cards.component.ts index 42a02a65..a883b5d6 100644 --- a/ui/src/app/connections/connection-type-cards/connection-type-cards.component.ts +++ b/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, diff --git a/ui/src/app/connections/connections-cards/connection-card/connection-card.component.spec.ts b/ui/src/app/connections/connections-cards/connection-card/connection-card.component.spec.ts index 15988489..5a8ce21c 100644 --- a/ui/src/app/connections/connections-cards/connection-card/connection-card.component.spec.ts +++ b/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, diff --git a/ui/src/app/connections/connections-cards/connection-card/connection-card.component.ts b/ui/src/app/connections/connections-cards/connection-card/connection-card.component.ts index 5e59ddc1..998bb934 100644 --- a/ui/src/app/connections/connections-cards/connection-card/connection-card.component.ts +++ b/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,7 +152,7 @@ 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; @@ -160,7 +160,7 @@ export class ConnectionCardComponent implements DoCheck, OnInit { } /** - * @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"; diff --git a/ui/src/app/connections/connections-cards/connections-cards.component.spec.ts b/ui/src/app/connections/connections-cards/connections-cards.component.spec.ts index a328495f..6ab287d7 100644 --- a/ui/src/app/connections/connections-cards/connections-cards.component.spec.ts +++ b/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, diff --git a/ui/src/app/connections/connections-cards/connections-cards.component.ts b/ui/src/app/connections/connections-cards/connections-cards.component.ts index a10e23ed..25b07a40 100644 --- a/ui/src/app/connections/connections-cards/connections-cards.component.ts +++ b/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; diff --git a/ui/src/app/connections/connections-list/connection-details.component.ts b/ui/src/app/connections/connections-list/connection-details.component.ts index 1f1e53c7..346a40f8 100644 --- a/ui/src/app/connections/connections-list/connection-details.component.ts +++ b/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({ diff --git a/ui/src/app/connections/connections-list/connections-list.component.spec.ts b/ui/src/app/connections/connections-list/connections-list.component.spec.ts index e7a5994d..8e16c792 100644 --- a/ui/src/app/connections/connections-list/connections-list.component.spec.ts +++ b/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, diff --git a/ui/src/app/connections/connections-list/connections-list.component.ts b/ui/src/app/connections/connections-list/connections-list.component.ts index dec9b139..63df5469 100644 --- a/ui/src/app/connections/connections-list/connections-list.component.ts +++ b/ui/src/app/connections/connections-list/connections-list.component.ts @@ -17,7 +17,7 @@ import { Component, EventEmitter, Input, OnInit, Output, TemplateRef, ViewEncapsulation } from "@angular/core"; import { Router } from "@angular/router"; -import { Connection } from "@connections/shared/connection.model"; +import { Connection } from "../../connections/shared/connection.model"; import { Action, ActionConfig, ListConfig } from "patternfly-ng"; @Component({ @@ -74,7 +74,7 @@ export class ConnectionsListComponent implements OnInit { * @param editActionTemplate {TemplateRef} the edit action template * @param activateActionTemplate {TemplateRef} the activate action template * @param deleteActionTemplate {TemplateRef} the delete action template - * @returns {ActionConfig} the actions configuration + * @returns the actions configuration */ public getActionConfig( connection: Connection, editActionTemplate: TemplateRef< any >, @@ -125,7 +125,7 @@ export class ConnectionsListComponent implements OnInit { /** * Event handler for when a toolbar icon or kebab action is clicked. - * @param {Action} action the action that was selected. + * @param action the action that was selected. * @param item this parameter is not used */ public handleAction( action: Action, @@ -144,28 +144,28 @@ export class ConnectionsListComponent implements OnInit { } /** - * @returns {boolean} `true` if the connection row is selected in the list + * @returns `true` if the connection row is selected in the list */ public isSelected( connection: Connection ): boolean { return this.selectedConnections.indexOf( connection ) !== -1; } /** - * @param {string} connectionName the name of the connection to activate + * @param connectionName the name of the connection to activate */ public onActivateConnection(connectionName: string): void { this.activateConnection.emit(connectionName); } /** - * @param {string} connectionName the name of the connection to delete + * @param connectionName the name of the connection to delete */ public onDeleteConnection(connectionName: string): void { this.deleteConnection.emit(connectionName); } /** - * @param {string} connectionName the name of the connection to edit + * @param connectionName the name of the connection to edit */ public onEditConnection( connectionName: string ): void { this.editConnection.emit( connectionName ); diff --git a/ui/src/app/connections/connections-routing.module.ts b/ui/src/app/connections/connections-routing.module.ts index 2ad68d98..66e545e3 100644 --- a/ui/src/app/connections/connections-routing.module.ts +++ b/ui/src/app/connections/connections-routing.module.ts @@ -18,9 +18,9 @@ import { NgModule } from "@angular/core"; import { RouterModule } from "@angular/router"; import { Routes } from "@angular/router"; -import { AddConnectionComponent } from "@connections/add-connection/add-connection.component"; -import { ConnectionsComponent } from "@connections/connections.component"; -import { ConnectionsConstants } from "@connections/shared/connections-constants"; +import { AddConnectionComponent } from "../connections/add-connection/add-connection.component"; +import { ConnectionsComponent } from "../connections/connections.component"; +import { ConnectionsConstants } from "../connections/shared/connections-constants"; const connectionsRoutes: Routes = [ { path: ConnectionsConstants.connectionsRootRoute, component: ConnectionsComponent }, diff --git a/ui/src/app/connections/connections.component.spec.ts b/ui/src/app/connections/connections.component.spec.ts index d7c202cb..0ea0230e 100644 --- a/ui/src/app/connections/connections.component.spec.ts +++ b/ui/src/app/connections/connections.component.spec.ts @@ -3,20 +3,20 @@ import { FormsModule } from "@angular/forms"; import { HttpModule } from "@angular/http"; import { By } from "@angular/platform-browser"; 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 { ConnectionDetailsComponent } from "@connections/connections-list/connection-details.component"; -import { ConnectionsListComponent } from "@connections/connections-list/connections-list.component"; -import { ConnectionsComponent } from "@connections/connections.component"; -import { ConnectionService } from "@connections/shared/connection.service"; -import { MockConnectionService } from "@connections/shared/mock-connection.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { CoreModule } from "@core/core.module"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { SharedModule } from "@shared/shared.module"; +import { ConnectionCardComponent } from "../connections/connections-cards/connection-card/connection-card.component"; +import { ConnectionsCardsComponent } from "../connections/connections-cards/connections-cards.component"; +import { ConnectionDetailsComponent } from "../connections/connections-list/connection-details.component"; +import { ConnectionsListComponent } from "../connections/connections-list/connections-list.component"; +import { ConnectionsComponent } from "../connections/connections.component"; +import { ConnectionService } from "../connections/shared/connection.service"; +import { MockConnectionService } from "../connections/shared/mock-connection.service"; +import { AppSettingsService } from "../core/app-settings.service"; +import { CoreModule } from "../core/core.module"; +import { MockAppSettingsService } from "../core/mock-app-settings.service"; +import { MockVdbService } from "../dataservices/shared/mock-vdb.service"; +import { NotifierService } from "../dataservices/shared/notifier.service"; +import { VdbService } from "../dataservices/shared/vdb.service"; +import { SharedModule } from "../shared/shared.module"; import { ModalModule } from "ngx-bootstrap"; import { ActionModule, @@ -28,7 +28,7 @@ import { SortModule, WizardModule } from "patternfly-ng"; -import { SelectionService } from "@core/selection.service"; +import { SelectionService } from "../core/selection.service"; describe("ConnectionsComponent", () => { let component: ConnectionsComponent; diff --git a/ui/src/app/connections/connections.component.ts b/ui/src/app/connections/connections.component.ts index 691ba3d6..81e11e32 100644 --- a/ui/src/app/connections/connections.component.ts +++ b/ui/src/app/connections/connections.component.ts @@ -17,16 +17,16 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; -import { ConnectionStatus } from "@connections/shared/connection-status"; -import { Connection } from "@connections/shared/connection.model"; -import { ConnectionService } from "@connections/shared/connection.service"; -import { ConnectionsConstants } from "@connections/shared/connections-constants"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { AbstractPageComponent } from "@shared/abstract-page.component"; -import { ConfirmDialogComponent } from "@shared/confirm-dialog/confirm-dialog.component"; -import { LayoutType } from "@shared/layout-type.enum"; +import { ConnectionStatus } from "../connections/shared/connection-status"; +import { Connection } from "../connections/shared/connection.model"; +import { ConnectionService } from "../connections/shared/connection.service"; +import { ConnectionsConstants } from "../connections/shared/connections-constants"; +import { AppSettingsService } from "../core/app-settings.service"; +import { LoggerService } from "../core/logger.service"; +import { NotifierService } from "../dataservices/shared/notifier.service"; +import { AbstractPageComponent } from "../shared/abstract-page.component"; +import { ConfirmDialogComponent } from "../shared/confirm-dialog/confirm-dialog.component"; +import { LayoutType } from "../shared/layout-type.enum"; import { BsModalService } from "ngx-bootstrap"; import { SortField } from "patternfly-ng"; import { SortEvent } from "patternfly-ng"; @@ -37,7 +37,7 @@ import { FilterField } from "patternfly-ng"; import { FilterConfig } from "patternfly-ng"; import { ActionConfig, EmptyStateConfig, Filter } from "patternfly-ng"; import { Subscription } from "rxjs/Subscription"; -import { SelectionService } from "@core/selection.service"; +import { SelectionService } from "../core/selection.service"; @Component({ moduleId: module.id, @@ -173,42 +173,42 @@ export class ConnectionsComponent extends AbstractPageComponent implements OnIni } /** - * @returns {boolean} true if connections are being represented by cards + * @returns true if connections are being represented by cards */ public get isCardLayout(): boolean { return this.appSettingsService.connectionsPageLayout === LayoutType.CARD; } /** - * @returns {boolean} true if connections are being represented by items in a list + * @returns true if connections are being represented by items in a list */ public get isListLayout(): boolean { return this.appSettingsService.connectionsPageLayout === LayoutType.LIST; } /** - * @returns {Connection[]} the array of all connections + * @returns the array of all connections */ public get allConnections(): Connection[] { return this.allConns; } /** - * @returns {boolean} 'true' if any connections are available + * @returns 'true' if any connections are available */ public get hasConnections(): boolean { return this.allConns.length > 0; } /** - * @returns {Connection[]} the array of filtered connections + * @returns the array of filtered connections */ public get filteredConnections(): Connection[] { return this.filteredConns; } /** - * @returns {Connection[]} the array of selected connections + * @returns the array of selected connections */ public get selectedConnections(): Connection[] { return this.selectedConns; @@ -268,7 +268,7 @@ export class ConnectionsComponent extends AbstractPageComponent implements OnIni /** * Handle Edit of the specified Connection - * @param {string} connName + * @param connName */ public onEdit(connName: string): void { const selectedConnection = this.filteredConnections.find((x) => x.getId() === connName); @@ -286,7 +286,7 @@ export class ConnectionsComponent extends AbstractPageComponent implements OnIni /** * Handle Activation of the specified Connection. The activate actions taken depend on the vdb * and schema states. - * @param {string} connName + * @param connName */ public onActivate(connName: string): void { const selectedConnection = this.filteredConnections.find((x) => x.getId() === connName); @@ -418,7 +418,7 @@ export class ConnectionsComponent extends AbstractPageComponent implements OnIni /** * Delete the specified connection's VDB from the repo (if it exists) and undeploy it from teiid (if it exists) - * @param {string} connectionId + * @param connectionId */ private deleteUndeployConnectionVdb(connectionId: string): void { const self = this; @@ -436,7 +436,7 @@ export class ConnectionsComponent extends AbstractPageComponent implements OnIni /** * Remove the specified connection from the connections list - * @param {Connection} connection + * @param connection */ private removeConnectionFromList(connection: Connection): void { this.allConns.splice(this.allConns.indexOf(connection), 1); @@ -490,8 +490,8 @@ export class ConnectionsComponent extends AbstractPageComponent implements OnIni /** * Determine if a connection with the supplied name exists in the current connections - * @param {string} connName the connection name - * @returns {boolean} 'true' if connection exists + * @param connName the connection name + * @returns 'true' if connection exists */ private connectionExists(connName: string): boolean { let connFound = false; diff --git a/ui/src/app/connections/connections.module.ts b/ui/src/app/connections/connections.module.ts index 09a347f8..c49021c6 100644 --- a/ui/src/app/connections/connections.module.ts +++ b/ui/src/app/connections/connections.module.ts @@ -20,24 +20,24 @@ import { NgModule } from "@angular/core"; import { FormsModule, ReactiveFormsModule } from "@angular/forms"; import { Http } from "@angular/http"; import { RouterModule } from "@angular/router"; -import { AddConnectionWizardComponent } from "@connections/add-connection-wizard/add-connection-wizard.component"; -import { AddConnectionComponent } from "@connections/add-connection/add-connection.component"; -import { ConnectionCardComponent } from "@connections/connections-cards/connection-card/connection-card.component"; -import { ConnectionsCardsComponent } from "@connections/connections-cards/connections-cards.component"; -import { ConnectionDetailsComponent } from "@connections/connections-list/connection-details.component"; -import { ConnectionsListComponent } from "@connections/connections-list/connections-list.component"; -import { ConnectionsRoutingModule } from "@connections/connections-routing.module"; -import { ConnectionsComponent } from "@connections/connections.component"; -import { ConnectionService } from "@connections/shared/connection.service"; -import { MockConnectionService } from "@connections/shared/mock-connection.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { CoreModule } from "@core/core.module"; -import { LoggerService } from "@core/logger.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { environment } from "@environments/environment"; -import { ConfirmDialogComponent } from "@shared/confirm-dialog/confirm-dialog.component"; -import { SharedModule } from "@shared/shared.module"; +import { AddConnectionWizardComponent } from "../connections/add-connection-wizard/add-connection-wizard.component"; +import { AddConnectionComponent } from "../connections/add-connection/add-connection.component"; +import { ConnectionCardComponent } from "../connections/connections-cards/connection-card/connection-card.component"; +import { ConnectionsCardsComponent } from "../connections/connections-cards/connections-cards.component"; +import { ConnectionDetailsComponent } from "../connections/connections-list/connection-details.component"; +import { ConnectionsListComponent } from "../connections/connections-list/connections-list.component"; +import { ConnectionsRoutingModule } from "../connections/connections-routing.module"; +import { ConnectionsComponent } from "../connections/connections.component"; +import { ConnectionService } from "../connections/shared/connection.service"; +import { MockConnectionService } from "../connections/shared/mock-connection.service"; +import { AppSettingsService } from "../core/app-settings.service"; +import { CoreModule } from "../core/core.module"; +import { LoggerService } from "../core/logger.service"; +import { NotifierService } from "../dataservices/shared/notifier.service"; +import { VdbService } from "../dataservices/shared/vdb.service"; +import { environment } from "../../environments/environment"; +import { ConfirmDialogComponent } from "../shared/confirm-dialog/confirm-dialog.component"; +import { SharedModule } from "../shared/shared.module"; import { ActionModule, CardModule, @@ -100,12 +100,12 @@ export class ConnectionsModule { } /** * A factory that produces the appropriate instande of the service based on current environment settings. * - * @param {Http} http the HTTP service - * @param {VdbService} vdbService the vdb service - * @param {NotifierService} notifierService the notifier service - * @param {AppSettingsService} appSettings the app settings service - * @param {LoggerService} logger the logger - * @returns {ConnectionService} the requested service + * @param http the HTTP service + * @param vdbService the vdb service + * @param notifierService the notifier service + * @param appSettings the app settings service + * @param logger the logger + * @returns the requested service */ export function connectionServiceFactory( http: Http, vdbService: VdbService, diff --git a/ui/src/app/connections/shared/connection-status.spec.ts b/ui/src/app/connections/shared/connection-status.spec.ts index 07b58a53..54c98858 100644 --- a/ui/src/app/connections/shared/connection-status.spec.ts +++ b/ui/src/app/connections/shared/connection-status.spec.ts @@ -1,4 +1,4 @@ -import { ConnectionStatus } from "@connections/shared/connection-status"; +import { ConnectionStatus } from "../../connections/shared/connection-status"; describe("ConnectionStatus", () => { let connectionStatus: ConnectionStatus; diff --git a/ui/src/app/connections/shared/connection-status.ts b/ui/src/app/connections/shared/connection-status.ts index 39da3c47..43551ec2 100644 --- a/ui/src/app/connections/shared/connection-status.ts +++ b/ui/src/app/connections/shared/connection-status.ts @@ -31,8 +31,8 @@ export class ConnectionStatus { private vdbState: string; /** - * @param {Object} json the JSON representation of a connection status - * @returns {ConnectionStatus} the new connection status (never null) + * @param json the JSON representation of a connection status + * @returns the new connection status (never null) */ public static create( json: object = {} ): ConnectionStatus { const status = new ConnectionStatus(); @@ -42,8 +42,8 @@ export class ConnectionStatus { /** * Creates a Loading status - * @param {string} connName the connection name - * @returns {ConnectionStatus} the new connection status (never null) + * @param connName the connection name + * @returns the new connection status (never null) */ public static createLoadingStatus( connName: string ): ConnectionStatus { const status = new ConnectionStatus(); @@ -58,91 +58,91 @@ export class ConnectionStatus { } /** - * @returns {string} the connection name or `null` if not set + * @returns the connection name or `null` if not set */ public getConnectionName(): string { return this.connectionName; } /** - * @returns {string[]} the errors or `null` if not set + * @returns the errors or `null` if not set */ public getErrors(): string[] { return this.errors; } /** - * @returns {string} the schema model name or `null` if not set + * @returns the schema model name or `null` if not set */ public getSchemaModelName(): string { return this.schemaModelName; } /** - * @returns {string} the schema VDB name or `null` if not set + * @returns the schema VDB name or `null` if not set */ public getSchemaVdbName(): string { return this.schemaVdbName; } /** - * @returns {string} the deployed VDB name or `null` if not set + * @returns the deployed VDB name or `null` if not set */ public getServerVdbName(): string { return this.vdbName; } /** - * @returns {boolean} `true` if the workspace schema is available + * @returns `true` if the workspace schema is available */ public isSchemaAvailable(): boolean { return this.schemaState && this.schemaState.toUpperCase() === this.activeState; } /** - * @returns {boolean} `true` if the workspace schema is in a failed state + * @returns `true` if the workspace schema is in a failed state */ public isSchemaFailed(): boolean { return this.schemaState && this.schemaState.toUpperCase() === this.failedState; } /** - * @returns {boolean} `true` if the workspace schema is loading + * @returns `true` if the workspace schema is loading */ public isSchemaLoading(): boolean { return this.schemaState && this.schemaState.toUpperCase() === this.loadingState; } /** - * @returns {boolean} `true` if the workspace schema is missing + * @returns `true` if the workspace schema is missing */ public isSchemaMissing(): boolean { return this.schemaState && this.schemaState.toUpperCase() === this.missingState; } /** - * @returns {boolean} `true` if the server VDB is active + * @returns `true` if the server VDB is active */ public isServerVdbActive(): boolean { return this.vdbState && this.vdbState.toUpperCase() === this.activeState; } /** - * @returns {boolean} `true` if the server VDB is in a failed state + * @returns `true` if the server VDB is in a failed state */ public isServerVdbFailed(): boolean { return this.vdbState && this.vdbState.toUpperCase() === this.failedState; } /** - * @returns {boolean} `true` if the server VDB is loading + * @returns `true` if the server VDB is loading */ public isServerVdbLoading(): boolean { return this.vdbState && this.vdbState.toUpperCase() === this.loadingState; } /** - * @returns {boolean} `true` if the server VDB is missing + * @returns `true` if the server VDB is missing */ public isServerVdbMissing(): boolean { return this.vdbState && this.vdbState.toUpperCase() === this.missingState; @@ -150,7 +150,7 @@ export class ConnectionStatus { /** * Set all object values using the supplied connection status JSON. - * @param {Object} json the JSON + * @param json the JSON */ public setValues( json: object = {} ): void { Object.assign( this, json ); diff --git a/ui/src/app/connections/shared/connection-type.model.ts b/ui/src/app/connections/shared/connection-type.model.ts index 8cfbf9b2..964f591b 100644 --- a/ui/src/app/connections/shared/connection-type.model.ts +++ b/ui/src/app/connections/shared/connection-type.model.ts @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { ConnectionsConstants } from "@connections/shared/connections-constants"; +import { ConnectionsConstants } from "../../connections/shared/connections-constants"; export class ConnectionType { private name: string; @@ -25,21 +25,21 @@ export class ConnectionType { } /** - * @returns {string} the ConnectionType name + * @returns the ConnectionType name */ public getName(): string { return this.name; } /** - * @returns {string} the ConnectionType description + * @returns the ConnectionType description */ public getDescription(): string { return this.description; } /** - * @returns {string} the alternate image text for the ConnectionType + * @returns the alternate image text for the ConnectionType */ public getImageAlt(): string { const name = this.getName(); @@ -58,7 +58,7 @@ export class ConnectionType { } /** - * @returns {string} the image location for the ConnectionType + * @returns the image location for the ConnectionType */ public getImageSrc(): string { const name = this.getName(); @@ -77,14 +77,14 @@ export class ConnectionType { } /** - * @param {string} name the ConnectionType name + * @param name the ConnectionType name */ public setName( name?: string ): void { this.name = name ? name : null; } /** - * @param {string} description the ConnectionType description + * @param description the ConnectionType description */ public setDescription( description?: string ): void { this.description = description ? description : null; diff --git a/ui/src/app/connections/shared/connection.model.spec.ts b/ui/src/app/connections/shared/connection.model.spec.ts index 68db8c61..4a0ca9e6 100644 --- a/ui/src/app/connections/shared/connection.model.spec.ts +++ b/ui/src/app/connections/shared/connection.model.spec.ts @@ -1,4 +1,4 @@ -import { Connection } from "@connections/shared/connection.model"; +import { Connection } from "../../connections/shared/connection.model"; describe("Connection", () => { let connection: Connection; diff --git a/ui/src/app/connections/shared/connection.model.ts b/ui/src/app/connections/shared/connection.model.ts index 21a6bb58..3f2630d1 100644 --- a/ui/src/app/connections/shared/connection.model.ts +++ b/ui/src/app/connections/shared/connection.model.ts @@ -15,10 +15,10 @@ * limitations under the License. */ -import { ConnectionStatus } from "@connections/shared/connection-status"; -import { VdbsConstants } from "@dataservices/shared/vdbs-constants"; -import { Identifiable } from "@shared/identifiable"; -import { SortDirection } from "@shared/sort-direction.enum"; +import { ConnectionStatus } from "../../connections/shared/connection-status"; +import { VdbsConstants } from "../../dataservices/shared/vdbs-constants"; +import { Identifiable } from "../../shared/identifiable"; +import { SortDirection } from "../../shared/sort-direction.enum"; export class Connection implements Identifiable< string > { @@ -34,8 +34,8 @@ export class Connection implements Identifiable< string > { private status: ConnectionStatus; /** - * @param {Object} json the JSON representation of a Connection - * @returns {Connection} the new Connection (never null) + * @param json the JSON representation of a Connection + * @returns the new Connection (never null) */ public static create( json: object = {} ): Connection { const conn = new Connection(); @@ -44,8 +44,8 @@ export class Connection implements Identifiable< string > { } /** - * @param {Connection[]} connections the connections being sorted - * @param {SortDirection} sortDirection the sort direction + * @param connections the connections being sorted + * @param sortDirection the sort direction */ public static sort( connections: Connection[], sortDirection: SortDirection ): void { @@ -87,14 +87,14 @@ export class Connection implements Identifiable< string > { } /** - * @returns {string} the connection name + * @returns the connection name */ public get name(): string { return this.keng__id; } /** - * @returns {string} the connection description + * @returns the connection description */ public getDescription(): string { let description: string = null; @@ -108,42 +108,42 @@ export class Connection implements Identifiable< string > { } /** - * @returns {string} the connection driver name (can be null) + * @returns the connection driver name (can be null) */ public getDriverName(): string { return this.dv__driverName; } /** - * @returns {string} the connection identifier (can be null) + * @returns the connection identifier (can be null) */ public getId(): string { return this.keng__id; } /** - * @returns {string} the connection data path (can be null) + * @returns the connection data path (can be null) */ public getDataPath(): string { return this.keng__dataPath; } /** - * @returns {string} the connection JNDI name (can be null) + * @returns the connection JNDI name (can be null) */ public getJndiName(): string { return this.dv__jndiName; } /** - * @returns {boolean} the jdbc status (true == jdbc) + * @returns the jdbc status (true == jdbc) */ public isJdbc(): boolean { return this.dv__type; } /** - * @returns {string} the service catalog source name + * @returns the service catalog source name */ public getServiceCatalogSourceName(): string { let serviceCatalogName: string = null; @@ -158,7 +158,7 @@ export class Connection implements Identifiable< string > { /** * Accessor to determine if connection overall status is active - * @returns {boolean} `true` if the overall status is active + * @returns `true` if the overall status is active */ public get isActive(): boolean { // vdb and schema status must both be active @@ -167,7 +167,7 @@ export class Connection implements Identifiable< string > { /** * Accessor to determine if connection overall status is inactive - * @returns {boolean} `true` if the overall status is inactive + * @returns `true` if the overall status is inactive */ public get isInactive(): boolean { // If vdb is missing or vdb active and schema missing - overall status is inactive @@ -176,7 +176,7 @@ export class Connection implements Identifiable< string > { /** * Accessor to determine if connection overall status is loading - * @returns {boolean} `true` if the overall status is loading + * @returns `true` if the overall status is loading */ public get isLoading(): boolean { // If either the vdb or schema are loading - overall status is loading @@ -185,7 +185,7 @@ export class Connection implements Identifiable< string > { /** * Accessor to determine if connection overall status is failed - * @returns {boolean} `true` if the overall status is failed + * @returns `true` if the overall status is failed */ public get isFailed(): boolean { return (this.serverVdbFailed || (this.serverVdbActive && this.schemaFailed)); @@ -193,7 +193,7 @@ export class Connection implements Identifiable< string > { /** * Accessor to determine if connection schema is active - * @returns {boolean} `true` if the schema is active + * @returns `true` if the schema is active */ public get schemaActive(): boolean { return this.status.isSchemaAvailable(); @@ -201,7 +201,7 @@ export class Connection implements Identifiable< string > { /** * Accessor to determine if connection schema is missing - * @returns {boolean} `true` if the connection schema is missing + * @returns `true` if the connection schema is missing */ public get schemaMissing(): boolean { return this.status.isSchemaMissing(); @@ -209,7 +209,7 @@ export class Connection implements Identifiable< string > { /** * Accessor to determine if connection schema is loading - * @returns {boolean} `true` if the connection schema is loading + * @returns `true` if the connection schema is loading */ public get schemaLoading(): boolean { return this.status.isSchemaLoading(); @@ -217,42 +217,42 @@ export class Connection implements Identifiable< string > { /** * Accessor to determine if connection schema is failed - * @returns {boolean} `true` if the connection schema is in a failed state + * @returns `true` if the connection schema is in a failed state */ public get schemaFailed(): boolean { return this.status.isSchemaFailed(); } /** - * @returns {boolean} `true` if the connection server VDB is in an active state + * @returns `true` if the connection server VDB is in an active state */ public get serverVdbActive(): boolean { return this.status.isServerVdbActive(); } /** - * @returns {boolean} `true` if the connection server VDB is in a failed state + * @returns `true` if the connection server VDB is in a failed state */ public get serverVdbFailed(): boolean { return this.status.isServerVdbFailed(); } /** - * @returns {boolean} `true` if the connection server VDB is loading + * @returns `true` if the connection server VDB is loading */ public get serverVdbLoading(): boolean { return this.status.isServerVdbLoading(); } /** - * @returns {boolean} `true` if the server VDB is missing + * @returns `true` if the server VDB is missing */ public get serverVdbMissing(): boolean { return this.status.isServerVdbMissing(); } /** - * @returns {string} the connection schema vdb name + * @returns the connection schema vdb name */ public get schemaVdbName(): string { if (this.status && !(this.status == null)) { @@ -262,7 +262,7 @@ export class Connection implements Identifiable< string > { } /** - * @returns {string} the connection schema vdb model name + * @returns the connection schema vdb model name */ public get schemaVdbModelName(): string { if (this.status && !(this.status == null)) { @@ -272,42 +272,42 @@ export class Connection implements Identifiable< string > { } /** - * @returns {string} the connection schema vdb model source name + * @returns the connection schema vdb model source name */ public get schemaVdbModelSourceName(): string { return this.deriveSchemaVdbModelSourceName(); } /** - * @param {string} driverName the connection driver name (optional) + * @param driverName the connection driver name (optional) */ public setDriverName( driverName?: string ): void { this.dv__driverName = driverName ? driverName : null; } /** - * @param {string} id the connection identifier (optional) + * @param id the connection identifier (optional) */ public setId( id?: string ): void { this.keng__id = id ? id : null; } /** - * @param {string} jndiName the connection JNDI name (optional) + * @param jndiName the connection JNDI name (optional) */ public setJndiName( jndiName?: string ): void { this.dv__jndiName = jndiName ? jndiName : null; } /** - * @param {boolean} jdbc the jdbc state + * @param jdbc the jdbc state */ public setJdbc( jdbc: boolean ): void { this.dv__type = jdbc; } /** - * @param {string} serviceCatalog the service catalog source name + * @param erviceCatalog the service catalog source name */ public setServiceCatalogSourceName( serviceCatalog: string ): void { interface IProp { @@ -322,7 +322,7 @@ export class Connection implements Identifiable< string > { } /** - * @param {ConnectionStatus} status the connection status + * @param status the connection status */ public setStatus( status: ConnectionStatus ): void { this.status = status; @@ -330,7 +330,7 @@ export class Connection implements Identifiable< string > { /** * Set all object values using the supplied Connection json - * @param {Object} values + * @param values */ public setValues(values: object = {}): void { Object.assign(this, values); @@ -338,7 +338,7 @@ export class Connection implements Identifiable< string > { /** * Derive the schema VDB name for this connection - * @returns {string} the default schema VDB name + * @returns the default schema VDB name */ private deriveSchemaVdbName( ): string { const name = this.getId() + VdbsConstants.SCHEMA_VDB_SUFFIX; @@ -347,7 +347,7 @@ export class Connection implements Identifiable< string > { /** * Derive the schema VDB model name for this connection - * @returns {string} the default schema VDB model name + * @returns the default schema VDB model name */ private deriveSchemaVdbModelName( ): string { const name = this.getId() + VdbsConstants.SCHEMA_MODEL_SUFFIX; @@ -356,7 +356,7 @@ export class Connection implements Identifiable< string > { /** * Derive the schema VDB model source name for this connection - * @returns {string} + * @returns name */ private deriveSchemaVdbModelSourceName( ): string { return this.getServiceCatalogSourceName() ? diff --git a/ui/src/app/connections/shared/connection.service.spec.ts b/ui/src/app/connections/shared/connection.service.spec.ts index 0cd00920..303e02c6 100644 --- a/ui/src/app/connections/shared/connection.service.spec.ts +++ b/ui/src/app/connections/shared/connection.service.spec.ts @@ -1,10 +1,10 @@ import { inject, TestBed } from "@angular/core/testing"; import { HttpModule } from "@angular/http"; -import { ConnectionService } from "@connections/shared/connection.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; +import { ConnectionService } from "../../connections/shared/connection.service"; +import { AppSettingsService } from "../../core/app-settings.service"; +import { LoggerService } from "../../core/logger.service"; +import { NotifierService } from "../../dataservices/shared/notifier.service"; +import { VdbService } from "../../dataservices/shared/vdb.service"; describe("ConnectionService", () => { beforeEach(() => { diff --git a/ui/src/app/connections/shared/connection.service.ts b/ui/src/app/connections/shared/connection.service.ts index a8c6c588..2ceb65b0 100644 --- a/ui/src/app/connections/shared/connection.service.ts +++ b/ui/src/app/connections/shared/connection.service.ts @@ -17,23 +17,23 @@ import { Injectable } from "@angular/core"; import { Http, RequestOptions } from "@angular/http"; -import { ConnectionStatus } from "@connections/shared/connection-status"; -import { ConnectionType } from "@connections/shared/connection-type.model"; -import { ConnectionsConstants } from "@connections/shared/connections-constants"; -import { NewConnection } from "@connections/shared/new-connection.model"; -import { SchemaNode } from "@connections/shared/schema-node.model"; -import { ServiceCatalogSource } from "@connections/shared/service-catalog-source.model"; -import { ApiService } from "@core/api.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; -import { ConnectionSummary } from "@dataservices/shared/connection-summary.model"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { environment } from "@environments/environment"; +import { ConnectionStatus } from "../../connections/shared/connection-status"; +import { ConnectionType } from "../../connections/shared/connection-type.model"; +import { ConnectionsConstants } from "../../connections/shared/connections-constants"; +import { NewConnection } from "../../connections/shared/new-connection.model"; +import { SchemaNode } from "../../connections/shared/schema-node.model"; +import { ServiceCatalogSource } from "../../connections/shared/service-catalog-source.model"; +import { ApiService } from "../../core/api.service"; +import { AppSettingsService } from "../../core/app-settings.service"; +import { LoggerService } from "../../core/logger.service"; +import { ConnectionSummary } from "../../dataservices/shared/connection-summary.model"; +import { NotifierService } from "../../dataservices/shared/notifier.service"; +import { VdbService } from "../../dataservices/shared/vdb.service"; +import { environment } from "../../../environments/environment"; import { Observable } from "rxjs/Observable"; import { Subscription } from "rxjs/Subscription"; -import { VdbsConstants } from "@dataservices/shared/vdbs-constants"; -import { Column } from "@dataservices/shared/column.model"; +import { VdbsConstants } from "../../dataservices/shared/vdbs-constants"; +import { Column } from "../../dataservices/shared/column.model"; @Injectable() export class ConnectionService extends ApiService { @@ -65,8 +65,7 @@ export class ConnectionService extends ApiService { * Validates the specified connection name. If the name contains valid characters and the name is unique, the * service returns 'null'. Otherwise, a 'string' containing an error message is returned. * - * @param {string} name the connection name - * @returns {Observable} + * @param name the connection name */ public isValidName( name: string ): Observable< string > { if ( !name || name.length === 0 ) { @@ -92,9 +91,8 @@ export class ConnectionService extends ApiService { * of the ConnectionSummary are returned. * - include-connection=true (include connection [default=true]) * - include-schema-status=true (include schema vdb status [default=false]) - * @param {boolean} includeConnection 'true' to include connection - * @param {boolean} includeSchemaStatus 'true' to include connection schema status - * @returns {Observable} + * @param includeConnection 'true' to include connection + * @param includeSchemaStatus 'true' to include connection schema status */ public getConnections(includeConnection: boolean, includeSchemaStatus: boolean): Observable { // Build the url with parameters @@ -112,10 +110,9 @@ export class ConnectionService extends ApiService { /** * Deployes the connection server VDB if one does not already exists. If a server VDB has already been deployed, one * can be redeployed. A schema can only be generated if it doesn't exist and there is already a deployed server VDB. - * @param {string} connectionName the name of the connection being refreshed - * @param {boolean} redeployServerVdb `true` if the server VDB should be deployed if one exists (defaults to `false`) - * @param {boolean} generateSchema `true` if the schema should be generated if one does not exist (defaults to `true`) - * @returns {Observable} + * @param connectionName the name of the connection being refreshed + * @param redeployServerVdb `true` if the server VDB should be deployed if one exists (defaults to `false`) + * @param generateSchema `true` if the schema should be generated if one does not exist (defaults to `true`) */ public refreshConnectionSchema(connectionName: string, redeployServerVdb = false, @@ -145,8 +142,7 @@ export class ConnectionService extends ApiService { /** * Bind a service catalog source via the komodo rest interface - * @param {string} serviceCatalogSourceName - * @returns {Observable} + * @param serviceCatalogSourceName */ public bindServiceCatalogSource(serviceCatalogSourceName: string): Observable { return this.http @@ -160,8 +156,7 @@ export class ConnectionService extends ApiService { /** * Delete a connection via the komodo rest interface - * @param {string} connectionId - * @returns {Observable} + * @param connectionId */ public deleteConnection(connectionId: string): Observable { return this.http @@ -175,7 +170,6 @@ export class ConnectionService extends ApiService { /** * Get the connection types from the komodo rest interface - * @returns {ConnectionType[]} */ public getConnectionTypes(): ConnectionType[] { const connectionTypes: ConnectionType[] = []; @@ -206,7 +200,6 @@ export class ConnectionService extends ApiService { /** * Get the available ServiceCatalogSources from the komodo rest interface - * @returns {Observable} */ public getAllServiceCatalogSources(): Observable { return this.http @@ -221,8 +214,7 @@ export class ConnectionService extends ApiService { /** * Get the schema for the specified connection. The connection must be ACTIVE, otherwise the schema * will be empty. - * @param {string} connectionId the connection id - * @returns {Observable} + * @param connectionId the connection id */ public getConnectionSchema(connectionId: string): Observable { return this.http @@ -238,9 +230,8 @@ export class ConnectionService extends ApiService { /** * Get the columns for the specified connection and table. The connection must be ACTIVE, otherwise the schema * will be empty. - * @param {string} connectionId the connection id - * @param {string} tableOption the table option (eg. schema=public/table=customer) - * @returns {Observable} + * @param connectionId the connection id + * @param tableOption the table option (eg. schema=public/table=customer) */ public getConnectionSchemaColumns(connectionId: string, tableOption: string): Observable { // setup query parameters @@ -263,8 +254,7 @@ export class ConnectionService extends ApiService { /** * Create a connection in the Komodo repo - also binds the specified serviceCatalogSource - * @param {NewConnection} connection the connection object - * @returns {Observable} + * @param connection the connection object */ public createAndBindConnection(connection: NewConnection): Observable { return this.http @@ -278,8 +268,7 @@ export class ConnectionService extends ApiService { /** * Update a connection in the Komodo repo - also binds the specified serviceCatalogSource. - * @param {NewConnection} connection the connection object - * @returns {Observable} + * @param connection the connection object */ public updateAndBindConnection(connection: NewConnection): Observable { return this.http @@ -294,8 +283,7 @@ export class ConnectionService extends ApiService { /** * Creates a workspace Connection, binds it to the specified serviceCatalogSource, and initiates * a refresh of the connection schema. - * @param {NewConnection} connection the connection object - * @returns {Observable} + * @param connection the connection object */ public createDeployConnection(connection: NewConnection): Observable { return this.createAndBindConnection(connection) @@ -306,8 +294,7 @@ export class ConnectionService extends ApiService { /** * Updates a workspace Connection, binds it to the specified serviceCatalogSource, and initiates * a refresh of the connection schema. - * @param {NewConnection} connection the connection object - * @returns {Observable} + * @param connection the connection object */ public updateDeployConnection(connection: NewConnection): Observable { return this.updateAndBindConnection(connection) @@ -318,8 +305,7 @@ export class ConnectionService extends ApiService { /** * Delete the repo Connection VDB (if it exists) and undeploy the Connection VDB * (if exists) - * @param {string} connectionId - * @returns {Observable} + * @param connectionId */ public deleteUndeployConnectionVdb(connectionId: string): Observable { const vdbName = connectionId + "BtlConn"; @@ -330,8 +316,7 @@ export class ConnectionService extends ApiService { /** * Update the preview VDB and re-deploy it if needed. - * @param {string} vdbName - * @returns {Observable} + * @param vdbName */ public refreshPreviewVdb(vdbName: string): Observable { const url = environment.komodoTeiidUrl + "/refreshPreviewVdb/" + vdbName; @@ -363,7 +348,7 @@ export class ConnectionService extends ApiService { /** * Polls the server and sends Connection schema state updates at the specified interval - * @param {number} pollIntervalSec the interval (sec) between polling attempts + * @param pollIntervalSec the interval (sec) between polling attempts */ public pollConnectionSchemaStatus(pollIntervalSec: number): void { const pollIntervalMillis = pollIntervalSec * 1000; @@ -378,8 +363,8 @@ export class ConnectionService extends ApiService { /** * Build the getConnection Url based on the supplied parameters. - * @param {boolean} includeConnection 'true' to include connection, 'false' to omit - * @param {boolean} includeSchemaStatus 'true' to include connection schema status, 'false' to omit + * @param includeConnection 'true' to include connection, 'false' to omit + * @param includeSchemaStatus 'true' to include connection schema status, 'false' to omit */ private buildGetConnectionsUrl(includeConnection: boolean, includeSchemaStatus: boolean): string { // Base getConnections service url @@ -394,8 +379,7 @@ export class ConnectionService extends ApiService { /* * Creates a Map of connection name to ConnectionStatus - * @param {ConnectionSummary[]} connectionSummaries the array of ConnectionSummary objects - * @returns {Map} the map of connection name to ConnectionStatus + * @param connectionSummaries the array of ConnectionSummary objects */ private createConnectionStatusMap(connectionSummaries: ConnectionSummary[]): Map { const connStatusMap: Map = new Map(); diff --git a/ui/src/app/connections/shared/mock-connection.service.ts b/ui/src/app/connections/shared/mock-connection.service.ts index 4aa684e8..3472b63b 100644 --- a/ui/src/app/connections/shared/mock-connection.service.ts +++ b/ui/src/app/connections/shared/mock-connection.service.ts @@ -17,23 +17,23 @@ import { Injectable, ReflectiveInjector } from "@angular/core"; import { Http } from "@angular/http"; -import { Connection } from "@connections/shared/connection.model"; -import { ConnectionService } from "@connections/shared/connection.service"; -import { NewConnection } from "@connections/shared/new-connection.model"; -import { SchemaNode } from "@connections/shared/schema-node.model"; -import { ServiceCatalogSource } from "@connections/shared/service-catalog-source.model"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; -import { ConnectionSummary } from "@dataservices/shared/connection-summary.model"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { TestDataService } from "@shared/test-data.service"; +import { Connection } from "../../connections/shared/connection.model"; +import { ConnectionService } from "../../connections/shared/connection.service"; +import { NewConnection } from "../../connections/shared/new-connection.model"; +import { SchemaNode } from "../../connections/shared/schema-node.model"; +import { ServiceCatalogSource } from "../../connections/shared/service-catalog-source.model"; +import { AppSettingsService } from "../../core/app-settings.service"; +import { LoggerService } from "../../core/logger.service"; +import { ConnectionSummary } from "../../dataservices/shared/connection-summary.model"; +import { NotifierService } from "../../dataservices/shared/notifier.service"; +import { VdbService } from "../../dataservices/shared/vdb.service"; +import { TestDataService } from "../../shared/test-data.service"; import "rxjs/add/observable/of"; import "rxjs/add/observable/throw"; import "rxjs/add/operator/catch"; import "rxjs/add/operator/map"; import { Observable } from "rxjs/Observable"; -import { Column } from "@dataservices/shared/column.model"; +import { Column } from "../../dataservices/shared/column.model"; @Injectable() export class MockConnectionService extends ConnectionService { @@ -95,9 +95,9 @@ export class MockConnectionService extends ConnectionService { * of the ConnectionSummary are returned. * - include-connection=true (include connection [default=true]) * - include-schema-status=true (include schema vdb status [default=false]) - * @param {boolean} includeConnection 'true' to include connection - * @param {boolean} includeSchemaStatus 'true' to include connection schema status - * @returns {Observable} + * @param includeConnection 'true' to include connection + * @param includeSchemaStatus 'true' to include connection schema status + * @returns connections */ public getConnections(includeConnection: boolean, includeSchemaStatus: boolean): Observable { return Observable.of(this.testDataService.getConnectionSummaries(includeConnection, includeSchemaStatus)); @@ -105,8 +105,8 @@ export class MockConnectionService extends ConnectionService { /** * Delete a connection via the komodo rest interface - * @param {string} connectionId - * @returns {Observable} + * @param connectionId + * @returns success */ public deleteConnection(connectionId: string): Observable { const size = this.connections.length; @@ -116,7 +116,7 @@ export class MockConnectionService extends ConnectionService { /** * Get the available ServiceCatalogSources from the komodo rest interface - * @returns {Observable} + * @returns catalog sources */ public getAllServiceCatalogSources(): Observable { return Observable.of(this.serviceCatalogSources); @@ -124,8 +124,8 @@ export class MockConnectionService extends ConnectionService { /** * Get the root SchemaNodes for the specified Connection - * @param {string} connectionName the connection name - * @returns {Observable} + * @param connectionName the connection name + * @returns schema nodes */ public getConnectionSchema( connectionName: string ): Observable< SchemaNode[] > { return Observable.of( this.connectionSchemaMap.get( connectionName ) ); @@ -134,9 +134,8 @@ export class MockConnectionService extends ConnectionService { /** * Get the columns for the specified connection and table. The connection must be ACTIVE, otherwise the schema * will be empty. - * @param {string} connectionName the connection id - * @param {string} tableOption the table option (eg. schema=public/table=customer) - * @returns {Observable} + * @param connectionName the connection id + * @param tableOption the table option (eg. schema=public/table=customer) */ public getConnectionSchemaColumns(connectionName: string, tableOption: string): Observable { return Observable.of( this.connectionSchemaColumnsMap.get( connectionName + ":" + tableOption )); @@ -144,8 +143,7 @@ export class MockConnectionService extends ConnectionService { /** * Create a connection in the Komodo repo - also binds the specified serviceCatalogSource - * @param {NewConnection} connection the connection object - * @returns {Observable} + * @param connection the connection object */ public createAndBindConnection(connection: NewConnection): Observable { return Observable.of(true); @@ -153,8 +151,7 @@ export class MockConnectionService extends ConnectionService { /** * Update a connection in the Komodo repo - also binds the specified serviceCatalogSource. - * @param {NewConnection} connection the connection object - * @returns {Observable} + * @param connection the connection object */ public updateAndBindConnection(connection: NewConnection): Observable { return Observable.of(true); @@ -162,8 +159,7 @@ export class MockConnectionService extends ConnectionService { /** * Update the preview VDB and re-deploy it if needed. - * @param {string} vdbName - * @returns {Observable} + * @param vdbName */ public refreshPreviewVdb(vdbName: string): Observable { return Observable.of(true); @@ -171,8 +167,7 @@ export class MockConnectionService extends ConnectionService { /** * Initiates a refresh of the connection schema via the komodo rest interface - * @param {string} connectionName - * @returns {Observable} + * @param connectionName */ public refreshConnectionSchema(connectionName: string): Observable { if ( !connectionName || connectionName.length === 0 ) { @@ -191,7 +186,7 @@ export class MockConnectionService extends ConnectionService { /** * Polls the server and sends Connection state updates at the specified interval - * @param {number} pollIntervalSec the interval (sec) between polling attempts + * @param pollIntervalSec the interval (sec) between polling attempts */ public pollConnectionSchemaStatus(pollIntervalSec: number): void { // Nothing to do diff --git a/ui/src/app/connections/shared/new-connection.model.ts b/ui/src/app/connections/shared/new-connection.model.ts index 56371500..f836cd10 100644 --- a/ui/src/app/connections/shared/new-connection.model.ts +++ b/ui/src/app/connections/shared/new-connection.model.ts @@ -29,42 +29,42 @@ export class NewConnection { } /** - * @returns {string} the connection name (can be null) + * @returns the connection name (can be null) */ public getName(): string { return this.name; } /** - * @returns {string} the connection description (can be null) + * @returns the connection description (can be null) */ public getDescription(): string { return this.description; } /** - * @returns {string} the connection serviceCatalog source name (can be null) + * @returns the connection serviceCatalog source name (can be null) */ public getServiceCatalogSource(): string { return this.serviceCatalogSource; } /** - * @param {string} name the connection name (optional) + * @param name the connection name (optional) */ public setName( name?: string ): void { this.name = name ? name : null; } /** - * @param {string} description the connection description (optional) + * @param description the connection description (optional) */ public setDescription( description?: string ): void { this.description = description ? description : ""; } /** - * @param {string} serviceCatalogSource the serviceCatalogSource + * @param serviceCatalogSource the serviceCatalogSource */ public setServiceCatalogSource( serviceCatalogSource?: string ): void { this.serviceCatalogSource = serviceCatalogSource ? serviceCatalogSource : null; diff --git a/ui/src/app/connections/shared/schema-node.model.spec.ts b/ui/src/app/connections/shared/schema-node.model.spec.ts index fba9a11c..ff4a928c 100644 --- a/ui/src/app/connections/shared/schema-node.model.spec.ts +++ b/ui/src/app/connections/shared/schema-node.model.spec.ts @@ -1,4 +1,4 @@ -import { SchemaNode } from "@connections/shared/schema-node.model"; +import { SchemaNode } from "../../connections/shared/schema-node.model"; describe("SchemaNode", () => { let schemaNode: SchemaNode; diff --git a/ui/src/app/connections/shared/schema-node.model.ts b/ui/src/app/connections/shared/schema-node.model.ts index e7dbdea8..4aa815d4 100644 --- a/ui/src/app/connections/shared/schema-node.model.ts +++ b/ui/src/app/connections/shared/schema-node.model.ts @@ -26,8 +26,8 @@ export class SchemaNode { private children: SchemaNode[]; /** - * @param {Object} json the JSON representation of a SchemaNode - * @returns {SchemaNode} the new SchemaNode (never null) + * @param json the JSON representation of a SchemaNode + * @returns the new SchemaNode (never null) */ public static create( json: object = {} ): SchemaNode { const schemaNode = new SchemaNode(); @@ -60,14 +60,14 @@ export class SchemaNode { } /** - * @returns {string} the node name + * @returns the node name */ public getName(): string { return this.name; } /** - * @returns {string} the node type + * @returns the node type */ public getType(): string { return this.type; @@ -76,28 +76,28 @@ export class SchemaNode { /** * Get the path, for example: ( schema=public/table=customer ). It is assumed that the path here does NOT include * the connection. - * @returns {string} the node path + * @returns the node path */ public getPath(): string { return this.path; } /** - * @returns {string} the nodes connection + * @returns the nodes connection */ public getConnectionName(): string { return this.connectionName; } /** - * @param {string} name the node name + * @param name the node name */ public setName( name?: string ): void { this.name = name ? name : null; } /** - * @param {string} type the node type + * @param type the node type */ public setType( type?: string ): void { this.type = type ? type : null; @@ -106,49 +106,49 @@ export class SchemaNode { /** * Set the path, for example: ( schema=public/table=customer ). It is assumed that the path here does NOT include * the connection. - * @param {string} path the node path + * @param path the node path */ public setPath( path?: string ): void { this.path = path ? path : null; } /** - * @param {string} connectionName the nodes connection name + * @param connectionName the nodes connection name */ public setConnectionName( connectionName?: string ): void { this.connectionName = connectionName ? connectionName : null; } /** - * @returns {boolean} true if queryable + * @returns true if queryable */ public isQueryable(): boolean { return this.queryable; } /** - * @param {boolean} queryable 'true' if queryable + * @param queryable 'true' if queryable */ public setQueryable(queryable: boolean ): void { this.queryable = queryable; } /** - * @param {boolean} hasChildren 'true' if has children + * @param hasChildren 'true' if has children */ public setHasChildren(hasChildren: boolean ): void { this.hasChildren = hasChildren; } /** - * @returns {SchemaNode[]} the child SchemaNode array + * @returns the child SchemaNode array */ public getChildren(): SchemaNode[] { return this.children; } /** - * @param {SchemaNode[]} children SchemaNode children + * @param children SchemaNode children */ public setChildren( children: SchemaNode[] ): void { this.children = children; @@ -156,7 +156,7 @@ export class SchemaNode { /** * Get selected state - * @returns {boolean} the selected state + * @returns the selected state */ public get selected( ): boolean { return this.isSelected; @@ -164,7 +164,7 @@ export class SchemaNode { /** * Set selected status - * @param {boolean} isSelected the selected state + * @param isSelected the selected state */ public set selected( isSelected: boolean ) { this.isSelected = isSelected; @@ -172,7 +172,7 @@ export class SchemaNode { /** * Determine the max number of levels in the tree structure, including this node. - * @returns {number} the max number of levels, including this node + * @returns the max number of levels, including this node */ public getMaxLevels(): number { let maxChildLevel = 0; @@ -186,7 +186,7 @@ export class SchemaNode { /** * Set all object values using the supplied View json - * @param {Object} values + * @param values */ public setValues(values: object = {}): void { Object.assign(this, values); diff --git a/ui/src/app/connections/shared/service-catalog-source.model.spec.ts b/ui/src/app/connections/shared/service-catalog-source.model.spec.ts index 85f1ae39..51ad4e5a 100644 --- a/ui/src/app/connections/shared/service-catalog-source.model.spec.ts +++ b/ui/src/app/connections/shared/service-catalog-source.model.spec.ts @@ -1,4 +1,4 @@ -import { ServiceCatalogSource } from "@connections/shared/service-catalog-source.model"; +import { ServiceCatalogSource } from "../../connections/shared/service-catalog-source.model"; describe("ServiceCatalogSource", () => { let serviceCatSrc: ServiceCatalogSource; diff --git a/ui/src/app/connections/shared/service-catalog-source.model.ts b/ui/src/app/connections/shared/service-catalog-source.model.ts index 840f9def..9a5707da 100644 --- a/ui/src/app/connections/shared/service-catalog-source.model.ts +++ b/ui/src/app/connections/shared/service-catalog-source.model.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { Identifiable } from "@shared/identifiable"; -import { SortDirection } from "@shared/sort-direction.enum"; +import { Identifiable } from "../../shared/identifiable"; +import { SortDirection } from "../../shared/sort-direction.enum"; export class ServiceCatalogSource implements Identifiable< string > { @@ -27,8 +27,8 @@ export class ServiceCatalogSource implements Identifiable< string > { /** * Create a ServiceCatalogSource from its json representation - * @param {Object} json the JSON representation of a ServiceCatalogSource - * @returns {ServiceCatalogSource} the new ServiceCatalogSource (never null) + * @param json the JSON representation of a ServiceCatalogSource + * @returns the new ServiceCatalogSource (never null) */ public static create( json: object = {} ): ServiceCatalogSource { const conn = new ServiceCatalogSource(); @@ -38,8 +38,8 @@ export class ServiceCatalogSource implements Identifiable< string > { /** * Sorts the provided catalog sources in the specified sort direction - * @param {ServiceCatalogSource[]} catalogSources the catalog sources being sorted - * @param {SortDirection} sortDirection the sort direction + * @param catalogSources the catalog sources being sorted + * @param sortDirection the sort direction */ public static sort( catalogSources: ServiceCatalogSource[], sortDirection: SortDirection ): void { @@ -82,7 +82,7 @@ export class ServiceCatalogSource implements Identifiable< string > { /** * Get the catalog source type - * @returns {string} the catalog source type name (can be null) + * @returns the catalog source type name (can be null) */ public getType(): string { return this.sc__type; @@ -90,7 +90,7 @@ export class ServiceCatalogSource implements Identifiable< string > { /** * Get the catalog source id - * @returns {string} the catalog source identifier (can be null) + * @returns the catalog source identifier (can be null) */ public getId(): string { return this.keng__id; @@ -98,7 +98,7 @@ export class ServiceCatalogSource implements Identifiable< string > { /** * Get the catalog source name - * @returns {string} the catalog source name (can be null) + * @returns the catalog source name (can be null) */ public getName(): string { return this.sc__name; @@ -106,7 +106,7 @@ export class ServiceCatalogSource implements Identifiable< string > { /** * Get the bound status of the catalog source - * @returns {boolean} the bound status (true == bound) + * @returns the bound status (true == bound) */ public isBound(): boolean { return this.sc__bound; @@ -114,7 +114,7 @@ export class ServiceCatalogSource implements Identifiable< string > { /** * Set the catalog source type - * @param {string} typeName the catalog source type (optional) + * @param typeName the catalog source type (optional) */ public setType( typeName?: string ): void { this.sc__type = typeName ? typeName : null; @@ -122,7 +122,7 @@ export class ServiceCatalogSource implements Identifiable< string > { /** * Set the catalog source id - * @param {string} id the catalog source identifier (optional) + * @param id the catalog source identifier (optional) */ public setId( id?: string ): void { this.keng__id = id ? id : null; @@ -130,7 +130,7 @@ export class ServiceCatalogSource implements Identifiable< string > { /** * Set the catalog source name - * @param {string} name the catalog source name (optional) + * @param name the catalog source name (optional) */ public setName( name?: string ): void { this.sc__name = name ? name : null; @@ -138,7 +138,7 @@ export class ServiceCatalogSource implements Identifiable< string > { /** * Set the bound state of the catalog source - * @param {boolean} bound the bound state + * @param bound the bound state */ public setBound( bound: boolean ): void { this.sc__bound = bound; @@ -146,7 +146,7 @@ export class ServiceCatalogSource implements Identifiable< string > { /** * Set all object values using the supplied catalog source json - * @param {Object} values + * @param values */ public setValues(values: object = {}): void { Object.assign(this, values); diff --git a/ui/src/app/core/about-dialog/about-dialog.component.spec.ts b/ui/src/app/core/about-dialog/about-dialog.component.spec.ts index 1f87927c..bb9fa9f2 100644 --- a/ui/src/app/core/about-dialog/about-dialog.component.spec.ts +++ b/ui/src/app/core/about-dialog/about-dialog.component.spec.ts @@ -1,11 +1,11 @@ import { async, ComponentFixture, TestBed } from "@angular/core/testing"; import { HttpModule } from "@angular/http"; -import { About } from "@core/about-dialog/about.model"; -import { AboutService } from "@core/about-dialog/about.service"; -import { MockAboutService } from "@core/about-dialog/mock-about.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; +import { About } from "../../core/about-dialog/about.model"; +import { AboutService } from "../../core/about-dialog/about.service"; +import { MockAboutService } from "../../core/about-dialog/mock-about.service"; +import { AppSettingsService } from "../../core/app-settings.service"; +import { LoggerService } from "../../core/logger.service"; +import { MockAppSettingsService } from "../../core/mock-app-settings.service"; import { ModalModule } from "patternfly-ng"; import { AboutDialogComponent } from "./about-dialog.component"; diff --git a/ui/src/app/core/about-dialog/about-dialog.component.ts b/ui/src/app/core/about-dialog/about-dialog.component.ts index 1e891ed0..0fce82ac 100644 --- a/ui/src/app/core/about-dialog/about-dialog.component.ts +++ b/ui/src/app/core/about-dialog/about-dialog.component.ts @@ -16,10 +16,10 @@ */ import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from "@angular/core"; -import { AboutService } from "@core/about-dialog/about.service"; -import { LoggerService } from "@core/logger.service"; -import { AboutEvent } from "app/core/about-dialog/about-event"; -import { About } from "app/core/about-dialog/about.model"; +import { AboutService } from "../../core/about-dialog/about.service"; +import { LoggerService } from "../../core/logger.service"; +import { AboutEvent } from "./about-event"; +import { About } from "./about.model"; import { AboutModalConfig } from "patternfly-ng/modal"; @Component({ diff --git a/ui/src/app/core/about-dialog/about.model.ts b/ui/src/app/core/about-dialog/about.model.ts index 24e6da10..cc0b4cef 100644 --- a/ui/src/app/core/about-dialog/about.model.ts +++ b/ui/src/app/core/about-dialog/about.model.ts @@ -82,7 +82,7 @@ export class About { /** * Set all object values using the supplied JSON. - * @param {Object} values + * @param values */ public setValues( values: object = {} ): void { Object.assign( this, values ); diff --git a/ui/src/app/core/about-dialog/about.service.spec.ts b/ui/src/app/core/about-dialog/about.service.spec.ts index a5730cfe..140bcf88 100644 --- a/ui/src/app/core/about-dialog/about.service.spec.ts +++ b/ui/src/app/core/about-dialog/about.service.spec.ts @@ -1,9 +1,9 @@ import { inject, TestBed } from "@angular/core/testing"; import { HttpModule } from "@angular/http"; -import { AboutService } from "@core/about-dialog/about.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; +import { AboutService } from "../../core/about-dialog/about.service"; +import { AppSettingsService } from "../../core/app-settings.service"; +import { LoggerService } from "../../core/logger.service"; +import { MockAppSettingsService } from "../../core/mock-app-settings.service"; describe("AboutService", () => { beforeEach(() => { diff --git a/ui/src/app/core/about-dialog/about.service.ts b/ui/src/app/core/about-dialog/about.service.ts index f1a49faa..a5241d39 100644 --- a/ui/src/app/core/about-dialog/about.service.ts +++ b/ui/src/app/core/about-dialog/about.service.ts @@ -17,11 +17,11 @@ import { Injectable } from "@angular/core"; import { Http } from "@angular/http"; -import { About } from "@core/about-dialog/about.model"; -import { ApiService } from "@core/api.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; -import { environment } from "@environments/environment"; +import { About } from "../../core/about-dialog/about.model"; +import { ApiService } from "../../core/api.service"; +import { AppSettingsService } from "../../core/app-settings.service"; +import { LoggerService } from "../../core/logger.service"; +import { environment } from "../../../environments/environment"; import { Observable } from "rxjs/Observable"; @Injectable() diff --git a/ui/src/app/core/about-dialog/mock-about.service.ts b/ui/src/app/core/about-dialog/mock-about.service.ts index 0ddc5223..7708381d 100644 --- a/ui/src/app/core/about-dialog/mock-about.service.ts +++ b/ui/src/app/core/about-dialog/mock-about.service.ts @@ -1,9 +1,9 @@ import { Injectable } from "@angular/core"; import { Http } from "@angular/http"; -import { About } from "@core/about-dialog/about.model"; -import { AboutService } from "@core/about-dialog/about.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; +import { About } from "../../core/about-dialog/about.model"; +import { AboutService } from "../../core/about-dialog/about.service"; +import { AppSettingsService } from "../../core/app-settings.service"; +import { LoggerService } from "../../core/logger.service"; import { Observable } from "rxjs/Observable"; @Injectable() diff --git a/ui/src/app/core/api.service.spec.ts b/ui/src/app/core/api.service.spec.ts index 0b43471e..3c79e150 100644 --- a/ui/src/app/core/api.service.spec.ts +++ b/ui/src/app/core/api.service.spec.ts @@ -1,9 +1,9 @@ import { inject, TestBed } from "@angular/core/testing"; import { HttpModule } from "@angular/http"; -import { ApiService } from "@core/api.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; +import { ApiService } from "../core/api.service"; +import { AppSettingsService } from "../core/app-settings.service"; +import { LoggerService } from "../core/logger.service"; +import { MockAppSettingsService } from "../core/mock-app-settings.service"; describe("ApiService", () => { beforeEach(() => { diff --git a/ui/src/app/core/api.service.ts b/ui/src/app/core/api.service.ts index d294cf62..fa6adbf4 100644 --- a/ui/src/app/core/api.service.ts +++ b/ui/src/app/core/api.service.ts @@ -16,8 +16,8 @@ */ import { RequestOptions, Response } from "@angular/http"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; +import { AppSettingsService } from "../core/app-settings.service"; +import { LoggerService } from "../core/logger.service"; import "rxjs/add/observable/throw"; import "rxjs/add/operator/catch"; import "rxjs/add/operator/map"; @@ -46,7 +46,7 @@ export abstract class ApiService { * Get the Auth RequestOptions if any * Note: Since usage of the oauth-proxy no additional auth request options are necessary * - * @returns {RequestOptions} + * @returns */ protected getAuthRequestOptions(): RequestOptions { return this.appSettings.getAuthRequestOptions(); @@ -54,7 +54,7 @@ export abstract class ApiService { /** * Get the current user workspace path - * @returns {string} the current user workspace path + * @returns the current user workspace path */ protected getKomodoUserWorkspacePath(): string { return this.appSettings.getKomodoUserWorkspacePath(); diff --git a/ui/src/app/core/app-settings.service.spec.ts b/ui/src/app/core/app-settings.service.spec.ts index 078da512..ca63dd17 100644 --- a/ui/src/app/core/app-settings.service.spec.ts +++ b/ui/src/app/core/app-settings.service.spec.ts @@ -1,6 +1,6 @@ import { inject, TestBed } from "@angular/core/testing"; import { HttpModule } from "@angular/http"; -import { LoggerService } from "@core/logger.service"; +import { LoggerService } from "../core/logger.service"; import { AppSettingsService } from "./app-settings.service"; describe("AppSettingsService", () => { diff --git a/ui/src/app/core/app-settings.service.ts b/ui/src/app/core/app-settings.service.ts index 06174755..4b3420ea 100644 --- a/ui/src/app/core/app-settings.service.ts +++ b/ui/src/app/core/app-settings.service.ts @@ -17,9 +17,9 @@ import { Injectable } from "@angular/core"; import { Headers, Http, RequestOptions, Response } from "@angular/http"; -import { LoggerService } from "@core/logger.service"; -import { environment } from "@environments/environment"; -import { LayoutType } from "@shared/layout-type.enum"; +import { LoggerService } from "../core/logger.service"; +import { environment } from "../../environments/environment"; +import { LayoutType } from "../shared/layout-type.enum"; import { Observable } from "rxjs/Observable"; import { ErrorObservable } from "rxjs/observable/ErrorObservable"; @@ -92,7 +92,7 @@ export class AppSettingsService { * Get the Auth RequestOptions if any * Note: Since usage of the oauth-proxy no additional auth request options are necessary * - * @returns {RequestOptions} + * @returns */ public getAuthRequestOptions(): RequestOptions { const headers = new Headers({}); @@ -101,7 +101,7 @@ export class AppSettingsService { /* * Get the logged in komodo user - * @returns {string} the komodo user + * @returns the komodo user */ public getKomodoUser(): string { if (! this.userProfile) { @@ -118,7 +118,7 @@ export class AppSettingsService { /* * Get the komodo workspace path for the current user - * @returns {string} the komodo workspace path + * @returns the komodo workspace path */ public getKomodoUserWorkspacePath(): string { if (! this.userProfile) { @@ -135,7 +135,7 @@ export class AppSettingsService { /* * Get the git repository property for the supplied property key - * @returns {string} the git repository property + * @returns the git repository property */ public getGitRepoProperty(propertyKey: string): string { return this.gitRepoProperties.get(propertyKey); @@ -151,7 +151,7 @@ export class AppSettingsService { /* * Sets the LayoutType for the connections summary page - * @param {LayoutType} layout the connections page layout + * @param layout the connections page layout */ public set connectionsPageLayout( layout: LayoutType ) { this.connPageLayout = layout; @@ -159,7 +159,7 @@ export class AppSettingsService { /* * Get the LayoutType for the dataservices summary page - * @returns {LayoutType} the dataservices page layout + * @returns the dataservices page layout */ public get dataservicesPageLayout( ): LayoutType { return this.svcPageLayout; @@ -167,7 +167,7 @@ export class AppSettingsService { /* * Sets the LayoutType for the dataservices summary page - * @param {LayoutType} layout the dataservices page layout + * @param layout the dataservices page layout */ public set dataservicesPageLayout( layout: LayoutType ) { this.svcPageLayout = layout; diff --git a/ui/src/app/core/core.module.ts b/ui/src/app/core/core.module.ts index c231e385..763451f9 100644 --- a/ui/src/app/core/core.module.ts +++ b/ui/src/app/core/core.module.ts @@ -19,16 +19,16 @@ import { CommonModule } from "@angular/common"; import { NgModule, Optional, SkipSelf } from "@angular/core"; import { Http, HttpModule } from "@angular/http"; import { RouterModule } from "@angular/router"; -import { AboutDialogComponent } from "@core/about-dialog/about-dialog.component"; -import { AboutService } from "@core/about-dialog/about.service"; -import { MockAboutService } from "@core/about-dialog/mock-about.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { BreadcrumbComponent } from "@core/breadcrumbs/breadcrumb/breadcrumb.component"; -import { BreadcrumbsComponent } from "@core/breadcrumbs/breadcrumbs.component"; -import { LoggerService } from "@core/logger.service"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; -import { VerticalNavComponent } from "@core/vertical-nav/vertical-nav.component"; -import { environment } from "@environments/environment"; +import { AboutDialogComponent } from "../core/about-dialog/about-dialog.component"; +import { AboutService } from "../core/about-dialog/about.service"; +import { MockAboutService } from "../core/about-dialog/mock-about.service"; +import { AppSettingsService } from "../core/app-settings.service"; +import { BreadcrumbComponent } from "../core/breadcrumbs/breadcrumb/breadcrumb.component"; +import { BreadcrumbsComponent } from "../core/breadcrumbs/breadcrumbs.component"; +import { LoggerService } from "../core/logger.service"; +import { MockAppSettingsService } from "../core/mock-app-settings.service"; +import { VerticalNavComponent } from "../core/vertical-nav/vertical-nav.component"; +import { environment } from "../../environments/environment"; import { ModalModule } from "ngx-bootstrap/modal"; import { BsModalService } from "ngx-bootstrap/modal"; import { ModalModule as PfngModalModule, NavigationModule as PfngNavigationModule } from "patternfly-ng"; @@ -84,9 +84,9 @@ export class CoreModule { /** * A factory that produces the appropriate instande of the service based on current environment settings. * - * @param {Http} http the HTTP service - * @param {LoggerService} logger the logger - * @returns {AppSettingsService} the requested service + * @param http the HTTP service + * @param logger the logger + * @returns the requested service */ export function appSettingsServiceFactory( http: Http, logger: LoggerService ): AppSettingsService { @@ -97,10 +97,10 @@ export function appSettingsServiceFactory( http: Http, /** * A factory that produces the appropriate instance of the service based on current environment settings. * - * @param {Http} http the HTTP service - * @param {AppSettingsService} appSettings the app settings - * @param {LoggerService} logger the logger - * @returns {AboutService} the requested service + * @param http the HTTP service + * @param appSettings the app settings + * @param logger the logger + * @returns the requested service */ export function aboutServiceFactory( http: Http, appSettings: AppSettingsService, diff --git a/ui/src/app/core/logger.service.spec.ts b/ui/src/app/core/logger.service.spec.ts index 97db9569..eb2b76f8 100644 --- a/ui/src/app/core/logger.service.spec.ts +++ b/ui/src/app/core/logger.service.spec.ts @@ -1,5 +1,5 @@ import { inject, TestBed } from "@angular/core/testing"; -import { LoggerService } from "@core/logger.service"; +import { LoggerService } from "../core/logger.service"; describe("LoggerService", () => { beforeEach(() => { diff --git a/ui/src/app/core/logger.service.ts b/ui/src/app/core/logger.service.ts index edfdaa7f..510246b1 100644 --- a/ui/src/app/core/logger.service.ts +++ b/ui/src/app/core/logger.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from "@angular/core"; -import { environment } from "@environments/environment"; +import { environment } from "../../environments/environment"; @Injectable() export class LoggerService { @@ -28,7 +28,7 @@ export class LoggerService { /** * Logs a debug console message only if not in production mode. * - * @param {string} msg the message being logged + * @param msg the message being logged * @param optional any optional parameters */ public debug( msg: string, ...optional: any[] ): void { @@ -38,7 +38,7 @@ export class LoggerService { } /** - * @param {string} msg the error message being logged + * @param msg the error message being logged * @param optional any optional parameters */ public error( msg: string, ...optional: any[] ): void { @@ -48,7 +48,7 @@ export class LoggerService { /** * Same as log method. * - * @param {string} msg the info message being logged + * @param msg the info message being logged * @param optional any optional parameters */ public info( msg: string, ...optional: any[] ): void { @@ -56,7 +56,7 @@ export class LoggerService { } /** - * @param {string} msg the message being logged + * @param msg the message being logged * @param optional any optional parameters */ public log( msg: string, ...optional: any[] ): void { @@ -64,7 +64,7 @@ export class LoggerService { } /** - * @param {string} msg the warning message being logged + * @param msg the warning message being logged * @param optional any optional parameters */ public warn( msg: string, ...optional: any[] ): void { diff --git a/ui/src/app/core/mock-app-settings.service.ts b/ui/src/app/core/mock-app-settings.service.ts index dc4206d5..e5f63e0b 100644 --- a/ui/src/app/core/mock-app-settings.service.ts +++ b/ui/src/app/core/mock-app-settings.service.ts @@ -1,8 +1,8 @@ import { Injectable, OnInit } from "@angular/core"; import { Http } from "@angular/http"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; -import { environment } from "@environments/environment"; +import { AppSettingsService } from "../core/app-settings.service"; +import { LoggerService } from "../core/logger.service"; +import { environment } from "../../environments/environment"; import { Observable } from "rxjs/Observable"; @Injectable() diff --git a/ui/src/app/core/selection.service.ts b/ui/src/app/core/selection.service.ts index 312cb58b..b23135b3 100644 --- a/ui/src/app/core/selection.service.ts +++ b/ui/src/app/core/selection.service.ts @@ -16,10 +16,10 @@ */ import { Injectable } from "@angular/core"; -import { Dataservice } from "@dataservices/shared/dataservice.model"; -import { Connection } from "@connections/shared/connection.model"; -import { ViewDefinition } from "@dataservices/shared/view-definition.model"; -import { SqlView } from "@dataservices/shared/sql-view.model"; +import { Dataservice } from "../dataservices/shared/dataservice.model"; +import { Connection } from "../connections/shared/connection.model"; +import { ViewDefinition } from "../dataservices/shared/view-definition.model"; +import { SqlView } from "../dataservices/shared/sql-view.model"; @Injectable() export class SelectionService { @@ -35,7 +35,7 @@ export class SelectionService { /** * Gets the selected virtualization - * @returns {Dataservice} the selected virtualization + * @returns the selected virtualization */ public getSelectedVirtualization(): Dataservice { return this.selectedVirtualization; @@ -43,7 +43,7 @@ export class SelectionService { /** * Sets the selected dataservice - * @param {Dataservice} virtualization the selected virtualization + * @param virtualization the selected virtualization */ public setSelectedVirtualization(virtualization: Dataservice): void { this.selectedVirtualization = virtualization; @@ -51,7 +51,7 @@ export class SelectionService { /** * Determine if there is a selected virtualization - * @returns {boolean} 'true' if a virtualization is selected + * @returns 'true' if a virtualization is selected */ public get hasSelectedVirtualization(): boolean { return this.selectedVirtualization && this.selectedVirtualization !== null; @@ -60,7 +60,7 @@ export class SelectionService { /** * Get the current Virtualization selection's views.View * The ViewDefinition name is currently set to the full "modelName"."viewName" of the view. - * @returns {SqlView[]} the selected Dataservice view definitions + * @returns the selected Dataservice view definitions */ public getSelectedVirtualizationViewNames( ): SqlView[] { if ( !this.hasSelectedVirtualization ) { @@ -80,7 +80,7 @@ export class SelectionService { /** * Gets the selected connection - * @returns {Connection} the selected connection + * @returns the selected connection */ public getSelectedConnection(): Connection { return this.selectedConnection; @@ -88,7 +88,7 @@ export class SelectionService { /** * Sets the selected connection - * @param {Connection} connection the selected connection + * @param connection the selected connection */ public setSelectedConnection(connection: Connection): void { this.selectedConnection = connection; @@ -96,7 +96,7 @@ export class SelectionService { /** * Determine if there is a selected connection - * @returns {boolean} 'true' if a connection is selected + * @returns 'true' if a connection is selected */ public get hasSelectedConnection(): boolean { return this.selectedConnection && this.selectedConnection !== null; @@ -104,7 +104,7 @@ export class SelectionService { /** * Gets the selected view definition - * @returns {ViewDefinition} the selected view definition + * @returns the selected view definition */ public getSelectedViewDefinition(): ViewDefinition { return this.selectedViewDefinition; @@ -112,7 +112,7 @@ export class SelectionService { /** * Sets the selected view definition - * @param {ViewDefinition} view the selected view definition + * @param view the selected view definition */ public setSelectedViewDefinition(virtualization: Dataservice, viewDefn: ViewDefinition): void { this.selectedVirtualization = virtualization; @@ -121,7 +121,7 @@ export class SelectionService { /** * Determine if there is a selected view definition - * @returns {boolean} 'true' if a view definition is selected + * @returns 'true' if a view definition is selected */ public get hasSelectedViewDefinition(): boolean { return this.selectedViewDefinition && this.selectedViewDefinition !== null; @@ -129,7 +129,7 @@ export class SelectionService { /** * Determine if has a connection which needs its schema regenerated - * @returns {boolean} 'true' if there is a connection needing schema regen + * @returns 'true' if there is a connection needing schema regen */ public get hasConnectionForSchemaRegen(): boolean { return this.connectionForSchemaRegen && this.connectionForSchemaRegen.length > 0; @@ -137,7 +137,7 @@ export class SelectionService { /** * Gets the connection id which needs its schema regenerated - * @returns {string} the connection id needing schema regen + * @returns the connection id needing schema regen */ public getConnectionIdForSchemaRegen(): string { return this.connectionForSchemaRegen; @@ -145,7 +145,7 @@ export class SelectionService { /** * Sets the connection id which needs its schema regenerated - * @param {string} connectionName the connection id which needs its schema regenerated + * @param connectionName the connection id which needs its schema regenerated */ public setConnectionIdForSchemaRegen(connectionName: string): void { this.connectionForSchemaRegen = connectionName !== null ? connectionName : ""; diff --git a/ui/src/app/core/utils/array-utils.ts b/ui/src/app/core/utils/array-utils.ts index 8ee19662..da5be579 100644 --- a/ui/src/app/core/utils/array-utils.ts +++ b/ui/src/app/core/utils/array-utils.ts @@ -20,7 +20,7 @@ export class ArrayUtils { /** * @param a the array being searched * @param item the item being searched for - * @return {boolean} true if the given item is contained in the given array + * @return true if the given item is contained in the given array */ public static contains( a: any[], item: any ): boolean { for ( const aitem of a ) { @@ -32,9 +32,9 @@ export class ArrayUtils { } /** - * @param {any[]} a1 the first array - * @param {any[]} a2 the second array - * @returns {any[]} the intersection of two arrays + * @param a1 the first array + * @param a2 the second array + * @returns the intersection of two arrays */ public static intersect( a1: any[], a2: any[] ): any[] { const rval: any[] = []; diff --git a/ui/src/app/core/vertical-nav/vertical-nav.component.spec.ts b/ui/src/app/core/vertical-nav/vertical-nav.component.spec.ts index fe0c8afc..662dee5a 100644 --- a/ui/src/app/core/vertical-nav/vertical-nav.component.spec.ts +++ b/ui/src/app/core/vertical-nav/vertical-nav.component.spec.ts @@ -1,12 +1,12 @@ import { async, ComponentFixture, inject, TestBed } from "@angular/core/testing"; import { HttpModule } from "@angular/http"; import { RouterTestingModule } from "@angular/router/testing"; -import { AboutDialogComponent } from "@core/about-dialog/about-dialog.component"; -import { AboutService } from "@core/about-dialog/about.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; -import { VerticalNavComponent } from "@core/vertical-nav/vertical-nav.component"; +import { AboutDialogComponent } from "../../core/about-dialog/about-dialog.component"; +import { AboutService } from "../../core/about-dialog/about.service"; +import { AppSettingsService } from "../../core/app-settings.service"; +import { LoggerService } from "../../core/logger.service"; +import { MockAppSettingsService } from "../../core/mock-app-settings.service"; +import { VerticalNavComponent } from "../../core/vertical-nav/vertical-nav.component"; import { BsModalService, ModalModule } from "ngx-bootstrap"; import { ModalModule as PfngModalModule, NavigationModule as PfngNavigationModule } from "patternfly-ng"; diff --git a/ui/src/app/core/vertical-nav/vertical-nav.component.ts b/ui/src/app/core/vertical-nav/vertical-nav.component.ts index f751c0da..288ce60a 100644 --- a/ui/src/app/core/vertical-nav/vertical-nav.component.ts +++ b/ui/src/app/core/vertical-nav/vertical-nav.component.ts @@ -17,11 +17,11 @@ import { Component, Input, OnInit, TemplateRef, ViewEncapsulation } from "@angular/core"; import { Router } from "@angular/router"; -import { ConnectionsConstants } from "@connections/shared/connections-constants"; -import { AboutEvent } from "@core/about-dialog/about-event"; -import { About } from "@core/about-dialog/about.model"; -import { LoggerService } from "@core/logger.service"; -import { DataservicesConstants } from "@dataservices/shared/dataservices-constants"; +import { ConnectionsConstants } from "../../connections/shared/connections-constants"; +import { AboutEvent } from "../../core/about-dialog/about-event"; +import { About } from "../../core/about-dialog/about.model"; +import { LoggerService } from "../../core/logger.service"; +import { DataservicesConstants } from "../../dataservices/shared/dataservices-constants"; import { BsModalService } from "ngx-bootstrap/modal"; import { BsModalRef } from "ngx-bootstrap/modal/bs-modal-ref.service"; import { NavigationItemConfig } from "patternfly-ng"; diff --git a/ui/src/app/dataservices/create-views-dialog/create-views-dialog.component.spec.ts b/ui/src/app/dataservices/create-views-dialog/create-views-dialog.component.spec.ts index 88699bd0..c6442457 100644 --- a/ui/src/app/dataservices/create-views-dialog/create-views-dialog.component.spec.ts +++ b/ui/src/app/dataservices/create-views-dialog/create-views-dialog.component.spec.ts @@ -13,16 +13,16 @@ import { TableModule, WizardModule } from "patternfly-ng"; import { BsModalRef, ModalModule } from "ngx-bootstrap"; -import { ConnectionService } from "@connections/shared/connection.service"; -import { MockConnectionService } from "@connections/shared/mock-connection.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; +import { ConnectionService } from "../../connections/shared/connection.service"; +import { MockConnectionService } from "../../connections/shared/mock-connection.service"; +import { AppSettingsService } from "../../core/app-settings.service"; +import { LoggerService } from "../../core/logger.service"; +import { NotifierService } from "../../dataservices/shared/notifier.service"; import { FormsModule, ReactiveFormsModule } from "@angular/forms"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { MockDataserviceService } from "@dataservices/shared/mock-dataservice.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; +import { DataserviceService } from "../../dataservices/shared/dataservice.service"; +import { MockDataserviceService } from "../../dataservices/shared/mock-dataservice.service"; +import { VdbService } from "../../dataservices/shared/vdb.service"; +import { MockVdbService } from "../../dataservices/shared/mock-vdb.service"; describe("CreateViewsDialogComponent", () => { let component: CreateViewsDialogComponent; diff --git a/ui/src/app/dataservices/create-views-dialog/create-views-dialog.component.ts b/ui/src/app/dataservices/create-views-dialog/create-views-dialog.component.ts index 6ba9e649..f300d54d 100644 --- a/ui/src/app/dataservices/create-views-dialog/create-views-dialog.component.ts +++ b/ui/src/app/dataservices/create-views-dialog/create-views-dialog.component.ts @@ -1,11 +1,11 @@ import { Component, EventEmitter, OnInit, Output } from '@angular/core'; -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; +import { ViewEditorI18n } from "../../dataservices/virtualization/view-editor/view-editor-i18n"; import { BsModalRef } from "ngx-bootstrap"; -import { ConnectionService } from "@connections/shared/connection.service"; -import { LoggerService } from "@core/logger.service"; -import { LoadingState } from "@shared/loading-state.enum"; -import { ConnectionsConstants } from "@connections/shared/connections-constants"; -import { SchemaNode } from "@connections/shared/schema-node.model"; +import { ConnectionService } from "../../connections/shared/connection.service"; +import { LoggerService } from "../../core/logger.service"; +import { LoadingState } from "../../shared/loading-state.enum"; +import { ConnectionsConstants } from "../../connections/shared/connections-constants"; +import { SchemaNode } from "../../connections/shared/schema-node.model"; import { EmptyStateConfig, ListConfig, @@ -13,11 +13,11 @@ import { NotificationType, TableConfig } from "patternfly-ng"; -import { NewView } from "@dataservices/create-views-dialog/new-view.model"; +import { NewView } from "../../dataservices/create-views-dialog/new-view.model"; import { TableEvent } from "patternfly-ng"; import { AbstractControl, FormControl, FormGroup } from "@angular/forms"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { CreateViewsResult } from "@dataservices/create-views-dialog/create-views-result.model"; +import { DataserviceService } from "../../dataservices/shared/dataservice.service"; +import { CreateViewsResult } from "../../dataservices/create-views-dialog/create-views-result.model"; @Component({ selector: 'app-create-views-dialog', @@ -177,7 +177,7 @@ export class CreateViewsDialogComponent implements OnInit { /** * Handler for virtualization name changes. - * @param {AbstractControl} input + * @param input */ public handleVirtNameChanged( input: AbstractControl ): void { const self = this; @@ -210,7 +210,7 @@ export class CreateViewsDialogComponent implements OnInit { /** * Handles change in connection selection - * @param {ListEvent} $event the list selection event + * @param $event the list selection event */ public handleConnectionSelectionChange($event: ListEvent): void { const newSelections = $event.selectedItems; @@ -240,7 +240,7 @@ export class CreateViewsDialogComponent implements OnInit { /** * Handler for connection selection - * @param {SchemaNode} conn the connection node + * @param conn the connection node */ private onConnectionSelected(conn: SchemaNode): void { this.generateConnectionViewInfos(conn.getName()); @@ -248,7 +248,7 @@ export class CreateViewsDialogComponent implements OnInit { /** * Handler for connection deselection - * @param {SchemaNode} conn the connection node + * @param conn the connection node */ private onConnectionDeselected(conn: SchemaNode): void { let i = this.allViews.length; @@ -262,7 +262,7 @@ export class CreateViewsDialogComponent implements OnInit { /** * Handles change in View selections - * @param {TableEvent} $event the table selection event + * @param $event the table selection event */ public handleViewSelectionChange($event: TableEvent): void { this.selectedViews = $event.selectedRows; @@ -271,7 +271,6 @@ export class CreateViewsDialogComponent implements OnInit { /** * Determine if connections are loading - * @returns {boolean} */ public get connectionsLoading( ): boolean { return ( this.connectionsLoadingState === LoadingState.LOADING ); @@ -279,7 +278,6 @@ export class CreateViewsDialogComponent implements OnInit { /** * Determine if connections loading completed, and was successful - * @returns {boolean} */ public get connectionsLoadedSuccess( ): boolean { return ( this.connectionsLoadingState === LoadingState.LOADED_VALID ); @@ -287,7 +285,6 @@ export class CreateViewsDialogComponent implements OnInit { /** * Determine if connections loading completed, but failed - * @returns {boolean} */ public get connectionsLoadedFailed( ): boolean { return ( this.connectionsLoadingState === LoadingState.LOADED_INVALID ); @@ -295,7 +292,6 @@ export class CreateViewsDialogComponent implements OnInit { /** * Determine if views are loading - * @returns {boolean} */ public get viewsLoading( ): boolean { return ( this.viewsLoadingState === LoadingState.LOADING ); @@ -303,7 +299,6 @@ export class CreateViewsDialogComponent implements OnInit { /** * Determine if views loading completed, and was successful - * @returns {boolean} */ public get viewsLoadedSuccess( ): boolean { return ( this.viewsLoadingState === LoadingState.LOADED_VALID ); @@ -311,7 +306,6 @@ export class CreateViewsDialogComponent implements OnInit { /** * Determine if views loading completed, but failed - * @returns {boolean} */ public get viewsLoadedFailed( ): boolean { return ( this.viewsLoadingState === LoadingState.LOADED_INVALID ); @@ -352,7 +346,7 @@ export class CreateViewsDialogComponent implements OnInit { /** * Generate the view infos for the supplied connection name - * @param {string} connName the connection name + * @param connName the connection name */ public generateConnectionViewInfos(connName: string): void { // Load the connections @@ -382,7 +376,7 @@ export class CreateViewsDialogComponent implements OnInit { /** * Recursively generate the view infos for this node and its children - * @param {SchemaNode} schemaNode the schema node + * @param schemaNode the schema node */ private generateViewInfos(connName: string, schemaNode: SchemaNode, nodePath: string[], viewInfos: NewView[]): void { const sourcePath: string[] = []; diff --git a/ui/src/app/dataservices/create-views-dialog/create-views-result.model.ts b/ui/src/app/dataservices/create-views-dialog/create-views-result.model.ts index f7fb16ea..9d0cc030 100644 --- a/ui/src/app/dataservices/create-views-dialog/create-views-result.model.ts +++ b/ui/src/app/dataservices/create-views-dialog/create-views-result.model.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { NewView } from "@dataservices/create-views-dialog/new-view.model"; +import { NewView } from "../../dataservices/create-views-dialog/new-view.model"; /** * CreateViewsResult model - to hold the results of the CreateViewsDialog entry @@ -31,42 +31,42 @@ export class CreateViewsResult { } /** - * @returns {string} the virtualization name + * @returns the virtualization name */ public getVirtualizationName(): string { return this.virtName; } /** - * @param {string} name the virtualization name + * @param name the virtualization name */ public setVirtualizationName( name?: string ): void { this.virtName = name ? name : null; } /** - * @returns {string} the virtualization description + * @returns the virtualization description */ public getVirtualizationDescription(): string { return this.virtDescription; } /** - * @param {string} description the virtualization description + * @param description the virtualization description */ public setVirtualizationDescription( description?: string ): void { this.virtDescription = description ? description : ""; } /** - * @returns {NewView[]} the views + * @returns the views */ public getViews(): NewView[] { return this.views; } /** - * @param {NewView[]} views the views to create + * @param views the views to create */ public setViews( views: NewView[] ): void { this.views = views; diff --git a/ui/src/app/dataservices/create-views-dialog/new-view.model.ts b/ui/src/app/dataservices/create-views-dialog/new-view.model.ts index 37dca688..25c9777b 100644 --- a/ui/src/app/dataservices/create-views-dialog/new-view.model.ts +++ b/ui/src/app/dataservices/create-views-dialog/new-view.model.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { SchemaNode } from "@connections/shared/schema-node.model"; +import { SchemaNode } from "../../connections/shared/schema-node.model"; /** * NewView model - to hold the NewView objects @@ -33,63 +33,63 @@ export class NewView { } /** - * @returns {string} the connection name + * @returns the connection name */ public getConnectionName(): string { return this.connection; } /** - * @param {string} name the connection name + * @param name the connection name */ public setConnectionName( name?: string ): void { this.connection = name ? name : null; } /** - * @returns {string} the view name + * @returns the view name */ public getViewName(): string { return this.view; } /** - * @param {string} name the view name + * @param name the view name */ public setViewName( name?: string ): void { this.view = name ? name : null; } /** - * @returns {string} the view description + * @returns the view description */ public getViewDescription(): string { return this.viewDescription; } /** - * @param {string} description the view description + * @param description the view description */ public setViewDescription( description?: string ): void { this.viewDescription = description ? description : ""; } /** - * @returns {SchemaNode} the view source node + * @returns the view source node */ public getViewSourceNode(): SchemaNode { return this.viewSourceNode; } /** - * @param {SchemaNode} node the view source node + * @param node the view source node */ public setViewSourceNode( node: SchemaNode ): void { this.viewSourceNode = node; } /** - * @returns {string} the stringified node path + * @returns the stringified node path */ public get path(): string { let path = ""; @@ -108,7 +108,7 @@ export class NewView { } /** - * @param {string[]} path the node path + * @param path the node path */ public setNodePath( path: string[] ): void { this.nodePath = []; diff --git a/ui/src/app/dataservices/dataservices-cards/dataservice-card/dataservice-card.component.spec.ts b/ui/src/app/dataservices/dataservices-cards/dataservice-card/dataservice-card.component.spec.ts index 615c6651..41e0e29f 100644 --- a/ui/src/app/dataservices/dataservices-cards/dataservice-card/dataservice-card.component.spec.ts +++ b/ui/src/app/dataservices/dataservices-cards/dataservice-card/dataservice-card.component.spec.ts @@ -1,16 +1,16 @@ import { async, ComponentFixture, TestBed } from "@angular/core/testing"; import { FormsModule } from "@angular/forms"; import { RouterTestingModule } from "@angular/router/testing"; -import { LoggerService } from "@core/logger.service"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { DataserviceCardComponent } from "@dataservices/dataservices-cards/dataservice-card/dataservice-card.component"; -import { Dataservice } from "@dataservices/shared/dataservice.model"; -import { SharedModule } from "@shared/shared.module"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; +import { LoggerService } from "../../../core/logger.service"; +import { DataserviceService } from "../../../dataservices/shared/dataservice.service"; +import { DataserviceCardComponent } from "../../../dataservices/dataservices-cards/dataservice-card/dataservice-card.component"; +import { Dataservice } from "../../../dataservices/shared/dataservice.model"; +import { SharedModule } from "../../../shared/shared.module"; +import { MockVdbService } from "../../../dataservices/shared/mock-vdb.service"; +import { VdbService } from "../../../dataservices/shared/vdb.service"; +import { AppSettingsService } from "../../../core/app-settings.service"; +import { MockAppSettingsService } from "../../../core/mock-app-settings.service"; +import { NotifierService } from "../../../dataservices/shared/notifier.service"; import { ActionModule, CardModule, diff --git a/ui/src/app/dataservices/dataservices-cards/dataservice-card/dataservice-card.component.ts b/ui/src/app/dataservices/dataservices-cards/dataservice-card/dataservice-card.component.ts index d4ed6e5a..80131b48 100644 --- a/ui/src/app/dataservices/dataservices-cards/dataservice-card/dataservice-card.component.ts +++ b/ui/src/app/dataservices/dataservices-cards/dataservice-card/dataservice-card.component.ts @@ -19,14 +19,14 @@ import { Component, DoCheck, EventEmitter, Input, OnInit, Output, ViewEncapsulation, ViewChild } from "@angular/core"; import * as _ from "lodash"; -import { LoggerService } from "@core/logger.service"; +import { LoggerService } from "../../../core/logger.service"; import { Action, ActionConfig, CardAction, CardConfig, EmptyStateConfig, ListConfig } from "patternfly-ng"; import { Observable } from "rxjs/Observable"; import { Subscription } from "rxjs/Subscription"; -import { Dataservice } from "@dataservices/shared/dataservice.model"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { Connection } from "@connections/shared/connection.model"; -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; +import { Dataservice } from "../../../dataservices/shared/dataservice.model"; +import { DataserviceService } from "../../../dataservices/shared/dataservice.service"; +import { Connection } from "../../../connections/shared/connection.model"; +import { ViewEditorI18n } from "../../../dataservices/virtualization/view-editor/view-editor-i18n"; @Component({ encapsulation: ViewEncapsulation.None, @@ -99,7 +99,7 @@ export class DataserviceCardComponent implements DoCheck, OnInit { } /** - * @returns {string} the dataservice description + * @returns the dataservice description */ public get description(): string { return this.dataservice.getDescription(); @@ -110,8 +110,8 @@ export class DataserviceCardComponent implements DoCheck, OnInit { } /** - * @param {string} view the view whose connections are being requested - * @returns {Connection[]} the connections of the dataservice represented by this card + * @param view the view whose connections are being requested + * @returns the connections of the dataservice represented by this card */ public getConnections( view: string ): Connection[] { // TODO rewrite when REST functionality has been implemented @@ -133,7 +133,7 @@ export class DataserviceCardComponent implements DoCheck, OnInit { } /** - * @returns {string[]} the names of the views + * @returns the names of the views */ public getViews(): string[] { return this.dataservice.getServiceViewNames(); @@ -141,7 +141,7 @@ export class DataserviceCardComponent 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 ) { @@ -158,7 +158,7 @@ export class DataserviceCardComponent implements DoCheck, OnInit { } /** - * @returns {boolean} `true` if the dataservice represented by this card is selected + * @returns `true` if the dataservice represented by this card is selected */ public isSelected(): boolean { return this.selectedDataservices.indexOf( this.dataservice ) !== -1; @@ -237,7 +237,7 @@ export class DataserviceCardComponent 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, dataserviceName: this.dataservice.getId() } ); @@ -245,7 +245,7 @@ export class DataserviceCardComponent implements DoCheck, OnInit { /** * An event handler for when edit view is invoked. - * @param {string} vName the name of the view in the selected dataservice + * @param vName the name of the view in the selected dataservice */ public onEditView( vName: string ): void { this.cardEvent.emit( { @@ -264,7 +264,7 @@ export class DataserviceCardComponent 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; @@ -272,7 +272,7 @@ export class DataserviceCardComponent 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"; diff --git a/ui/src/app/dataservices/dataservices-cards/dataservices-cards.component.spec.ts b/ui/src/app/dataservices/dataservices-cards/dataservices-cards.component.spec.ts index 97674f8e..d6191610 100644 --- a/ui/src/app/dataservices/dataservices-cards/dataservices-cards.component.spec.ts +++ b/ui/src/app/dataservices/dataservices-cards/dataservices-cards.component.spec.ts @@ -1,10 +1,10 @@ import { async, ComponentFixture, TestBed } from "@angular/core/testing"; import { RouterTestingModule } from "@angular/router/testing"; import { FormsModule } from "@angular/forms"; -import { LoggerService } from "@core/logger.service"; -import { DataserviceCardComponent } from "@dataservices/dataservices-cards/dataservice-card/dataservice-card.component"; -import { DataservicesCardsComponent } from "@dataservices/dataservices-cards/dataservices-cards.component"; -import { SharedModule } from "@shared/shared.module"; +import { LoggerService } from "../../core/logger.service"; +import { DataserviceCardComponent } from "../../dataservices/dataservices-cards/dataservice-card/dataservice-card.component"; +import { DataservicesCardsComponent } from "../../dataservices/dataservices-cards/dataservices-cards.component"; +import { SharedModule } from "../../shared/shared.module"; import { ActionModule, CardModule, diff --git a/ui/src/app/dataservices/dataservices-cards/dataservices-cards.component.ts b/ui/src/app/dataservices/dataservices-cards/dataservices-cards.component.ts index 27abf798..e7f7de2b 100644 --- a/ui/src/app/dataservices/dataservices-cards/dataservices-cards.component.ts +++ b/ui/src/app/dataservices/dataservices-cards/dataservices-cards.component.ts @@ -16,10 +16,10 @@ */ import { Component, EventEmitter, Input, Output, ViewEncapsulation } from "@angular/core"; -import { LoggerService } from "@core/logger.service"; -import { DataserviceCardComponent } from "@dataservices/dataservices-cards/dataservice-card/dataservice-card.component"; -import { Dataservice } from "@dataservices/shared/dataservice.model"; -import { NameValue } from "@dataservices/shared/name-value.model"; +import { LoggerService } from "../../core/logger.service"; +import { DataserviceCardComponent } from "../../dataservices/dataservices-cards/dataservice-card/dataservice-card.component"; +import { Dataservice } from "../../dataservices/shared/dataservice.model"; +import { NameValue } from "../../dataservices/shared/name-value.model"; @Component({ moduleId: module.id, @@ -47,7 +47,7 @@ export class DataservicesCardsComponent { public logger: LoggerService; /** - * @param {LoggerService} logger the logging service + * @param logger the logging service */ constructor( logger: LoggerService ) { this.logger = logger; diff --git a/ui/src/app/dataservices/dataservices-list/dataservices-details.component.ts b/ui/src/app/dataservices/dataservices-list/dataservices-details.component.ts index 86a2d541..d571738b 100644 --- a/ui/src/app/dataservices/dataservices-list/dataservices-details.component.ts +++ b/ui/src/app/dataservices/dataservices-list/dataservices-details.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, OnInit, ViewEncapsulation } from "@angular/core"; -import { Dataservice } from "@dataservices/shared/dataservice.model"; +import { Dataservice } from "../../dataservices/shared/dataservice.model"; import { ListConfig } from "patternfly-ng"; import { DataservicesConstants } from "../shared/dataservices-constants"; @@ -45,7 +45,7 @@ export class DataservicesDetailsComponent implements OnInit { } /** - * @returns {string[][]} the properties of a dataservice + * @returns the properties of a dataservice */ public get properties(): string[][] { const props = [ diff --git a/ui/src/app/dataservices/dataservices-list/dataservices-list.component.spec.ts b/ui/src/app/dataservices/dataservices-list/dataservices-list.component.spec.ts index 3bedb0a0..1f7f95df 100644 --- a/ui/src/app/dataservices/dataservices-list/dataservices-list.component.spec.ts +++ b/ui/src/app/dataservices/dataservices-list/dataservices-list.component.spec.ts @@ -1,17 +1,17 @@ import { async, ComponentFixture, TestBed } from "@angular/core/testing"; import { FormsModule } from "@angular/forms"; import { RouterTestingModule } from "@angular/router/testing"; -import { LoggerService } from "@core/logger.service"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { DataservicesDetailsComponent } from "@dataservices/dataservices-list/dataservices-details.component"; -import { DataservicesListComponent } from "@dataservices/dataservices-list/dataservices-list.component"; -import { ViewsContentComponent } from "@dataservices/dataservices-list/views-content.component"; -import { SharedModule } from "@shared/shared.module"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; +import { LoggerService } from "../../core/logger.service"; +import { DataserviceService } from "../../dataservices/shared/dataservice.service"; +import { DataservicesDetailsComponent } from "../../dataservices/dataservices-list/dataservices-details.component"; +import { DataservicesListComponent } from "../../dataservices/dataservices-list/dataservices-list.component"; +import { ViewsContentComponent } from "../../dataservices/dataservices-list/views-content.component"; +import { SharedModule } from "../../shared/shared.module"; +import { MockVdbService } from "../../dataservices/shared/mock-vdb.service"; +import { VdbService } from "../../dataservices/shared/vdb.service"; +import { AppSettingsService } from "../../core/app-settings.service"; +import { MockAppSettingsService } from "../../core/mock-app-settings.service"; +import { NotifierService } from "../../dataservices/shared/notifier.service"; import { ActionModule, CardModule, diff --git a/ui/src/app/dataservices/dataservices-list/dataservices-list.component.ts b/ui/src/app/dataservices/dataservices-list/dataservices-list.component.ts index d2fdb2df..10dc9b22 100644 --- a/ui/src/app/dataservices/dataservices-list/dataservices-list.component.ts +++ b/ui/src/app/dataservices/dataservices-list/dataservices-list.component.ts @@ -24,14 +24,14 @@ import { ViewEncapsulation, ViewChild } from "@angular/core"; -import { LoggerService } from "@core/logger.service"; +import { LoggerService } from "../../core/logger.service"; import { Action, ActionConfig, ListConfig } from "patternfly-ng"; import { Observable } from "rxjs/Observable"; import { Subscription } from "rxjs/Subscription"; import * as _ from "lodash"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { Dataservice } from "@dataservices/shared/dataservice.model"; -import { NameValue } from "@dataservices/shared/name-value.model"; +import { DataserviceService } from "../../dataservices/shared/dataservice.service"; +import { Dataservice } from "../../dataservices/shared/dataservice.model"; +import { NameValue } from "../../dataservices/shared/name-value.model"; @Component({ encapsulation: ViewEncapsulation.None, @@ -90,7 +90,7 @@ export class DataservicesListComponent implements OnInit { private logMonitor: Subscription = null; /** - * @param {LoggerService} logger the logging service + * @param logger the logging service */ constructor( logger: LoggerService, dataserviceService: DataserviceService ) { this.logger = logger; @@ -110,7 +110,7 @@ export class DataservicesListComponent implements OnInit { * @param downloadActionTemplate {TemplateRef} the download action template * @param deleteActionTemplate {TemplateRef} the delete action template * @param odataLookActionTemplate {TemplateRef} the odata preview action template - * @returns {ActionConfig} the actions configuration + * @returns the actions configuration */ public getActionConfig( ds: Dataservice, editActionTemplate: TemplateRef< any >, @@ -188,8 +188,8 @@ export class DataservicesListComponent implements OnInit { } /** - * @param {Dataservice} dataservice the dataservice whose description is being requested - * @returns {string} the description (truncated to 120 characters if needed) + * @param dataservice the dataservice whose description is being requested + * @returns the description (truncated to 120 characters if needed) */ public getDescription( dataservice: Dataservice ): string { const description = dataservice.getDescription(); diff --git a/ui/src/app/dataservices/dataservices-list/views-content.component.ts b/ui/src/app/dataservices/dataservices-list/views-content.component.ts index f90e9bb9..8b6da20f 100644 --- a/ui/src/app/dataservices/dataservices-list/views-content.component.ts +++ b/ui/src/app/dataservices/dataservices-list/views-content.component.ts @@ -16,10 +16,10 @@ */ import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from "@angular/core"; -import { Connection } from "@connections/shared/connection.model"; -import { Dataservice } from "@dataservices/shared/dataservice.model"; +import { Connection } from "../../connections/shared/connection.model"; +import { Dataservice } from "../../dataservices/shared/dataservice.model"; import { ListConfig } from "patternfly-ng"; -import { NameValue } from "@dataservices/shared/name-value.model"; +import { NameValue } from "../../dataservices/shared/name-value.model"; @Component({ encapsulation: ViewEncapsulation.None, @@ -38,8 +38,8 @@ export class ViewsContentComponent implements OnInit { } /** - * @param {string} view the view whose connections are being requested - * @returns {Connection[]} the connections of the dataservice represented by this card + * @param view the view whose connections are being requested + * @returns the connections of the dataservice represented by this card */ public getConnections( view: string ): Connection[] { // TODO rewrite when REST functionality has been implemented @@ -61,8 +61,8 @@ export class ViewsContentComponent implements OnInit { } /** - * @param {Dataservice} ds the dataservice whose views are being requested - * @returns {string[]} the names of the views + * @param ds the dataservice whose views are being requested + * @returns the names of the views */ public getViews( ds: Dataservice ): string[] { const result: string[] = []; @@ -86,7 +86,7 @@ export class ViewsContentComponent implements OnInit { /** * An event handler for when edit view is invoked. - * @param {string} vName the name of the view in the selected dataservice + * @param vName the name of the view in the selected dataservice */ public onEditView( vName: string ): void { const nameVal = new NameValue(this.virtualization.getId(), vName); diff --git a/ui/src/app/dataservices/dataservices-routing.module.ts b/ui/src/app/dataservices/dataservices-routing.module.ts index 62894f5b..e808ba79 100644 --- a/ui/src/app/dataservices/dataservices-routing.module.ts +++ b/ui/src/app/dataservices/dataservices-routing.module.ts @@ -18,10 +18,10 @@ import { NgModule } from "@angular/core"; import { RouterModule } from "@angular/router"; import { Routes } from "@angular/router"; -import { DataservicesComponent } from "@dataservices/dataservices.component"; -import { DataservicesConstants } from "@dataservices/shared/dataservices-constants"; -import { TestDataserviceComponent } from "@dataservices/test-dataservice/test-dataservice.component"; -import { ViewEditorComponent } from "@dataservices/virtualization/view-editor/view-editor.component"; +import { DataservicesComponent } from "../dataservices/dataservices.component"; +import { DataservicesConstants } from "../dataservices/shared/dataservices-constants"; +import { TestDataserviceComponent } from "../dataservices/test-dataservice/test-dataservice.component"; +import { ViewEditorComponent } from "../dataservices/virtualization/view-editor/view-editor.component"; const dataservicesRoutes: Routes = [ { path: DataservicesConstants.dataservicesRootRoute, component: DataservicesComponent }, diff --git a/ui/src/app/dataservices/dataservices.component.spec.ts b/ui/src/app/dataservices/dataservices.component.spec.ts index a92126ef..ebcb5420 100644 --- a/ui/src/app/dataservices/dataservices.component.spec.ts +++ b/ui/src/app/dataservices/dataservices.component.spec.ts @@ -3,25 +3,25 @@ import { FormsModule } from "@angular/forms"; import { HttpModule } from "@angular/http"; import { By } from "@angular/platform-browser"; import { RouterTestingModule } from "@angular/router/testing"; -import { ConnectionService } from "@connections/shared/connection.service"; -import { MockConnectionService } from "@connections/shared/mock-connection.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { CoreModule } from "@core/core.module"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; -import { DataserviceCardComponent } from "@dataservices/dataservices-cards/dataservice-card/dataservice-card.component"; -import { DataservicesCardsComponent } from "@dataservices/dataservices-cards/dataservices-cards.component"; -import { DataservicesDetailsComponent } from "@dataservices/dataservices-list/dataservices-details.component"; -import { DataservicesListComponent } from "@dataservices/dataservices-list/dataservices-list.component"; -import { ViewsContentComponent } from "@dataservices/dataservices-list/views-content.component"; -import { DataservicesComponent } from "@dataservices/dataservices.component"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { MockDataserviceService } from "@dataservices/shared/mock-dataservice.service"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { SqlControlComponent } from "@dataservices/sql-control/sql-control.component"; -import { OdataControlComponent } from "@dataservices/odata-control/odata-control.component"; -import { SharedModule } from "@shared/shared.module"; +import { ConnectionService } from "../connections/shared/connection.service"; +import { MockConnectionService } from "../connections/shared/mock-connection.service"; +import { AppSettingsService } from "../core/app-settings.service"; +import { CoreModule } from "../core/core.module"; +import { MockAppSettingsService } from "../core/mock-app-settings.service"; +import { DataserviceCardComponent } from "../dataservices/dataservices-cards/dataservice-card/dataservice-card.component"; +import { DataservicesCardsComponent } from "../dataservices/dataservices-cards/dataservices-cards.component"; +import { DataservicesDetailsComponent } from "../dataservices/dataservices-list/dataservices-details.component"; +import { DataservicesListComponent } from "../dataservices/dataservices-list/dataservices-list.component"; +import { ViewsContentComponent } from "../dataservices/dataservices-list/views-content.component"; +import { DataservicesComponent } from "../dataservices/dataservices.component"; +import { DataserviceService } from "../dataservices/shared/dataservice.service"; +import { MockDataserviceService } from "../dataservices/shared/mock-dataservice.service"; +import { MockVdbService } from "../dataservices/shared/mock-vdb.service"; +import { NotifierService } from "../dataservices/shared/notifier.service"; +import { VdbService } from "../dataservices/shared/vdb.service"; +import { SqlControlComponent } from "../dataservices/sql-control/sql-control.component"; +import { OdataControlComponent } from "../dataservices/odata-control/odata-control.component"; +import { SharedModule } from "../shared/shared.module"; import { CodemirrorModule } from "ng2-codemirror"; import { ModalModule } from "ngx-bootstrap"; import { @@ -36,7 +36,7 @@ import { WizardModule } from "patternfly-ng"; import { AccordionModule } from 'ngx-bootstrap'; import { TooltipModule } from 'ngx-bootstrap'; -import { SelectionService } from "@core/selection.service"; +import { SelectionService } from "../core/selection.service"; describe("DataservicesComponent", () => { let component: DataservicesComponent; diff --git a/ui/src/app/dataservices/dataservices.component.ts b/ui/src/app/dataservices/dataservices.component.ts index 7e80c2bc..11295efc 100644 --- a/ui/src/app/dataservices/dataservices.component.ts +++ b/ui/src/app/dataservices/dataservices.component.ts @@ -17,24 +17,24 @@ import { Component, OnInit, ViewChild } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; -import { ConnectionService } from "@connections/shared/connection.service"; -import { ConnectionsConstants } from "@connections/shared/connections-constants"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; -import { SelectionService } from "@core/selection.service"; -import { Dataservice } from "@dataservices/shared/dataservice.model"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { DataservicesConstants } from "@dataservices/shared/dataservices-constants"; -import { DeploymentState } from "@dataservices/shared/deployment-state.enum"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { PublishState } from "@dataservices/shared/publish-state.enum"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { Virtualization } from "@dataservices/shared/virtualization.model"; -import { SqlControlComponent } from "@dataservices/sql-control/sql-control.component"; -import { AbstractPageComponent } from "@shared/abstract-page.component"; -import { ConfirmDialogComponent } from "@shared/confirm-dialog/confirm-dialog.component"; -import { LayoutType } from "@shared/layout-type.enum"; -import { SortDirection } from "@shared/sort-direction.enum"; +import { ConnectionService } from "../connections/shared/connection.service"; +import { ConnectionsConstants } from "../connections/shared/connections-constants"; +import { AppSettingsService } from "../core/app-settings.service"; +import { LoggerService } from "../core/logger.service"; +import { SelectionService } from "../core/selection.service"; +import { Dataservice } from "../dataservices/shared/dataservice.model"; +import { DataserviceService } from "../dataservices/shared/dataservice.service"; +import { DataservicesConstants } from "../dataservices/shared/dataservices-constants"; +import { DeploymentState } from "../dataservices/shared/deployment-state.enum"; +import { NotifierService } from "../dataservices/shared/notifier.service"; +import { PublishState } from "../dataservices/shared/publish-state.enum"; +import { VdbService } from "../dataservices/shared/vdb.service"; +import { Virtualization } from "../dataservices/shared/virtualization.model"; +import { SqlControlComponent } from "../dataservices/sql-control/sql-control.component"; +import { AbstractPageComponent } from "../shared/abstract-page.component"; +import { ConfirmDialogComponent } from "../shared/confirm-dialog/confirm-dialog.component"; +import { LayoutType } from "../shared/layout-type.enum"; +import { SortDirection } from "../shared/sort-direction.enum"; import { BsModalService } from "ngx-bootstrap"; import { ActionConfig, @@ -50,13 +50,13 @@ import { SortField } from "patternfly-ng"; import { Subscription } from "rxjs/Subscription"; -import { SqlView } from "@dataservices/shared/sql-view.model"; -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; -import { ViewDefinition } from "@dataservices/shared/view-definition.model"; -import { ViewEditorState } from "@dataservices/shared/view-editor-state.model"; -import { NameValue } from "@dataservices/shared/name-value.model"; -import { CreateViewsDialogComponent } from "@dataservices/create-views-dialog/create-views-dialog.component"; -import { SetDescriptionDialogComponent } from "@dataservices/set-description-dialog/set-description-dialog.component"; +import { SqlView } from "../dataservices/shared/sql-view.model"; +import { ViewEditorI18n } from "../dataservices/virtualization/view-editor/view-editor-i18n"; +import { ViewDefinition } from "../dataservices/shared/view-definition.model"; +import { ViewEditorState } from "../dataservices/shared/view-editor-state.model"; +import { NameValue } from "../dataservices/shared/name-value.model"; +import { CreateViewsDialogComponent } from "../dataservices/create-views-dialog/create-views-dialog.component"; +import { SetDescriptionDialogComponent } from "../dataservices/set-description-dialog/set-description-dialog.component"; @Component({ moduleId: module.id, @@ -280,7 +280,7 @@ export class DataservicesComponent extends AbstractPageComponent implements OnIn /** * Sets the open state of the quick look panel - * @param {boolean} openState true if quick look panel is to be shown + * @param openState true if quick look panel is to be shown */ public setQuickLookPanelOpenState(openState: boolean): void { if (openState) { @@ -309,77 +309,77 @@ export class DataservicesComponent extends AbstractPageComponent implements OnIn } /** - * @returns {boolean} true if dataservice results panel is to be shown + * @returns true if dataservice results panel is to be shown */ public get showResults(): boolean { return this.resultsShowing; } /** - * @returns {boolean} true if dataservice odate editor panel is to be shown + * @returns true if dataservice odate editor panel is to be shown */ public get showOdataEditor(): boolean { return this.odataEditorShowing; } /** - * @returns {boolean} true if dataservice toast notification is to be shown + * @returns true if dataservice toast notification is to be shown */ public get showToastNotification(): boolean { return this.toastNotificationVisible; } /** - * @returns {boolean} true if dataservices are being represented by cards + * @returns true if dataservices are being represented by cards */ public get isCardLayout(): boolean { return this.appSettingsService.dataservicesPageLayout === LayoutType.CARD; } /** - * @returns {boolean} true if dataservices are being represented by items in a list + * @returns true if dataservices are being represented by items in a list */ public get isListLayout(): boolean { return this.appSettingsService.dataservicesPageLayout === LayoutType.LIST; } /** - * @returns {boolean} true if sorting dataservice names in ascending order + * @returns true if sorting dataservice names in ascending order */ public get isSortAscending(): boolean { return this.sortDirection === SortDirection.ASC; } /** - * @returns {boolean} true if sorting dataservice names in descending order + * @returns true if sorting dataservice names in descending order */ public get isSortDescending(): boolean { return this.sortDirection === SortDirection.DESC; } /** - * @returns {Dataservice[]} the array of all dataservices + * @returns the array of all dataservices */ public get allDataservices(): Dataservice[] { return this.allServices; } /** - * @returns {boolean} 'true' if any dataservices are available + * @returns 'true' if any dataservices are available */ public get hasDataservices(): boolean { return this.allServices.length > 0; } /** - * @returns {Dataservice[]} the array of filtered dataservices + * @returns the array of filtered dataservices */ public get filteredDataservices(): Dataservice[] { return this.filteredServices; } /** - * @returns {Dataservice[]} the array of selected dataservices + * @returns the array of selected dataservices */ public get selectedDataservices(): Dataservice[] { return this.selectedServices; @@ -400,21 +400,21 @@ export class DataservicesComponent extends AbstractPageComponent implements OnIn } /** - * @returns {string} the odata service name + * @returns the odata service name */ public get odataServiceName(): string { return this.odataSvcName; } /** - * @returns {string} the quick look service name + * @returns the quick look service name */ public get quickLookServiceName(): string { return this.quickLookSvcName; } /** - * @returns {string} the quick look service name + * @returns the quick look service name */ public get quickLookSql(): string { return this.quickLookQueryText; @@ -470,7 +470,7 @@ export class DataservicesComponent extends AbstractPageComponent implements OnIn /** * Handle Download of the specified Dataservice - * @param {string} svcName + * @param svcName */ public onDownload(svcName: string): void { this.closeLookPanels(); @@ -499,9 +499,9 @@ export class DataservicesComponent extends AbstractPageComponent implements OnIn /** * Set the toast notification details based on state and type. - * @param {Toast.Type} type the type of toast message (Toast.Type.xyz) - * @param {Toast.State} state the state of the progress (Toast.State.xyz) - * @param {string} virtualizationName the name of the virtualization + * @param type the type of toast message (Toast.Type.xyz) + * @param state the state of the progress (Toast.State.xyz) + * @param virtualizationName the name of the virtualization */ private setToastNotification( type: Toast.Type, state: Toast.State, virtualizationName: string ): void { // Set InProgress Toast details @@ -576,7 +576,7 @@ export class DataservicesComponent extends AbstractPageComponent implements OnIn /** * Handle Delete of the specified Dataservice - * @param {string} svcName + * @param svcName */ public onDelete(svcName: string): void { this.closeLookPanels(); @@ -660,8 +660,8 @@ export class DataservicesComponent extends AbstractPageComponent implements OnIn /* * Select the specified Dataservice. create views under it - * @param {string} dsName the name of the dataservice - * @param {ViewDefinition[]} viewDefns the array of view definitions to create + * @param dsName the name of the dataservice + * @param viewDefns the array of view definitions to create */ private selectVirtualizationCreateViews(virtName: string, viewDefns: ViewDefinition[]): void { const self = this; @@ -732,9 +732,9 @@ export class DataservicesComponent extends AbstractPageComponent implements OnIn /** * Construct id for the editor state - * @param {Dataservice} dataservice the dataservice - * @param {ViewDefinition} viewDefn the view definition - * @returns {string} the ID used to persist the editor state + * @param dataservice the dataservice + * @param viewDefn the view definition + * @returns the ID used to persist the editor state */ private getEditorStateId(dataservice: Dataservice, viewDefn: ViewDefinition): string { return dataservice.getServiceVdbName().toLowerCase() + "." + viewDefn.getName(); @@ -742,7 +742,7 @@ export class DataservicesComponent extends AbstractPageComponent implements OnIn /** * Handle Edit of the specified Dataservice and View - * @param {string} svcName + * @param svcName */ public onEdit(svcNameView: NameValue): void { const virtName = svcNameView.getName(); @@ -965,7 +965,7 @@ export class DataservicesComponent extends AbstractPageComponent implements OnIn /* * Undeploy the Vdb with the specified name - * @param {string} vdbName the name of the Vdb + * @param vdbName the name of the Vdb */ private undeployVdb(vdbName: string): void { this.vdbService @@ -1015,7 +1015,7 @@ export class DataservicesComponent extends AbstractPageComponent implements OnIn /* * Update quick look results using the supplied dataservice - * @param {string} svcName the dataservice name + * @param svcName the dataservice name */ private setQuickLookResults(svcName): void { this.quickLookSvcName = svcName; @@ -1023,7 +1023,7 @@ export class DataservicesComponent extends AbstractPageComponent implements OnIn /* * Update odata editor using the supplied dataservice - * @param {string} svcName the dataservice name + * @param svcName the dataservice name */ private setOdataServiceName(svcName): void { this.odataSvcName = svcName; diff --git a/ui/src/app/dataservices/dataservices.module.ts b/ui/src/app/dataservices/dataservices.module.ts index 875abbaf..05fe7825 100644 --- a/ui/src/app/dataservices/dataservices.module.ts +++ b/ui/src/app/dataservices/dataservices.module.ts @@ -20,38 +20,38 @@ import { NgModule } from "@angular/core"; import { FormsModule, ReactiveFormsModule } from "@angular/forms"; import { Http } from "@angular/http"; import { RouterModule } from "@angular/router"; -import { AppSettingsService } from "@core/app-settings.service"; -import { CoreModule } from "@core/core.module"; -import { LoggerService } from "@core/logger.service"; -import { DataserviceCardComponent } from "@dataservices/dataservices-cards/dataservice-card/dataservice-card.component"; -import { SelectionService } from "@core/selection.service"; -import { DataservicesCardsComponent } from "@dataservices/dataservices-cards/dataservices-cards.component"; -import { DataservicesDetailsComponent } from "@dataservices/dataservices-list/dataservices-details.component"; -import { DataservicesListComponent } from "@dataservices/dataservices-list/dataservices-list.component"; -import { ViewsContentComponent } from "@dataservices/dataservices-list/views-content.component"; -import { DataservicesRoutingModule } from "@dataservices/dataservices-routing.module"; -import { DataservicesComponent } from "@dataservices/dataservices.component"; -import { SelectedNodeComponent } from "@dataservices/selected-node/selected-node.component"; -import { SelectedNodesListComponent } from "@dataservices/selected-nodes-list/selected-nodes-list.component"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { MockDataserviceService } from "@dataservices/shared/mock-dataservice.service"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { SqlControlComponent } from "@dataservices/sql-control/sql-control.component"; -import { TestDataserviceComponent } from "@dataservices/test-dataservice/test-dataservice.component"; -import { ViewCanvasComponent } from "@dataservices/virtualization/view-editor/view-canvas/view-canvas.component"; -import { ViewEditorHeaderComponent } from "@dataservices/virtualization/view-editor/view-editor-header/view-editor-header.component"; -import { ViewEditorComponent } from "@dataservices/virtualization/view-editor/view-editor.component"; -import { ViewPreviewComponent } from "@dataservices/virtualization/view-editor/editor-views/view-preview/view-preview.component"; -import { EditorViewsComponent } from '@dataservices/virtualization/view-editor/editor-views/editor-views.component'; -import { MessageLogComponent } from '@dataservices/virtualization/view-editor/editor-views/message-log/message-log.component'; -import { CanvasService } from '@dataservices/virtualization/view-editor/view-canvas/canvas.service'; -import { GraphVisualComponent, NodeVisualComponent, LinkVisualComponent } from '@dataservices/virtualization/view-editor/view-canvas/visuals'; +import { AppSettingsService } from "../core/app-settings.service"; +import { CoreModule } from "../core/core.module"; +import { LoggerService } from "../core/logger.service"; +import { DataserviceCardComponent } from "../dataservices/dataservices-cards/dataservice-card/dataservice-card.component"; +import { SelectionService } from "../core/selection.service"; +import { DataservicesCardsComponent } from "../dataservices/dataservices-cards/dataservices-cards.component"; +import { DataservicesDetailsComponent } from "../dataservices/dataservices-list/dataservices-details.component"; +import { DataservicesListComponent } from "../dataservices/dataservices-list/dataservices-list.component"; +import { ViewsContentComponent } from "../dataservices/dataservices-list/views-content.component"; +import { DataservicesRoutingModule } from "../dataservices/dataservices-routing.module"; +import { DataservicesComponent } from "../dataservices/dataservices.component"; +import { SelectedNodeComponent } from "../dataservices/selected-node/selected-node.component"; +import { SelectedNodesListComponent } from "../dataservices/selected-nodes-list/selected-nodes-list.component"; +import { DataserviceService } from "../dataservices/shared/dataservice.service"; +import { MockDataserviceService } from "../dataservices/shared/mock-dataservice.service"; +import { MockVdbService } from "../dataservices/shared/mock-vdb.service"; +import { NotifierService } from "../dataservices/shared/notifier.service"; +import { VdbService } from "../dataservices/shared/vdb.service"; +import { SqlControlComponent } from "../dataservices/sql-control/sql-control.component"; +import { TestDataserviceComponent } from "../dataservices/test-dataservice/test-dataservice.component"; +import { ViewCanvasComponent } from "../dataservices/virtualization/view-editor/view-canvas/view-canvas.component"; +import { ViewEditorHeaderComponent } from "../dataservices/virtualization/view-editor/view-editor-header/view-editor-header.component"; +import { ViewEditorComponent } from "../dataservices/virtualization/view-editor/view-editor.component"; +import { ViewPreviewComponent } from "../dataservices/virtualization/view-editor/editor-views/view-preview/view-preview.component"; +import { EditorViewsComponent } from '../dataservices/virtualization/view-editor/editor-views/editor-views.component'; +import { MessageLogComponent } from '../dataservices/virtualization/view-editor/editor-views/message-log/message-log.component'; +import { CanvasService } from '../dataservices/virtualization/view-editor/view-canvas/canvas.service'; +import { GraphVisualComponent, NodeVisualComponent, LinkVisualComponent } from '../dataservices/virtualization/view-editor/view-canvas/visuals'; -import { environment } from "@environments/environment"; -import { ConfirmDialogComponent } from "@shared/confirm-dialog/confirm-dialog.component"; -import { SharedModule } from "@shared/shared.module"; +import { environment } from "../../environments/environment"; +import { ConfirmDialogComponent } from "../shared/confirm-dialog/confirm-dialog.component"; +import { SharedModule } from "../shared/shared.module"; import { TreeModule } from "angular-tree-component"; import { CodemirrorModule } from "ng2-codemirror"; import { @@ -69,12 +69,12 @@ import { OdataControlComponent } from "./odata-control/odata-control.component"; import { AccordionModule, BsDropdownModule, TabsModule, TooltipModule } from 'ngx-bootstrap'; import { ConnectionTreeSelectorComponent } from './virtualization/view-editor/connection-table-dialog/connection-tree-selector/connection-tree-selector.component'; import { ConnectionTableDialogComponent } from './virtualization/view-editor/connection-table-dialog/connection-table-dialog.component'; -import { ProgressDialogComponent } from "@shared/progress-dialog/progress-dialog.component"; +import { ProgressDialogComponent } from "../shared/progress-dialog/progress-dialog.component"; import { ViewPropertyEditorsComponent } from './virtualization/view-editor/view-property-editors/view-property-editors.component'; import { AddCompositionWizardComponent } from './virtualization/view-editor/add-composition-wizard/add-composition-wizard.component'; import { CreateViewDialogComponent } from './virtualization/view-editor/create-view-dialog/create-view-dialog.component'; import { CreateViewsDialogComponent } from './create-views-dialog/create-views-dialog.component'; -import { SetDescriptionDialogComponent } from "@dataservices/set-description-dialog/set-description-dialog.component"; +import { SetDescriptionDialogComponent } from "../dataservices/set-description-dialog/set-description-dialog.component"; import { PropertyEditorComponent } from './virtualization/view-editor/view-property-editors/property-editor/property-editor.component'; import { ProjectedColumnsEditorComponent } from './virtualization/view-editor/view-property-editors/projected-columns-editor/projected-columns-editor.component'; import { ViewsListComponent} from './virtualization/view-editor/views-list/views-list.component'; @@ -165,12 +165,12 @@ export class DataservicesModule { } /** * A factory that produces the appropriate instance of the service based on current environment settings. * - * @param {Http} http the HTTP service - * @param {VdbService} vdbService the VDB service - * @param {AppSettingsService} appSettings the app settings service - * @param {NotifierService} notifierService the notifier service - * @param {LoggerService} logger the logger - * @returns {DataserviceService} the requested service + * @param http the HTTP service + * @param vdbService the VDB service + * @param appSettings the app settings service + * @param notifierService the notifier service + * @param ogger the logger + * @returns the requested service */ export function dataserviceServiceFactory( http: Http, vdbService: VdbService, @@ -192,11 +192,11 @@ export function dataserviceServiceFactory( http: Http, /** * A factory that produces the appropriate instance of the service based on current environment settings. * - * @param {Http} http the HTTP service - * @param {AppSettingsService} appSettings the app settings service - * @param {NotifierService} notifierService the notifier service - * @param {LoggerService} logger the logger - * @returns {VdbService} the requested service + * @param http the HTTP service + * @param appSettings the app settings service + * @param notifierService the notifier service + * @param logger the logger + * @returns the requested service */ export function vdbServiceFactory( http: Http, appSettings: AppSettingsService, diff --git a/ui/src/app/dataservices/odata-control/odata-control.component.ts b/ui/src/app/dataservices/odata-control/odata-control.component.ts index c9e8d001..8d2b6424 100644 --- a/ui/src/app/dataservices/odata-control/odata-control.component.ts +++ b/ui/src/app/dataservices/odata-control/odata-control.component.ts @@ -17,18 +17,18 @@ import { Input, ViewChild, ViewEncapsulation } from "@angular/core"; import { Component, OnChanges, SimpleChanges } from "@angular/core"; -import { LoggerService } from "@core/logger.service"; +import { LoggerService } from "../../core/logger.service"; import * as _ from "lodash"; import "codemirror/mode/javascript/javascript.js"; import "codemirror/mode/xml/xml.js"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { Dataservice } from "@dataservices/shared/dataservice.model"; -import { OdataConstants } from "@dataservices/odata-control/odata-constants"; -import { Odata } from "@dataservices/odata-control/odata.model"; -import { OdataEntity } from "@dataservices/odata-control/odata-entity.model"; -import { OdataColumn } from "@dataservices/odata-control/odata-column.model"; -import { OdataWhere } from "@dataservices/odata-control/odata-where.model"; -import { SelectionService } from "@core/selection.service"; +import { DataserviceService } from "../../dataservices/shared/dataservice.service"; +import { Dataservice } from "../../dataservices/shared/dataservice.model"; +import { OdataConstants } from "../../dataservices/odata-control/odata-constants"; +import { Odata } from "../../dataservices/odata-control/odata.model"; +import { OdataEntity } from "../../dataservices/odata-control/odata-entity.model"; +import { OdataColumn } from "../../dataservices/odata-control/odata-column.model"; +import { OdataWhere } from "../../dataservices/odata-control/odata-where.model"; +import { SelectionService } from "../../core/selection.service"; @Component({ encapsulation: ViewEncapsulation.None, @@ -221,7 +221,7 @@ export class OdataControlComponent implements OnChanges { /** * Can the query be enacted - * @returns {boolean} true if good to go, false otherwise + * @returns true if good to go, false otherwise */ public get canQuery(): boolean { return !_.isEmpty(this.odata.metadata) && @@ -230,9 +230,6 @@ export class OdataControlComponent implements OnChanges { } - /** - * @returns {OdataEntity[]} the available entities - */ public get entities(): OdataEntity[] { if (_.isEmpty(this.odata.entities)) return []; @@ -240,9 +237,6 @@ export class OdataControlComponent implements OnChanges { return this.odata.entities; } - /** - * @returns {OdataEntity} the selected entitie - */ public get entity(): OdataEntity { if (_.isEmpty(this.odata.entity)) return null; @@ -258,14 +252,14 @@ export class OdataControlComponent implements OnChanges { } /** - * @returns {string[]} the available limit options + * @returns the available limit options */ public get limits(): string[] { return Odata.LIMITS; } /** - * @returns {string} the selected limit + * @returns the selected limit */ public get limit(): string { if (_.isEmpty(this.odata.limit)) diff --git a/ui/src/app/dataservices/odata-control/odata-entity.model.ts b/ui/src/app/dataservices/odata-control/odata-entity.model.ts index 7ea96bb9..db9f4545 100644 --- a/ui/src/app/dataservices/odata-control/odata-entity.model.ts +++ b/ui/src/app/dataservices/odata-control/odata-entity.model.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { OdataColumn } from "@dataservices/odata-control/odata-column.model"; +import { OdataColumn } from "../../dataservices/odata-control/odata-column.model"; export class OdataEntity { diff --git a/ui/src/app/dataservices/odata-control/odata-where.model.ts b/ui/src/app/dataservices/odata-control/odata-where.model.ts index 6a652f73..398a7735 100644 --- a/ui/src/app/dataservices/odata-control/odata-where.model.ts +++ b/ui/src/app/dataservices/odata-control/odata-where.model.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { OdataColumn } from "@dataservices/odata-control/odata-column.model"; +import { OdataColumn } from "../../dataservices/odata-control/odata-column.model"; /* *Will contain: diff --git a/ui/src/app/dataservices/odata-control/odata.model.ts b/ui/src/app/dataservices/odata-control/odata.model.ts index 75515ac7..ccfcd956 100644 --- a/ui/src/app/dataservices/odata-control/odata.model.ts +++ b/ui/src/app/dataservices/odata-control/odata.model.ts @@ -16,9 +16,9 @@ */ import * as _ from "lodash"; -import { OdataEntity } from "@dataservices/odata-control/odata-entity.model"; -import { OdataColumn } from "@dataservices/odata-control/odata-column.model"; -import { OdataWhere } from "@dataservices/odata-control/odata-where.model"; +import { OdataEntity } from "../../dataservices/odata-control/odata-entity.model"; +import { OdataColumn } from "../../dataservices/odata-control/odata-column.model"; +import { OdataWhere } from "../../dataservices/odata-control/odata-where.model"; export class Odata { diff --git a/ui/src/app/dataservices/selected-node/selected-node.component.spec.ts b/ui/src/app/dataservices/selected-node/selected-node.component.spec.ts index 5db1c3fe..ff3591a4 100644 --- a/ui/src/app/dataservices/selected-node/selected-node.component.spec.ts +++ b/ui/src/app/dataservices/selected-node/selected-node.component.spec.ts @@ -1,5 +1,5 @@ import { async, ComponentFixture, TestBed } from "@angular/core/testing"; -import { SchemaNode } from "@connections/shared/schema-node.model"; +import { SchemaNode } from "../../connections/shared/schema-node.model"; import { ActionModule, CardModule, diff --git a/ui/src/app/dataservices/selected-node/selected-node.component.ts b/ui/src/app/dataservices/selected-node/selected-node.component.ts index 998172fa..766b144d 100644 --- a/ui/src/app/dataservices/selected-node/selected-node.component.ts +++ b/ui/src/app/dataservices/selected-node/selected-node.component.ts @@ -16,8 +16,8 @@ */ import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from "@angular/core"; -import { SchemaNode } from "@connections/shared/schema-node.model"; -import { Column } from "@dataservices/shared/column.model"; +import { SchemaNode } from "../../connections/shared/schema-node.model"; +import { Column } from "../../dataservices/shared/column.model"; import { CardAction, CardConfig, TableConfig, TableEvent } from "patternfly-ng"; @Component({ diff --git a/ui/src/app/dataservices/selected-nodes-list/selected-nodes-list.component.spec.ts b/ui/src/app/dataservices/selected-nodes-list/selected-nodes-list.component.spec.ts index 2b8593cb..265fedd1 100644 --- a/ui/src/app/dataservices/selected-nodes-list/selected-nodes-list.component.spec.ts +++ b/ui/src/app/dataservices/selected-nodes-list/selected-nodes-list.component.spec.ts @@ -1,6 +1,6 @@ import { async, ComponentFixture, TestBed } from "@angular/core/testing"; import { RouterTestingModule } from "@angular/router/testing"; -import { SelectedNodeComponent } from "@dataservices/selected-node/selected-node.component"; +import { SelectedNodeComponent } from "../../dataservices/selected-node/selected-node.component"; import { ActionModule, CardModule, diff --git a/ui/src/app/dataservices/selected-nodes-list/selected-nodes-list.component.ts b/ui/src/app/dataservices/selected-nodes-list/selected-nodes-list.component.ts index 04582059..f865fc51 100644 --- a/ui/src/app/dataservices/selected-nodes-list/selected-nodes-list.component.ts +++ b/ui/src/app/dataservices/selected-nodes-list/selected-nodes-list.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, OnInit, Output } from "@angular/core"; -import { SchemaNode } from "@connections/shared/schema-node.model"; +import { SchemaNode } from "../../connections/shared/schema-node.model"; @Component({ selector: "app-selected-nodes-list", @@ -34,8 +34,7 @@ export class SelectedNodesListComponent implements OnInit { /** * Determine if the list already has the specified node - * @param {SchemaNode} node - * @returns {boolean} + * @param node */ public hasNode( node: SchemaNode ): boolean { let hasIt = false; diff --git a/ui/src/app/dataservices/set-description-dialog/set-description-dialog.component.spec.ts b/ui/src/app/dataservices/set-description-dialog/set-description-dialog.component.spec.ts index e5f12789..452f3a79 100644 --- a/ui/src/app/dataservices/set-description-dialog/set-description-dialog.component.spec.ts +++ b/ui/src/app/dataservices/set-description-dialog/set-description-dialog.component.spec.ts @@ -7,8 +7,8 @@ import { ActionModule } from "patternfly-ng"; import { FormsModule, ReactiveFormsModule } from "@angular/forms"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; +import { AppSettingsService } from "../../core/app-settings.service"; +import { LoggerService } from "../../core/logger.service"; describe('SetDescriptionDialogComponent', () => { let component: SetDescriptionDialogComponent; diff --git a/ui/src/app/dataservices/set-description-dialog/set-description-dialog.component.ts b/ui/src/app/dataservices/set-description-dialog/set-description-dialog.component.ts index 402b6ea5..61d1cd49 100644 --- a/ui/src/app/dataservices/set-description-dialog/set-description-dialog.component.ts +++ b/ui/src/app/dataservices/set-description-dialog/set-description-dialog.component.ts @@ -19,8 +19,8 @@ import { Component, OnInit } from "@angular/core"; import { Output } from "@angular/core"; import { EventEmitter } from "@angular/core"; import { BsModalRef } from "ngx-bootstrap"; -import { LoggerService } from "@core/logger.service"; -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; +import { LoggerService } from "../../core/logger.service"; +import { ViewEditorI18n } from "../../dataservices/virtualization/view-editor/view-editor-i18n"; import { FormControl, FormGroup } from "@angular/forms"; @Component({ diff --git a/ui/src/app/dataservices/shared/column-data.model.ts b/ui/src/app/dataservices/shared/column-data.model.ts index 81e4435f..a7049e77 100644 --- a/ui/src/app/dataservices/shared/column-data.model.ts +++ b/ui/src/app/dataservices/shared/column-data.model.ts @@ -26,7 +26,7 @@ export class ColumnData { /** * Constructor - * @param {Object} json the JSON representation of ColumnData + * @param json the JSON representation of ColumnData */ constructor(json: object = {}) { for (const field of Object.keys(json)) { @@ -35,21 +35,21 @@ export class ColumnData { } /** - * @returns {string} the column name + * @returns the column name */ public getName( ): string { return this.name; } /** - * @returns {string} the column label + * @returns the column label */ public getLabel( ): string { return this.label; } /** - * @returns {string} the column type + * @returns the column type */ public getType( ): string { return this.type; diff --git a/ui/src/app/dataservices/shared/column.model.spec.ts b/ui/src/app/dataservices/shared/column.model.spec.ts index abe58900..6e5ba599 100644 --- a/ui/src/app/dataservices/shared/column.model.spec.ts +++ b/ui/src/app/dataservices/shared/column.model.spec.ts @@ -1,4 +1,4 @@ -import { Column } from "@dataservices/shared/column.model"; +import { Column } from "../../dataservices/shared/column.model"; describe("Column", () => { let column: Column; diff --git a/ui/src/app/dataservices/shared/column.model.ts b/ui/src/app/dataservices/shared/column.model.ts index 738b9f65..8690e30c 100644 --- a/ui/src/app/dataservices/shared/column.model.ts +++ b/ui/src/app/dataservices/shared/column.model.ts @@ -24,8 +24,8 @@ export class Column { private size: number; /** - * @param {Object} json the JSON representation of a Column - * @returns {Column} the new Column (never null) + * @param json the JSON representation of a Column + * @returns the new Column (never null) */ public static create( json: object = {} ): Column { const column = new Column(); @@ -38,56 +38,56 @@ export class Column { } /** - * @returns {string} the column name + * @returns the column name */ public getName(): string { return this.keng__id; } /** - * @param {string} name the column name + * @param name the column name */ public setName( name?: string ): void { this.keng__id = name ? name : null; } /** - * @returns {string} the column type + * @returns the column type */ public getDatatype(): string { return this.Datatype; } /** - * @param {string} name the column type + * @param name the column type */ public setDatatype( type: string ): void { this.Datatype = type; } /** - * @returns {number} the column size + * @returns the column size */ public getSize(): number { return this.size; } /** - * @param {number} size the column size + * @param size the column size */ public setSize( size: number ): void { this.size = size; } /** - * @returns {boolean} 'true' if column isSelected + * @returns 'true' if column isSelected */ public get selected(): boolean { return this.isSelected; } /** - * @param {boolean} selected the column isSelected state + * @param selected the column isSelected state */ public setSelected( selected: boolean ): void { this.isSelected = selected; @@ -95,7 +95,7 @@ export class Column { /** * Set all object values using the supplied View json - * @param {Object} values + * @param values */ public setValues(values: object = {}): void { Object.assign(this, values); diff --git a/ui/src/app/dataservices/shared/composition-operator.enum.ts b/ui/src/app/dataservices/shared/composition-operator.enum.ts index b5a31760..4369baa2 100644 --- a/ui/src/app/dataservices/shared/composition-operator.enum.ts +++ b/ui/src/app/dataservices/shared/composition-operator.enum.ts @@ -60,22 +60,3 @@ export enum CompositionOperator { NE = "NE" } - -export namespace CompositionOperator { - export function toSql( oper: CompositionOperator): string { - if (oper === CompositionOperator.EQ) { - return "="; - } else if (oper === CompositionOperator.LT) { - return "<"; - } else if (oper === CompositionOperator.GT) { - return ">"; - } else if (oper === CompositionOperator.LE) { - return "<="; - } else if (oper === CompositionOperator.GE) { - return ">="; - } else if (oper === CompositionOperator.NE) { - return "<>"; - } - return "="; - } -} diff --git a/ui/src/app/dataservices/shared/composition-type.enum.ts b/ui/src/app/dataservices/shared/composition-type.enum.ts index 6dac3671..0edfdbbb 100644 --- a/ui/src/app/dataservices/shared/composition-type.enum.ts +++ b/ui/src/app/dataservices/shared/composition-type.enum.ts @@ -53,20 +53,3 @@ export enum CompositionType { UNION = "UNION" } - -export namespace CompositionType { - export function toSql( type: CompositionType): string { - if ( type === CompositionType.INNER_JOIN ) { - return "INNER JOIN"; - } else if ( type === CompositionType.LEFT_OUTER_JOIN ) { - return "LEFT OUTER JOIN"; - } else if ( type === CompositionType.RIGHT_OUTER_JOIN ) { - return "RIGHT OUTER JOIN"; - } else if ( type === CompositionType.FULL_OUTER_JOIN ) { - return "FULL OUTER JOIN"; - } else if ( type === CompositionType.UNION ) { - return "UNION"; - } - return "INNER JOIN"; - } -} diff --git a/ui/src/app/dataservices/shared/composition.model.spec.ts b/ui/src/app/dataservices/shared/composition.model.spec.ts index e6631ba9..0fb89fa1 100644 --- a/ui/src/app/dataservices/shared/composition.model.spec.ts +++ b/ui/src/app/dataservices/shared/composition.model.spec.ts @@ -1,6 +1,6 @@ -import { Composition } from "@dataservices/shared/composition.model"; -import { CompositionType } from "@dataservices/shared/composition-type.enum"; -import { CompositionOperator } from "@dataservices/shared/composition-operator.enum"; +import { Composition } from "../../dataservices/shared/composition.model"; +import { CompositionType } from "../../dataservices/shared/composition-type.enum"; +import { CompositionOperator } from "../../dataservices/shared/composition-operator.enum"; describe("Composition", () => { let composition: Composition; diff --git a/ui/src/app/dataservices/shared/composition.model.ts b/ui/src/app/dataservices/shared/composition.model.ts index 5fae2323..e7660dbf 100644 --- a/ui/src/app/dataservices/shared/composition.model.ts +++ b/ui/src/app/dataservices/shared/composition.model.ts @@ -15,9 +15,9 @@ * limitations under the License. */ -import { CompositionType } from "@dataservices/shared/composition-type.enum"; -import { CompositionOperator } from "@dataservices/shared/composition-operator.enum"; -import { PathUtils } from "@dataservices/shared/path-utils"; +import { CompositionType } from "../../dataservices/shared/composition-type.enum"; +import { CompositionOperator } from "../../dataservices/shared/composition-operator.enum"; +import { PathUtils } from "../../dataservices/shared/path-utils"; /** * Composition model @@ -34,8 +34,8 @@ export class Composition { private operator: CompositionOperator = CompositionOperator.EQ; /** - * @param {Object} json the JSON representation of a Composition - * @returns {Composition} the new Composition (never null) + * @param json the JSON representation of a Composition + * @returns the new Composition (never null) */ public static create( json: object = {} ): Composition { const composition = new Composition(); @@ -48,70 +48,70 @@ export class Composition { } /** - * @returns {string} the composition name + * @returns the composition name */ public getName(): string { return this.name; } /** - * @param {string} name the composition name + * @param name the composition name */ public setName( name?: string ): void { this.name = name ? name : null; } /** - * @returns {string} the composition type + * @returns the composition type */ public getType(): CompositionType { return this.type; } /** - * @param {string} type the composition type + * @param type the composition type */ public setType( type: CompositionType ): void { this.type = type; } /** - * @returns {CompositionOperator} the composition operator + * @returns the composition operator */ public getOperator(): CompositionOperator { return this.operator; } /** - * @param {CompositionOperator} operator the composition operator + * @param operator the composition operator */ public setOperator(operator: CompositionOperator ): void { this.operator = operator; } /** - * @return {boolean} 'true' if initial source is set and on the left + * @return 'true' if initial source is set and on the left */ public get initialSourceOnLeft(): boolean { return this.initialSourcePath !== null && this.leftSourcePath !== null && this.initialSourcePath === this.leftSourcePath; } /** - * @return {boolean} 'true' if initial source is set and on the right + * @return 'true' if initial source is set and on the right */ public get initialSourceOnRight(): boolean { return this.initialSourcePath !== null && this.rightSourcePath !== null && this.initialSourcePath === this.rightSourcePath; } /** - * @returns {string} the left source path of the composition + * @returns the left source path of the composition */ public getLeftSourcePath(): string { return this.leftSourcePath; } /** - * @param {string} sourcePath the left source path of the composition + * @param sourcePath the left source path of the composition */ public setLeftSourcePath(sourcePath: string, isInitialSource = false ): void { this.leftSourcePath = sourcePath; @@ -121,14 +121,14 @@ export class Composition { } /** - * @returns {string} the right source source of the composition + * @returns the right source source of the composition */ public getRightSourcePath(): string { return this.rightSourcePath; } /** - * @param {string} sourcePath the right source of the composition + * @param sourcePath the right source of the composition */ public setRightSourcePath(sourcePath: string, isInitialSource = false ): void { this.rightSourcePath = sourcePath; @@ -138,28 +138,28 @@ export class Composition { } /** - * @returns {string} the left criteria column + * @returns the left criteria column */ public getLeftCriteriaColumn(): string { return this.leftCriteriaColumn; } /** - * @param {string} column the left criteria column + * @param column the left criteria column */ public setLeftCriteriaColumn(column: string ): void { this.leftCriteriaColumn = column; } /** - * @returns {string} the right criteria column + * @returns the right criteria column */ public getRightCriteriaColumn(): string { return this.rightCriteriaColumn; } /** - * @param {string} column the right criteria column + * @param column the right criteria column */ public setRightCriteriaColumn(column: string ): void { this.rightCriteriaColumn = column; @@ -184,7 +184,7 @@ export class Composition { /** * Determine whether the composition is in a complete state - * @returns {boolean} true if complete + * @returns true if complete */ public get complete(): boolean { if ( this.name !== null && @@ -202,7 +202,7 @@ export class Composition { /** * Determine if the supplied Composition is equal to this - * @param {Object} values + * @param values */ public isEqual( otherComp: Composition ): boolean { let equal = false; @@ -220,15 +220,12 @@ export class Composition { /** * Set all object values using the supplied View json - * @param {Object} values + * @param values */ public setValues(values: object = {}): void { Object.assign(this, values); } - /** - * @returns {{}} a JSON representation of the composition - */ public toJSON(): {} { return { name: this.name, @@ -262,7 +259,8 @@ export class Composition { public getCriteriaDisplay(): string { const leftColumn = this.getLeftCriteriaColumn(); const rightColumn = this.getRightCriteriaColumn(); - return leftColumn + " " + CompositionOperator.toSql(this.getOperator()) + " " + rightColumn; + return leftColumn + " " + "=" + " " + rightColumn; + // return leftColumn + " " + CompositionOperator.toSql(this.getOperator()) + " " + rightColumn; } } diff --git a/ui/src/app/dataservices/shared/connection-summary.model.spec.ts b/ui/src/app/dataservices/shared/connection-summary.model.spec.ts index 1f4291ad..3abfa218 100644 --- a/ui/src/app/dataservices/shared/connection-summary.model.spec.ts +++ b/ui/src/app/dataservices/shared/connection-summary.model.spec.ts @@ -1,4 +1,4 @@ -import { ConnectionSummary } from "@dataservices/shared/connection-summary.model"; +import { ConnectionSummary } from "../../dataservices/shared/connection-summary.model"; describe("ConnectionSummary", () => { let connectionSummary: ConnectionSummary; diff --git a/ui/src/app/dataservices/shared/connection-summary.model.ts b/ui/src/app/dataservices/shared/connection-summary.model.ts index 4be7caee..2baf308f 100644 --- a/ui/src/app/dataservices/shared/connection-summary.model.ts +++ b/ui/src/app/dataservices/shared/connection-summary.model.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { ConnectionStatus } from "@connections/shared/connection-status"; -import { Connection } from "@connections/shared/connection.model"; +import { ConnectionStatus } from "../../connections/shared/connection-status"; +import { Connection } from "../../connections/shared/connection.model"; /** * ConnectionSummary model. @@ -27,8 +27,8 @@ export class ConnectionSummary { private status: ConnectionStatus; /** - * @param {Object} json the JSON representation of a ConnectionSummary - * @returns {ConnectionSummary} the new ConnectionSummary (never null) + * @param json the JSON representation of a ConnectionSummary + * @returns the new ConnectionSummary (never null) */ public static create( json: object = {} ): ConnectionSummary { const connSummary = new ConnectionSummary(); @@ -53,35 +53,35 @@ export class ConnectionSummary { } /** - * @returns {Connection} the connection + * @returns the connection */ public getConnection(): Connection { return this.connection; } /** - * @returns {boolean} 'true' if a status exists + * @returns 'true' if a status exists */ public hasStatus(): boolean { return (this.status && this.status !== null); } /** - * @returns {ConnectionStatus} the status + * @returns the status */ public getStatus(): ConnectionStatus { return this.status; } /** - * @param {Connection} connection the named connection + * @param connection the named connection */ public setConnection( connection: Connection ): void { this.connection = connection; } /** - * @param {ConnectionStatus} status the named vdbStatus + * @param status the named vdbStatus */ public setStatus( status: ConnectionStatus ): void { this.status = status; @@ -89,7 +89,7 @@ export class ConnectionSummary { /** * Set all object values using the supplied ConnectionSummary json - * @param {Object} values + * @param values */ public setValues(values: object = {}): void { Object.assign(this, values); diff --git a/ui/src/app/dataservices/shared/dataservice.model.spec.ts b/ui/src/app/dataservices/shared/dataservice.model.spec.ts index f8e0be36..5968abbe 100644 --- a/ui/src/app/dataservices/shared/dataservice.model.spec.ts +++ b/ui/src/app/dataservices/shared/dataservice.model.spec.ts @@ -1,6 +1,6 @@ -import { Dataservice } from "@dataservices/shared/dataservice.model"; -import { DeploymentState } from "@dataservices/shared/deployment-state.enum"; -import { PublishState } from "@dataservices/shared/publish-state.enum"; +import { Dataservice } from "../../dataservices/shared/dataservice.model"; +import { DeploymentState } from "../../dataservices/shared/deployment-state.enum"; +import { PublishState } from "../../dataservices/shared/publish-state.enum"; describe("Dataservice", () => { let dataservice: Dataservice; diff --git a/ui/src/app/dataservices/shared/dataservice.model.ts b/ui/src/app/dataservices/shared/dataservice.model.ts index 2f3bc98b..80950fbc 100644 --- a/ui/src/app/dataservices/shared/dataservice.model.ts +++ b/ui/src/app/dataservices/shared/dataservice.model.ts @@ -15,13 +15,13 @@ * limitations under the License. */ -import { DeploymentState } from "@dataservices/shared/deployment-state.enum"; -import { PublishState } from "@dataservices/shared/publish-state.enum"; -import { Virtualization } from "@dataservices/shared/virtualization.model"; -import { VirtRoute } from "@dataservices/shared/virt-route.model"; -import { Identifiable } from "@shared/identifiable"; -import { SortDirection } from "@shared/sort-direction.enum"; -import { DataservicesConstants } from "@dataservices/shared/dataservices-constants"; +import { DeploymentState } from "../../dataservices/shared/deployment-state.enum"; +import { PublishState } from "../../dataservices/shared/publish-state.enum"; +import { Virtualization } from "../../dataservices/shared/virtualization.model"; +import { VirtRoute } from "../../dataservices/shared/virt-route.model"; +import { Identifiable } from "../../shared/identifiable"; +import { SortDirection } from "../../shared/sort-direction.enum"; +import { DataservicesConstants } from "../../dataservices/shared/dataservices-constants"; export class Dataservice implements Identifiable< string > { @@ -35,8 +35,8 @@ export class Dataservice implements Identifiable< string > { private virtualization: Virtualization = null; /** - * @param {Object} json the JSON representation of a Dataservice - * @returns {Dataservice} the new Dataservice (never null) + * @param json the JSON representation of a Dataservice + * @returns the new Dataservice (never null) */ public static create( json: object = {} ): Dataservice { const svc = new Dataservice(); @@ -45,8 +45,8 @@ export class Dataservice implements Identifiable< string > { } /** - * @param {Dataservice[]} dataservices the dataservices being sorted - * @param {SortDirection} sortDirection the sort direction + * @param dataservices the dataservices being sorted + * @param sortDirection the sort direction */ public static sort( dataservices: Dataservice[], sortDirection: SortDirection ): void { @@ -88,35 +88,35 @@ export class Dataservice implements Identifiable< string > { } /** - * @returns {string} the dataservice identifier (can be null) + * @returns the dataservice identifier (can be null) */ public getId(): string { return this.keng__id; } /** - * @returns {string} the dataservice description (can be null) + * @returns the dataservice description (can be null) */ public getDescription(): string { return this.tko__description; } /** - * @returns {string} the dataservice Vdb name (can be null) + * @returns the dataservice Vdb name (can be null) */ public getServiceVdbName(): string { return this.serviceVdbName; } /** - * @returns {string} the dataservice Vdb version (can be null) + * @returns the dataservice Vdb version (can be null) */ public getServiceVdbVersion(): string { return this.serviceVdbVersion; } /** - * @returns {string[]} the dataservice view names (never null or undefined) + * @returns the dataservice view names (never null or undefined) */ public getServiceViewNames(): string[] { if ( this.serviceViewDefinitions ) { @@ -128,7 +128,7 @@ export class Dataservice implements Identifiable< string > { /** * Remove the specified view name, if it exists - * @param {string} viewNameToRemove the view name to remove + * @param viewNameToRemove the view name to remove */ public removeServiceViewName( viewNameToRemove: string ): void { const index = this.serviceViewDefinitions.findIndex( ( viewName ) => @@ -140,21 +140,21 @@ export class Dataservice implements Identifiable< string > { } /** - * @returns {string} the dataservice view model name (can be null) + * @returns the dataservice view model name (can be null) */ public getServiceViewModel(): string { return this.serviceViewModel; } /** - * @returns {string} the dataservice type name (can be null) + * @returns the dataservice type name (can be null) */ public getType(): string { return "Dataservice"; } /** - * @returns {DeploymentState} the dataservice Deployment state + * @returns the dataservice Deployment state */ public getServiceDeploymentState(): DeploymentState { return this.deploymentState; @@ -162,7 +162,7 @@ export class Dataservice implements Identifiable< string > { /** * Accessor to determine if service deployment is active - * @returns {boolean} the dataservice service deployment active state + * @returns the dataservice service deployment active state */ public get serviceDeploymentActive(): boolean { return this.deploymentState === DeploymentState.ACTIVE; @@ -170,7 +170,7 @@ export class Dataservice implements Identifiable< string > { /** * Accessor to determine if service deployment is inactive - * @returns {boolean} the dataservice service deployment inactive state + * @returns the dataservice service deployment inactive state */ public get serviceDeploymentInactive(): boolean { return this.deploymentState === DeploymentState.INACTIVE; @@ -178,7 +178,7 @@ export class Dataservice implements Identifiable< string > { /** * Accessor to determine if service deployment is loading - * @returns {boolean} the dataservice service deployment loading state + * @returns the dataservice service deployment loading state */ public get serviceDeploymentLoading(): boolean { return this.deploymentState === DeploymentState.LOADING; @@ -186,7 +186,7 @@ export class Dataservice implements Identifiable< string > { /** * Accessor to determine if service deployment is failed - * @returns {boolean} the dataservice service deployment failed state + * @returns the dataservice service deployment failed state */ public get serviceDeploymentFailed(): boolean { return this.deploymentState === DeploymentState.FAILED; @@ -194,14 +194,14 @@ export class Dataservice implements Identifiable< string > { /** * Accessor to determine if service is not deployed - * @returns {boolean} the dataservice service not deployed state + * @returns the dataservice service not deployed state */ public get serviceDeploymentNotDeployed(): boolean { return this.deploymentState === DeploymentState.NOT_DEPLOYED; } /** - * @returns {DeploymentState} the dataservice Deployment state + * @returns the dataservice Deployment state */ public getServicePublishState(): PublishState { return this.virtualization ? this.virtualization.getPublishState() : PublishState.NOT_PUBLISHED; @@ -209,7 +209,7 @@ export class Dataservice implements Identifiable< string > { /** * Accessor to determine if service has not been published - * @returns {boolean} the dataservice service not published state + * @returns the dataservice service not published state */ public get serviceNotPublished(): boolean { return this.getServicePublishState() === PublishState.NOT_PUBLISHED; @@ -217,7 +217,7 @@ export class Dataservice implements Identifiable< string > { /** * Accessor to determine if service submission is active - * @returns {boolean} the dataservice service submitted active state + * @returns the dataservice service submitted active state */ public get serviceSubmitted(): boolean { return this.getServicePublishState() === PublishState.SUBMITTED; @@ -225,7 +225,7 @@ export class Dataservice implements Identifiable< string > { /** * Accessor to determine if service configuring is active - * @returns {boolean} the dataservice service configuring active state + * @returns the dataservice service configuring active state */ public get serviceConfiguring(): boolean { return this.getServicePublishState() === PublishState.CONFIGURING; @@ -233,7 +233,7 @@ export class Dataservice implements Identifiable< string > { /** * Accessor to determine if service building is active - * @returns {boolean} the dataservice service building active state + * @returns the dataservice service building active state */ public get serviceBuilding(): boolean { return this.getServicePublishState() === PublishState.BUILDING; @@ -241,7 +241,7 @@ export class Dataservice implements Identifiable< string > { /** * Accessor to determine if service deploying is active - * @returns {boolean} the dataservice service deploying active state + * @returns the dataservice service deploying active state */ public get serviceDeploying(): boolean { return this.getServicePublishState() === PublishState.DEPLOYING; @@ -249,7 +249,7 @@ export class Dataservice implements Identifiable< string > { /** * Accessor to determine if service has been published - * @returns {boolean} the dataservice service published state + * @returns the dataservice service published state */ public get servicePublished(): boolean { return this.getServicePublishState() === PublishState.PUBLISHED; @@ -257,7 +257,7 @@ export class Dataservice implements Identifiable< string > { /** * Accessor to determine if service has failed publishing - * @returns {boolean} the dataservice service publishing failed state + * @returns the dataservice service publishing failed state */ public get servicePublishFailed(): boolean { return this.getServicePublishState() === PublishState.FAILED; @@ -267,7 +267,7 @@ export class Dataservice implements Identifiable< string > { * Accessor to return the root of the odata url, ie. * http://HOST/odata4/vdbName/ * - * @returns {string} the odata url for this dataaservice + * @returns the odata url for this dataaservice */ public getOdataRootUrl(): string { if (! this.servicePublished || ! this.virtualization) { @@ -287,49 +287,49 @@ export class Dataservice implements Identifiable< string > { } /** - * @param {string} id the dataservice identifier (optional) + * @param id the dataservice identifier (optional) */ public setId( id?: string ): void { this.keng__id = id ? id : null; } /** - * @param {string} description the dataservice description (optional) + * @param description the dataservice description (optional) */ public setDescription( description?: string ): void { this.tko__description = description ? description : null; } /** - * @param {string} name the dataservice service vdb name + * @param name the dataservice service vdb name */ public setServiceVdbName( name: string ): void { this.serviceVdbName = name; } /** - * @param {string} version the dataservice service vdb version + * @param version the dataservice service vdb version */ public setServiceVdbVersion( version: string ): void { this.serviceVdbVersion = version; } /** - * @param {string} viewModel the dataservice view model + * @param viewModel the dataservice view model */ public setServiceViewModel( viewModel: string ): void { this.serviceViewModel = viewModel; } /** - * @param {DeploymentState} state the dataservice deployment state + * @param state the dataservice deployment state */ public setServiceDeploymentState( state: DeploymentState ): void { this.deploymentState = state; } /** - * @param {Virtualization} state the dataservice virtualization + * @param state the dataservice virtualization */ public setServiceVirtualization( state: Virtualization ): void { this.virtualization = state ? state : null; @@ -349,7 +349,7 @@ export class Dataservice implements Identifiable< string > { /** * Set all object values using the supplied Dataservice json - * @param {Object} values + * @param values */ public setValues(values: object = {}): void { Object.assign(this, values); diff --git a/ui/src/app/dataservices/shared/dataservice.service.spec.ts b/ui/src/app/dataservices/shared/dataservice.service.spec.ts index 7b1fd68c..57414ef7 100644 --- a/ui/src/app/dataservices/shared/dataservice.service.spec.ts +++ b/ui/src/app/dataservices/shared/dataservice.service.spec.ts @@ -1,12 +1,12 @@ import { inject, TestBed } from "@angular/core/testing"; import { HttpModule } from "@angular/http"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; +import { AppSettingsService } from "../../core/app-settings.service"; +import { LoggerService } from "../../core/logger.service"; +import { MockAppSettingsService } from "../../core/mock-app-settings.service"; +import { DataserviceService } from "../../dataservices/shared/dataservice.service"; +import { MockVdbService } from "../../dataservices/shared/mock-vdb.service"; +import { NotifierService } from "../../dataservices/shared/notifier.service"; +import { VdbService } from "../../dataservices/shared/vdb.service"; describe("DataserviceService", () => { beforeEach(() => { diff --git a/ui/src/app/dataservices/shared/dataservice.service.ts b/ui/src/app/dataservices/shared/dataservice.service.ts index bc7bfd2c..182d66c4 100644 --- a/ui/src/app/dataservices/shared/dataservice.service.ts +++ b/ui/src/app/dataservices/shared/dataservice.service.ts @@ -17,21 +17,21 @@ import { Injectable } from "@angular/core"; import { Http, RequestOptions } from "@angular/http"; -import { ApiService } from "@core/api.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; -import { Dataservice } from "@dataservices/shared/dataservice.model"; -import { DataservicesConstants } from "@dataservices/shared/dataservices-constants"; -import { DeploymentState } from "@dataservices/shared/deployment-state.enum"; -import { NewDataservice } from "@dataservices/shared/new-dataservice.model"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { PublishState } from "@dataservices/shared/publish-state.enum"; -import { QueryResults } from "@dataservices/shared/query-results.model"; -import { VdbStatus } from "@dataservices/shared/vdb-status.model"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { VdbsConstants } from "@dataservices/shared/vdbs-constants"; -import { Virtualization } from "@dataservices/shared/virtualization.model"; -import { environment } from "@environments/environment"; +import { ApiService } from "../../core/api.service"; +import { AppSettingsService } from "../../core/app-settings.service"; +import { LoggerService } from "../../core/logger.service"; +import { Dataservice } from "../../dataservices/shared/dataservice.model"; +import { DataservicesConstants } from "../../dataservices/shared/dataservices-constants"; +import { DeploymentState } from "../../dataservices/shared/deployment-state.enum"; +import { NewDataservice } from "../../dataservices/shared/new-dataservice.model"; +import { NotifierService } from "../../dataservices/shared/notifier.service"; +import { PublishState } from "../../dataservices/shared/publish-state.enum"; +import { QueryResults } from "../../dataservices/shared/query-results.model"; +import { VdbStatus } from "../../dataservices/shared/vdb-status.model"; +import { VdbService } from "../../dataservices/shared/vdb.service"; +import { VdbsConstants } from "../../dataservices/shared/vdbs-constants"; +import { Virtualization } from "../../dataservices/shared/virtualization.model"; +import { environment } from "../../../environments/environment"; import { saveAs } from "file-saver/FileSaver"; import { Observable } from "rxjs/Observable"; import { ReplaySubject } from "rxjs/ReplaySubject"; @@ -39,7 +39,7 @@ import { Subject } from "rxjs/Subject"; import { Subscription } from "rxjs/Subscription"; import * as _ from "lodash"; import * as vkbeautify from 'vkbeautify'; -import { ViewEditorState } from "@dataservices/shared/view-editor-state.model"; +import { ViewEditorState } from "../../dataservices/shared/view-editor-state.model"; @Injectable() export class DataserviceService extends ApiService { @@ -73,9 +73,8 @@ export class DataserviceService extends ApiService { /** * Create and return a NewDataservice instance - * @param {string} name the dataservice name - * @param {string} description the dataservice description - * @returns {NewDataservice} the NewDataservice object + * @param name the dataservice name + * @param description the dataservice description */ public newDataserviceInstance(name: string, description: string ): NewDataservice { const ds: NewDataservice = new NewDataservice(this.appSettingsService.getKomodoUserWorkspacePath()); @@ -91,8 +90,7 @@ export class DataserviceService extends ApiService { * Validates the specified data service name. If the name contains valid characters and the name is unique, the * service returns 'null'. Otherwise, a 'string' containing an error message is returned. * - * @param {string} name the dataservice name - * @returns {Observable} + * @param name the dataservice name */ public isValidName( name: string ): Observable< string > { if ( !name || name.length === 0 ) { @@ -115,7 +113,6 @@ export class DataserviceService extends ApiService { /** * Get the dataservices from the komodo rest interface - * @returns {Observable} */ public getAllDataservices(): Observable { return this.http @@ -129,8 +126,7 @@ export class DataserviceService extends ApiService { /** * Create a dataservice via the komodo rest interface - * @param {NewDataservice} dataservice - * @returns {Observable} + * @param dataservice */ public createDataservice(dataservice: NewDataservice): Observable { return this.http @@ -144,8 +140,7 @@ export class DataserviceService extends ApiService { /** * Update a dataservice via the komodo rest interface - * @param {NewDataservice} dataservice - * @returns {Observable} + * @param dataservice */ public updateDataservice(dataservice: NewDataservice): Observable { return this.http @@ -159,8 +154,7 @@ export class DataserviceService extends ApiService { /** * Deploy a dataservice via the komodo rest interface - * @param {string} dataserviceName - * @returns {Observable} + * @param dataserviceName */ public deployDataservice(dataserviceName: string): Observable { const servicePath = this.getKomodoUserWorkspacePath() + "/" + dataserviceName; @@ -175,9 +169,8 @@ export class DataserviceService extends ApiService { /** * Create a readonly datarole for the dataservice - * @param {string} serviceVdbName, - * @param {string} model1Name, - * @returns {Observable} + * @param serviceVdbName, + * @param model1Name, */ public createReadonlyDataRole(serviceVdbName: string, model1Name: string): Observable { const READ_ONLY_DATA_ROLE_NAME = VdbsConstants.DEFAULT_READONLY_DATA_ROLE; @@ -237,8 +230,7 @@ export class DataserviceService extends ApiService { /** * Delete a dataservice via the komodo rest interface - * @param {string} dataserviceId - * @returns {Observable} + * @param dataserviceId */ public deleteDataservice(dataserviceId: string): Observable { return this.http @@ -252,8 +244,7 @@ export class DataserviceService extends ApiService { /** * Refresh the views for a dataservice via the komodo rest interface - * @param {string} dataserviceName - * @returns {Observable} + * @param dataserviceName */ public refreshDataserviceViews(dataserviceName: string): Observable { const refreshViewsUrl = environment.komodoWorkspaceUrl @@ -270,8 +261,7 @@ export class DataserviceService extends ApiService { /** * Download a dataservice as a jar archive - * @param {string} dataserviceName the dataservice name - * @returns {Observable} + * @param dataserviceName the dataservice name */ public downloadDataservice(dataserviceName: string): Observable { // The payload for the rest call @@ -314,8 +304,7 @@ export class DataserviceService extends ApiService { /** * Publish a dataservice - * @param {string} dataserviceName the dataservice name - * @returns {Observable} + * @param dataserviceName the dataservice name */ public publishDataservice(dataserviceName: string): Observable { @@ -342,8 +331,7 @@ export class DataserviceService extends ApiService { /** * Retrieve the publishing logs for the given dataservice - * @param {Dataservice} dataservice the dataservice - * @returns {Observable} + * @param dataservice the dataservice */ public publishLogsGet(dataservice: Dataservice): Observable { const url = environment.komodoTeiidUrl + "/" + @@ -360,11 +348,10 @@ export class DataserviceService extends ApiService { /** * Query a Dataservice via the komodo rest interface - * @param {string} query the SQL query - * @param {string} dataserviceName the dataservice name - * @param {number} limit the limit for the number of result rows - * @param {number} offset the offset for the result rows - * @returns {Observable} + * @param query the SQL query + * @param dataserviceName the dataservice name + * @param limit the limit for the number of result rows + * @param offset the offset for the result rows */ public queryDataservice(query: string, dataserviceName: string, limit: number, offset: number): Observable { // The payload for the rest call @@ -388,8 +375,7 @@ export class DataserviceService extends ApiService { /** * Query a Dataservice's published virtualization using odata protocol - * @param {string} url the odata url string - * @returns {Observable} + * @param url the odata url string */ public odataGet(url: string): Observable { return this.http @@ -460,7 +446,7 @@ export class DataserviceService extends ApiService { /** * Polls the server and sends Dataservice state updates at the specified interval - * @param {number} pollIntervalSec the interval (sec) between polling attempts + * @param pollIntervalSec the interval (sec) between polling attempts */ public pollDataserviceStatus(pollIntervalSec: number): void { const pollIntervalMillis = pollIntervalSec * 1000; @@ -474,9 +460,8 @@ export class DataserviceService extends ApiService { } /** - * @param {string} editorStatePattern the name pattern to use for returning the array of viewEditorStates. + * @param editorStatePattern the name pattern to use for returning the array of viewEditorStates. * If no pattern is supplied, all states are returned - * @returns {Observable} the view editor states or empty array if none found */ public getViewEditorStates( editorStatePattern?: string ): Observable< ViewEditorState[] > { // pattern is added to the request options @@ -505,8 +490,7 @@ export class DataserviceService extends ApiService { } /** - * @param {string} editorId the ID of the editor state being requested - * @returns {Observable} the view editor state or empty object if not found + * @param editorId the ID of the editor state being requested */ public getViewEditorState( editorId: string ): Observable< ViewEditorState > { return this.http.get(environment.viewEditorState + "/" + editorId, this.getAuthRequestOptions() ) @@ -525,8 +509,7 @@ export class DataserviceService extends ApiService { } /** - * @param {ViewEditorState[]} editorStates the view editor state array - * @returns {Observable} `true` if the editor state was successfully saved + * @param editorStates the view editor state array */ public saveViewEditorStates( editorStates: ViewEditorState[] ): Observable< boolean > { @@ -540,8 +523,7 @@ export class DataserviceService extends ApiService { } /** - * @param {string} editorId the ID of the editor state being deleted - * @returns {Observable} `true` if the editor state was successfully deleted + * @param editorId the ID of the editor state being deleted */ public deleteViewEditorState( editorId: string ): Observable< boolean > { return this.http.delete(environment.viewEditorState + "/" + editorId, this.getAuthRequestOptions() ) @@ -554,9 +536,8 @@ export class DataserviceService extends ApiService { } /** - * @param {ViewEditorState[]} editorStates the view editor state array - * @param {string} dataserviceName the name of the dataservice - * @returns {Observable} `true` if the editor state was successfully saved + * @param editorStates the view editor state array + * @param dataserviceName the name of the dataservice */ public saveViewEditorStatesRefreshViews( editorStates: ViewEditorState[], dataserviceName: string ): Observable< boolean > { return this.saveViewEditorStates(editorStates) @@ -564,9 +545,8 @@ export class DataserviceService extends ApiService { } /** - * @param {string} editorId the ID of the editor state being deleted - * @param {string} dataserviceName the name of the dataservice - * @returns {Observable} `true` if the editor state was successfully saved + * @param editorId the ID of the editor state being deleted + * @param dataserviceName the name of the dataservice */ public deleteViewEditorStateRefreshViews( editorId: string, dataserviceName: string ): Observable< boolean > { return this.deleteViewEditorState(editorId) @@ -625,7 +605,7 @@ export class DataserviceService extends ApiService { /* * Get updates for the provided array of Dataservices and broadcast the map of states - * @param {Dataservice[]} services the array of Dataservices + * @param services the array of Dataservices */ private updateServiceStateMaps(services: Dataservice[]): void { const self = this; @@ -655,9 +635,8 @@ export class DataserviceService extends ApiService { /* * Creates a Map of dataservice name to DeploymentState, given the list of dataservices and vdbStatuses - * @param {Dataservice[]} dataservices the Dataservice array - * @param {VdbStatus[]} vdbStatuses the VdbStatus array - * @returns {Map} the map of dataservice name to DeploymentState + * @param dataservices the Dataservice array + * @param vdbStatuses the VdbStatus array */ private createDeploymentStateMap(dataservices: Dataservice[], vdbStatuses: VdbStatus[]): Map { const dsStateMap: Map = new Map(); @@ -691,9 +670,8 @@ export class DataserviceService extends ApiService { /* * Creates a Map of dataservice name to PublishState, given the list of dataservices and virtualizations - * @param {Dataservice[]} dataservices the Dataservice array - * @param {virtualization[]} virtualizations the Virtualization array - * @returns {Map} the map of dataservice name to PublishState + * @param dataservices the Dataservice array + * @param virtualizations the Virtualization array */ private createPublishStateMap(dataservices: Dataservice[], virtualizations: Virtualization[]): Map { const dsStateMap: Map = new Map(); diff --git a/ui/src/app/dataservices/shared/mock-dataservice.service.ts b/ui/src/app/dataservices/shared/mock-dataservice.service.ts index 0cc4f337..d58aba64 100644 --- a/ui/src/app/dataservices/shared/mock-dataservice.service.ts +++ b/ui/src/app/dataservices/shared/mock-dataservice.service.ts @@ -17,22 +17,22 @@ import { Injectable, ReflectiveInjector } from "@angular/core"; import { Http, Response } from "@angular/http"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; -import { Dataservice } from "@dataservices/shared/dataservice.model"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { NewDataservice } from "@dataservices/shared/new-dataservice.model"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { QueryResults } from "@dataservices/shared/query-results.model"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { TestDataService } from "@shared/test-data.service"; +import { AppSettingsService } from "../../core/app-settings.service"; +import { LoggerService } from "../../core/logger.service"; +import { Dataservice } from "../../dataservices/shared/dataservice.model"; +import { DataserviceService } from "../../dataservices/shared/dataservice.service"; +import { NewDataservice } from "../../dataservices/shared/new-dataservice.model"; +import { NotifierService } from "../../dataservices/shared/notifier.service"; +import { QueryResults } from "../../dataservices/shared/query-results.model"; +import { VdbService } from "../../dataservices/shared/vdb.service"; +import { TestDataService } from "../../shared/test-data.service"; import "rxjs/add/observable/of"; import "rxjs/add/observable/throw"; import "rxjs/add/operator/catch"; import "rxjs/add/operator/map"; import { Observable } from "rxjs/Observable"; import { ErrorObservable } from "rxjs/observable/ErrorObservable"; -import { ViewEditorState } from "@dataservices/shared/view-editor-state.model"; +import { ViewEditorState } from "../../dataservices/shared/view-editor-state.model"; @Injectable() export class MockDataserviceService extends DataserviceService { @@ -58,7 +58,6 @@ export class MockDataserviceService extends DataserviceService { /** * Get the dataservices from the komodo rest interface - * @returns {Observable} */ public getAllDataservices(): Observable { return Observable.of(this.services); @@ -66,8 +65,7 @@ export class MockDataserviceService extends DataserviceService { /** * Create a dataservice via the komodo rest interface - * @param {NewDataservice} dataservice - * @returns {Observable} + * @param dataservice */ public createDataservice(dataservice: NewDataservice): Observable { const ds = new Dataservice(); @@ -80,8 +78,7 @@ export class MockDataserviceService extends DataserviceService { /** * Update a dataservice via the komodo rest interface - * @param {NewDataservice} dataservice - * @returns {Observable} + * @param dataservice */ public updateDataservice(dataservice: NewDataservice): Observable { return Observable.of(true); @@ -89,8 +86,7 @@ export class MockDataserviceService extends DataserviceService { /** * Delete a dataservice via the komodo rest interface - * @param {string} dataserviceId - * @returns {Observable} + * @param dataserviceId */ public deleteDataservice(dataserviceId: string): Observable { return Observable.of(true); @@ -103,11 +99,10 @@ export class MockDataserviceService extends DataserviceService { /** * Query a Dataservice via the komodo rest interface - * @param {string} query the SQL query - * @param {string} dataserviceName the dataservice name - * @param {number} limit the limit for the number of result rows - * @param {number} offset the offset for the result rows - * @returns {Observable} + * @param query the SQL query + * @param dataserviceName the dataservice name + * @param limit the limit for the number of result rows + * @param offset the offset for the result rows */ public queryDataservice(query: string, dataserviceName: string, limit: number, offset: number): Observable { return Observable.of(this.queryResults); @@ -149,24 +144,21 @@ export class MockDataserviceService extends DataserviceService { } /** - * @param {ViewEditorState[]} editorStates the view editor state array - * @returns {Observable} `true` if the editor state was successfully saved + * @param editorStates the view editor state array */ public saveViewEditorStates( editorStates: ViewEditorState[] ): Observable< boolean > { return Observable.of(true); } /** - * @param {string} editorId the ID of the editor state being requested - * @returns {Observable} the view editor state or empty object if not found + * @param editorId the ID of the editor state being requested */ public getViewEditorState( editorId: string ): Observable< ViewEditorState > { return Observable.of(this.editorViewStateMap.get(editorId)); } /** - * @param {string} editorStatePattern the editorState name pattern - * @returns {Observable} the view editor state array + * @param editorStatePattern the editorState name pattern */ public getViewEditorStates( editorStatePattern?: string ): Observable< ViewEditorState[] > { const editorStates = []; @@ -189,26 +181,23 @@ export class MockDataserviceService extends DataserviceService { } /** - * @param {string} editorId the ID of the editor state being deleted - * @returns {Observable} `true` if the editor state was successfully deleted + * @param editorId the ID of the editor state being deleted */ public deleteViewEditorState( editorId: string ): Observable< boolean > { return Observable.of(true); } /** - * @param {ViewEditorState[]} editorStates the view editor state array - * @param {string} dataserviceName the name of the dataservice - * @returns {Observable} `true` if the editor state was successfully saved + * @param editorStates the view editor state array + * @param dataserviceName the name of the dataservice */ public saveViewEditorStatesRefreshViews( editorStates: ViewEditorState[], dataserviceName: string ): Observable< boolean > { return Observable.of(true); } /** - * @param {string} editorId the ID of the editor state being deleted - * @param {string} dataserviceName the name of the dataservice - * @returns {Observable} `true` if the editor state was successfully saved + * @param editorId the ID of the editor state being deleted + * @param dataserviceName the name of the dataservice */ public deleteViewEditorStateRefreshViews( editorId: string, dataserviceName: string ): Observable< boolean > { return Observable.of(true); @@ -216,8 +205,7 @@ export class MockDataserviceService extends DataserviceService { /** * Query a Dataservice's published virtualization using odata protocol - * @param {string} url the odata url string - * @returns {Observable} + * @param url the odata url string */ public odataGet(url: string): Observable { const result = this.getMetadata(); diff --git a/ui/src/app/dataservices/shared/mock-vdb.service.ts b/ui/src/app/dataservices/shared/mock-vdb.service.ts index a3ca6f58..b38b0787 100644 --- a/ui/src/app/dataservices/shared/mock-vdb.service.ts +++ b/ui/src/app/dataservices/shared/mock-vdb.service.ts @@ -17,16 +17,16 @@ import { Injectable, ReflectiveInjector } from "@angular/core"; import { Http } from "@angular/http"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { VdbModelSource } from "@dataservices/shared/vdb-model-source.model"; -import { VdbModel } from "@dataservices/shared/vdb-model.model"; -import { VdbStatus } from "@dataservices/shared/vdb-status.model"; -import { Vdb } from "@dataservices/shared/vdb.model"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { Virtualization } from "@dataservices/shared/virtualization.model"; -import { TestDataService } from "@shared/test-data.service"; +import { AppSettingsService } from "../../core/app-settings.service"; +import { LoggerService } from "../../core/logger.service"; +import { NotifierService } from "../../dataservices/shared/notifier.service"; +import { VdbModelSource } from "../../dataservices/shared/vdb-model-source.model"; +import { VdbModel } from "../../dataservices/shared/vdb-model.model"; +import { VdbStatus } from "../../dataservices/shared/vdb-status.model"; +import { Vdb } from "../../dataservices/shared/vdb.model"; +import { VdbService } from "../../dataservices/shared/vdb.service"; +import { Virtualization } from "../../dataservices/shared/virtualization.model"; +import { TestDataService } from "../../shared/test-data.service"; import "rxjs/add/observable/of"; import "rxjs/add/observable/throw"; import "rxjs/add/operator/catch"; @@ -50,7 +50,6 @@ export class MockVdbService extends VdbService { /** * Get the vdbs from the komodo rest interface - * @returns {Observable} */ public getVdbs(): Observable { return Observable.of(this.testDataService.getVdbs()); @@ -58,7 +57,6 @@ export class MockVdbService extends VdbService { /** * Get the vdbs from the komodo rest interface - * @returns {Observable} */ public getTeiidVdbStatuses(): Observable { return Observable.of(this.testDataService.getVdbStatuses()); @@ -66,8 +64,7 @@ export class MockVdbService extends VdbService { /** * Create a vdb via the komodo rest interface - * @param {Vdb} vdb - * @returns {Observable} + * @param vdb */ public createVdb(vdb: Vdb): Observable { return Observable.of(true); @@ -75,9 +72,8 @@ export class MockVdbService extends VdbService { /** * Create a vdb via the komodo rest interface - * @param {string} vdbName - * @param {VdbModel} vdbModel - * @returns {Observable} + * @param vdbName + * @param vdbModel */ public createVdbModel(vdbName: string, vdbModel: VdbModel): Observable { return Observable.of(true); @@ -85,10 +81,9 @@ export class MockVdbService extends VdbService { /** * Create a vdbModelSource via the komodo rest interface - * @param {string} vdbName the vdb name - * @param {string} modelName the model name - * @param {VdbModelSource} vdbModelSource the modelsource name - * @returns {Observable} + * @param vdbName the vdb name + * @param modelName the model name + * @param vdbModelSource the modelsource name */ public createVdbModelSource(vdbName: string, modelName: string, vdbModelSource: VdbModelSource): Observable { return Observable.of(true); @@ -96,8 +91,7 @@ export class MockVdbService extends VdbService { /** * Determine if the workspace has a vdb with the supplied name - * @param {string} vdbName the name of the VDB - * @returns {Observable} + * @param vdbName the name of the VDB */ public hasWorkspaceVdb(vdbName: string): Observable { return Observable.of(true); @@ -105,8 +99,7 @@ export class MockVdbService extends VdbService { /** * Delete a vdb via the komodo rest interface - * @param {string} vdbId - * @returns {Observable} + * @param vdbId */ public deleteVdb(vdbId: string): Observable { return Observable.of(true); @@ -114,8 +107,7 @@ export class MockVdbService extends VdbService { /** * Delete a vdb if found via the komodo rest interface - * @param {string} vdbId - * @returns {Observable} + * @param vdbId */ public deleteVdbIfFound(vdbId: string): Observable { return Observable.of(true); @@ -123,8 +115,7 @@ export class MockVdbService extends VdbService { /** * Deploys the workspace VDB with the provided name - * @param {string} vdbName - * @returns {Observable} + * @param vdbName */ public deployVdb(vdbName: string): Observable { return Observable.of(true); @@ -132,8 +123,7 @@ export class MockVdbService extends VdbService { /** * Undeploy a vdb from the teiid server - * @param {string} vdbId - * @returns {Observable} + * @param vdbId */ public undeployVdb(vdbId: string): Observable { return Observable.of(true); @@ -144,9 +134,9 @@ export class MockVdbService extends VdbService { * (1) The VDB is active * (2) The VDB is in a failed state * (3) The polling duration has lapsed - * @param {string} vdbName the name of the VDB - * @param {number} pollDurationSec the duration (sec) to poll the server - * @param {number} pollIntervalSec the interval (sec) between polling attempts + * @param vdbName the name of the VDB + * @param pollDurationSec the duration (sec) to poll the server + * @param pollIntervalSec the interval (sec) between polling attempts */ public pollForActiveVdb(vdbName: string, pollDurationSec: number, pollIntervalSec: number): void { const pollIntervalMillis = pollIntervalSec * 1000; @@ -174,11 +164,10 @@ export class MockVdbService extends VdbService { /** * Query the vdb via the komodo rest interface - * @param {string} query the SQL query - * @param {string} vdbName the vdb name - * @param {number} limit the limit for the number of result rows - * @param {number} offset the offset for the result rows - * @returns {Observable} + * @param query the SQL query + * @param vdbName the vdb name + * @param limit the limit for the number of result rows + * @param offset the offset for the result rows */ public queryVdb(query: string, vdbName: string, limit: number, offset: number): Observable { return Observable.of(this.testDataService.getQueryResults()); @@ -187,10 +176,9 @@ export class MockVdbService extends VdbService { /** * Create the workspace VDB Model View if specified view is not found. * If specified VDB Model View is found, the create attempt is skipped. - * @param {string} vdbName the name of the vdb - * @param {string} modelName the name of the model - * @param {string} viewName the name of the view - * @returns {Observable} + * @param vdbName the name of the vdb + * @param modelName the name of the model + * @param viewName the name of the view */ public createVdbModelViewIfNotFound(vdbName: string, modelName: string, viewName: string): Observable { return Observable.of(true); @@ -200,10 +188,9 @@ export class MockVdbService extends VdbService { * Validates the specified view name within the specified vdb model. If the name contains valid characters * and the name is unique, the service returns 'null'. Otherwise, a 'string' containing an error message is returned. * - * @param {string} vdbName the vdb name - * @param {string} modelName the model name - * @param {string} viewName the view name - * @returns {Observable} + * @param vdbName the vdb name + * @param modelName the model name + * @param viewName the view name */ public isValidViewName( vdbName: string, modelName: string, viewName: string ): Observable< string > { // Check that valid names were supplied diff --git a/ui/src/app/dataservices/shared/new-dataservice.model.ts b/ui/src/app/dataservices/shared/new-dataservice.model.ts index 9566a048..553e0969 100644 --- a/ui/src/app/dataservices/shared/new-dataservice.model.ts +++ b/ui/src/app/dataservices/shared/new-dataservice.model.ts @@ -32,21 +32,21 @@ export class NewDataservice { } /** - * @returns {string} the dataservice name (can be null) + * @returns the dataservice name (can be null) */ public getId(): string { return this.keng__id; } /** - * @returns {string} the dataservice description (can be null) + * @returns the dataservice description (can be null) */ public getDescription(): string { return this.tko__description; } /** - * @param {string} name the dataservice name + * @param name the dataservice name */ public setId( name: string ): void { this.keng__id = name; @@ -54,7 +54,7 @@ export class NewDataservice { } /** - * @param {string} description the dataservice description (optional) + * @param description the dataservice description (optional) */ public setDescription( description?: string ): void { this.tko__description = description ? description : null; diff --git a/ui/src/app/dataservices/shared/node-selector.ts b/ui/src/app/dataservices/shared/node-selector.ts index 8936bd3a..78989aa3 100644 --- a/ui/src/app/dataservices/shared/node-selector.ts +++ b/ui/src/app/dataservices/shared/node-selector.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { SchemaNode } from "@connections/shared/schema-node.model"; +import { SchemaNode } from "../../connections/shared/schema-node.model"; /** * The node selector interface @@ -24,7 +24,7 @@ export interface NodeSelector { /** * Determine if any nodes are currently selected - * @returns {boolean} true if one or more nodes are selected + * @returns true if one or more nodes are selected */ hasSelectedNodes( ): boolean; @@ -36,7 +36,7 @@ export interface NodeSelector { /** * Deselect the node if a node with the same name is currently selected. - * @param {SchemaNode} node the table to deselect + * @param node the table to deselect */ deselectNode(node: SchemaNode): void; diff --git a/ui/src/app/dataservices/shared/notifier.service.ts b/ui/src/app/dataservices/shared/notifier.service.ts index 542076bb..c11ec79c 100644 --- a/ui/src/app/dataservices/shared/notifier.service.ts +++ b/ui/src/app/dataservices/shared/notifier.service.ts @@ -1,8 +1,8 @@ import { Injectable } from "@angular/core"; -import { ConnectionStatus } from "@connections/shared/connection-status"; -import { DeploymentState } from "@dataservices/shared/deployment-state.enum"; -import { VdbStatus } from "@dataservices/shared/vdb-status.model"; -import { Virtualization } from "@dataservices/shared/virtualization.model"; +import { ConnectionStatus } from "../../connections/shared/connection-status"; +import { DeploymentState } from "../../dataservices/shared/deployment-state.enum"; +import { VdbStatus } from "../../dataservices/shared/vdb-status.model"; +import { Virtualization } from "../../dataservices/shared/virtualization.model"; import { Observable } from "rxjs/Observable"; import { ReplaySubject } from "rxjs/ReplaySubject"; import { Subject } from "rxjs/Subject"; @@ -25,7 +25,7 @@ export class NotifierService { /** * Sends VdbStatus - * @param {VdbStatus} status the VDB deployment Status + * @param status the VDB deployment Status */ public sendVdbDeploymentStatus(status: VdbStatus): void { this.deploymentStatusSubject.next(status); @@ -33,7 +33,6 @@ export class NotifierService { /** * Get the VdbStatus Observable - * @returns {Observable} */ public getVdbDeploymentStatus(): Observable { return this.deploymentStatusSubject.asObservable(); @@ -48,7 +47,7 @@ export class NotifierService { /** * Sends map of dataservice DeploymentState - * @param {Map} stateMap + * @param stateMap */ public sendDataserviceDeployStateMap(stateMap: Map): void { this.dataserviceDeployStateSubject.next(stateMap); @@ -56,7 +55,6 @@ export class NotifierService { /** * Get the map of dataservice DeploymentState - * @returns {Observable>} */ public getDataserviceDeployStateMap(): Observable> { return this.dataserviceDeployStateSubject.asObservable(); @@ -71,7 +69,7 @@ export class NotifierService { /** * Sends map of dataservice virtualizations - * @param {Map} stateMap + * @param stateMap */ public sendDataserviceVirtualizationMap(stateMap: Map): void { this.dataserviceVirtualizationSubject.next(stateMap); @@ -79,7 +77,6 @@ export class NotifierService { /** * Get the map of dataservice Virtualization - * @returns {Observable>} */ public getDataserviceVirtualizationMap(): Observable> { return this.dataserviceVirtualizationSubject.asObservable(); @@ -94,7 +91,7 @@ export class NotifierService { /** * Sends map of Connection Status - * @param {Map} statusMap + * @param statusMap */ public sendConnectionStatusMap(statusMap: Map): void { this.connectionStatusSubject.next(statusMap); @@ -102,7 +99,6 @@ export class NotifierService { /** * Get the map of Connection Status - * @returns {Observable>} */ public getConnectionStatusMap(): Observable> { return this.connectionStatusSubject.asObservable(); diff --git a/ui/src/app/dataservices/shared/path-utils.ts b/ui/src/app/dataservices/shared/path-utils.ts index cfdf92f8..552778b0 100644 --- a/ui/src/app/dataservices/shared/path-utils.ts +++ b/ui/src/app/dataservices/shared/path-utils.ts @@ -19,8 +19,8 @@ export class PathUtils { /** * Return the path, without the leading connection info - * @param {string} sourcePath - * @returns {string} the connection name + * @param sourcePath + * @returns the connection name */ public static getPathWithoutConnection(sourcePath: string): string { if (!sourcePath || sourcePath === null || sourcePath.length === 0) { @@ -32,8 +32,8 @@ export class PathUtils { /** * Get the connection name from the supplied source path - * @param {string} sourcePath - * @returns {string} the connection name + * @param sourcePath + * @returns the connection name */ public static getConnectionName(sourcePath: string): string { if (!sourcePath || sourcePath === null || sourcePath.length === 0) { @@ -50,8 +50,8 @@ export class PathUtils { /** * Get the source name from the supplied source path - * @param {string} sourcePath - * @returns {string} the source name + * @param sourcePath + * @returns the source name */ public static getSourceName(sourcePath: string): string { if (!sourcePath || sourcePath === null || sourcePath.length === 0) { @@ -69,8 +69,8 @@ export class PathUtils { /** * Get the source type from the supplied source path - * @param {string} sourcePath - * @returns {string} the source type + * @param sourcePath + * @returns the source type */ public static getSourceType(sourcePath: string): string { if (!sourcePath || sourcePath === null || sourcePath.length === 0) { diff --git a/ui/src/app/dataservices/shared/projected-column.model.spec.ts b/ui/src/app/dataservices/shared/projected-column.model.spec.ts index 51471a60..98c9c96b 100644 --- a/ui/src/app/dataservices/shared/projected-column.model.spec.ts +++ b/ui/src/app/dataservices/shared/projected-column.model.spec.ts @@ -1,4 +1,4 @@ -import { ProjectedColumn } from "@dataservices/shared/projected-column.model"; +import { ProjectedColumn } from "../../dataservices/shared/projected-column.model"; describe("ProjectedColumn", () => { let projCol1: ProjectedColumn; diff --git a/ui/src/app/dataservices/shared/projected-column.model.ts b/ui/src/app/dataservices/shared/projected-column.model.ts index 50e81e8b..fab4a424 100644 --- a/ui/src/app/dataservices/shared/projected-column.model.ts +++ b/ui/src/app/dataservices/shared/projected-column.model.ts @@ -25,8 +25,8 @@ export class ProjectedColumn { public selected = false; /** - * @param {Object} json the JSON representation of ProjectedColumn - * @returns {ProjectedColumn} the new ProjectedColumn (never null) + * @param json the JSON representation of ProjectedColumn + * @returns the new ProjectedColumn (never null) */ public static create( json: object = {} ): ProjectedColumn { const projCol = new ProjectedColumn(); @@ -47,28 +47,28 @@ export class ProjectedColumn { } /** - * @returns {string} the column name + * @returns the column name */ public getName(): string { return this.name; } /** - * @param {string} name the column name + * @param name the column name */ public setName( name?: string ): void { this.name = name ? name : null; } /** - * @returns {string} the column type + * @returns the column type */ public getType(): string { return this.type; } /** - * @param {string} type the column type + * @param type the column type */ public setType( type?: string ): void { this.type = type ? type : ""; @@ -76,7 +76,7 @@ export class ProjectedColumn { /** * Determine if the supplied ProjectedColumn is equal to this - * @param {ProjectedColumn} otherCol the other column + * @param otherCol the other column */ public isEqual( otherCol: ProjectedColumn ): boolean { let equal = false; diff --git a/ui/src/app/dataservices/shared/query-results.model.spec.ts b/ui/src/app/dataservices/shared/query-results.model.spec.ts index d4c7e2a6..a561bb55 100644 --- a/ui/src/app/dataservices/shared/query-results.model.spec.ts +++ b/ui/src/app/dataservices/shared/query-results.model.spec.ts @@ -1,4 +1,4 @@ -import { QueryResults } from "@dataservices/shared/query-results.model"; +import { QueryResults } from "../../dataservices/shared/query-results.model"; describe("QueryResults", () => { let queryResults: QueryResults; diff --git a/ui/src/app/dataservices/shared/query-results.model.ts b/ui/src/app/dataservices/shared/query-results.model.ts index 8356a9e9..5366791c 100644 --- a/ui/src/app/dataservices/shared/query-results.model.ts +++ b/ui/src/app/dataservices/shared/query-results.model.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { ColumnData } from "@dataservices/shared/column-data.model"; -import { RowData } from "@dataservices/shared/row-data.model"; +import { ColumnData } from "../../dataservices/shared/column-data.model"; +import { RowData } from "../../dataservices/shared/row-data.model"; /** * QueryResults model @@ -28,7 +28,7 @@ export class QueryResults { /** * Constructor - * @param {object} json the representation of the QueryResults + * @param json the representation of the QueryResults */ constructor(json: object = {}) { for (const field of Object.keys(json)) { @@ -52,29 +52,23 @@ export class QueryResults { } } - /** - * @returns {ColumnData[]} the column data - */ public getColumns(): ColumnData[] { return this.columns; } - /** - * @param {ColumnData[]} columns the column data (optional) - */ public setColumns( columns?: ColumnData[] ): void { this.columns = columns ? columns : null; } /** - * @returns {RowData[]} the row data + * @returns the row data */ public getRows(): RowData[] { return this.rows; } /** - * @param {RowData[]} rows the row data (optional) + * @param rows the row data (optional) */ public setRows( rows?: RowData[] ): void { this.rows = rows ? rows : null; diff --git a/ui/src/app/dataservices/shared/row-data.model.ts b/ui/src/app/dataservices/shared/row-data.model.ts index 0f7dd97a..c1504d44 100644 --- a/ui/src/app/dataservices/shared/row-data.model.ts +++ b/ui/src/app/dataservices/shared/row-data.model.ts @@ -24,7 +24,7 @@ export class RowData { /** * Constructor - * @param {object} json the representation of the RowData + * @param json the representation of the RowData */ constructor(json: object = {}) { for (const field of Object.keys(json)) { @@ -33,7 +33,7 @@ export class RowData { } /** - * @returns {string[]} the row data array + * @returns the row data array */ public getData( ): string[] { return this.row; diff --git a/ui/src/app/dataservices/shared/sql-view.model.ts b/ui/src/app/dataservices/shared/sql-view.model.ts index bfcd0239..d5a49f34 100644 --- a/ui/src/app/dataservices/shared/sql-view.model.ts +++ b/ui/src/app/dataservices/shared/sql-view.model.ts @@ -25,14 +25,14 @@ export class SqlView { } /** - * @returns {string} the view name + * @returns the view name */ public get name(): string { return this.viewName; } /** - * @param {string} name the view name + * @param name the view name */ public set name( name: string ) { this.viewName = name; diff --git a/ui/src/app/dataservices/shared/vdb-model-source.model.ts b/ui/src/app/dataservices/shared/vdb-model-source.model.ts index 35b11fc7..de1b230b 100644 --- a/ui/src/app/dataservices/shared/vdb-model-source.model.ts +++ b/ui/src/app/dataservices/shared/vdb-model-source.model.ts @@ -28,8 +28,8 @@ export class VdbModelSource { private vdb__originConnection: string; /** - * @param {Object} json the JSON representation of a VdbModelSource - * @returns {VdbModelSource} the new VdbModelSource (never null) + * @param json the JSON representation of a VdbModelSource + * @returns the new VdbModelSource (never null) */ public static create( json: object = {} ): VdbModelSource { const vdbModelSource = new VdbModelSource(); @@ -42,77 +42,77 @@ export class VdbModelSource { } /** - * @returns {string} the vdbModelSource identifier (can be null) + * @returns the vdbModelSource identifier (can be null) */ public getId(): string { return this.keng__id; } /** - * @returns {string} the vdbModelSource dataPath (can be null) + * @returns the vdbModelSource dataPath (can be null) */ public getDataPath(): string { return this.keng__dataPath; } /** - * @returns {string} the vdbModelSource type name (can be null) + * @returns the vdbModelSource type name (can be null) */ public getType(): string { return this.keng__kType; } /** - * @returns {string} the jndi name (can be null) + * @returns the jndi name (can be null) */ public getJndiName(): string { return this.vdb__sourceJndiName; } /** - * @returns {string} the translator name (can be null) + * @returns the translator name (can be null) */ public getTranslatorName(): string { return this.vdb__sourceTranslator; } /** - * @returns {string} the associated connection path (can be null) + * @returns the associated connection path (can be null) */ public getOriginConnection(): string { return this.vdb__originConnection; } /** - * @param {string} id the vdbModelSource identifier (optional) + * @param id the vdbModelSource identifier (optional) */ public setId( id?: string ): void { this.keng__id = id ? id : null; } /** - * @param {string} dataPath the vdbModelSource dataPath (optional) + * @param dataPath the vdbModelSource dataPath (optional) */ public setDataPath( dataPath?: string ): void { this.keng__dataPath = dataPath ? dataPath : null; } /** - * @param {string} jndiName the jndi name (optional) + * @param jndiName the jndi name (optional) */ public setJndiName( jndiName?: string ): void { this.vdb__sourceJndiName = jndiName ? jndiName : null; } /** - * @param {string} translator the translator name (optional) + * @param translator the translator name (optional) */ public setTranslatorName( translator?: string ): void { this.vdb__sourceTranslator = translator ? translator : null; } /** - * @param {string} connectionPath the path to the associated connection (optional) + * @param connectionPath the path to the associated connection (optional) */ public setOriginConnection( connectionPath?: string ): void { this.vdb__originConnection = connectionPath ? connectionPath : null; @@ -120,7 +120,7 @@ export class VdbModelSource { /** * Set all object values using the supplied VdbModelSource json - * @param {Object} values + * @param values */ public setValues(values: object = {}): void { Object.assign(this, values); diff --git a/ui/src/app/dataservices/shared/vdb-model.model.ts b/ui/src/app/dataservices/shared/vdb-model.model.ts index 215972cf..6d2cb09d 100644 --- a/ui/src/app/dataservices/shared/vdb-model.model.ts +++ b/ui/src/app/dataservices/shared/vdb-model.model.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { NameValue } from "@dataservices/shared/name-value.model"; +import { NameValue } from "../../dataservices/shared/name-value.model"; /** * VdbModel model @@ -30,8 +30,8 @@ export class VdbModel { private keng__properties: NameValue[] = []; /** - * @param {Object} json the JSON representation of a VdbModel - * @returns {VdbModel} the new VdbModel (never null) + * @param json the JSON representation of a VdbModel + * @returns the new VdbModel (never null) */ public static create( json: object = {} ): VdbModel { const vdbModel = new VdbModel(); @@ -44,56 +44,56 @@ export class VdbModel { } /** - * @returns {string} the vdbModel identifier (can be null) + * @returns the vdbModel identifier (can be null) */ public getId(): string { return this.keng__id; } /** - * @returns {string} the vdbModel dataPath (can be null) + * @returns the vdbModel dataPath (can be null) */ public getDataPath(): string { return this.keng__dataPath; } /** - * @returns {string} the vdbModel type name (can be null) + * @returns the vdbModel type name (can be null) */ public getType(): string { return this.keng__kType; } /** - * @returns {string} the vdbModel model type + * @returns the vdbModel model type */ public getModelType(): string { return this.mmcore__modelType; } /** - * @param {string} id the vdbModel identifier (optional) + * @param id the vdbModel identifier (optional) */ public setId( id?: string ): void { this.keng__id = id ? id : null; } /** - * @param {string} dataPath the vdbModel dataPath (optional) + * @param dataPath the vdbModel dataPath (optional) */ public setDataPath( dataPath?: string ): void { this.keng__dataPath = dataPath ? dataPath : null; } /** - * @param {string} modelType the vdbModel type + * @param modelType the vdbModel type */ public setModelType( modelType: string ): void { this.mmcore__modelType = modelType; } /** - * @param {NameValue[]} props the model properties (optional) + * @param props the model properties (optional) */ public setProperties( props?: NameValue[] ): void { this.keng__properties = props ? props : null; @@ -101,7 +101,7 @@ export class VdbModel { /** * Set all object values using the supplied VdbModel json - * @param {Object} values + * @param values */ public setValues(values: object = {}): void { Object.assign(this, values); diff --git a/ui/src/app/dataservices/shared/vdb-status.model.spec.ts b/ui/src/app/dataservices/shared/vdb-status.model.spec.ts index 838c5e29..49644809 100644 --- a/ui/src/app/dataservices/shared/vdb-status.model.spec.ts +++ b/ui/src/app/dataservices/shared/vdb-status.model.spec.ts @@ -1,4 +1,4 @@ -import { VdbStatus } from "@dataservices/shared/vdb-status.model"; +import { VdbStatus } from "../../dataservices/shared/vdb-status.model"; describe("VdbStatus", () => { let vdbStatus: VdbStatus; diff --git a/ui/src/app/dataservices/shared/vdb-status.model.ts b/ui/src/app/dataservices/shared/vdb-status.model.ts index 2b310105..88968348 100644 --- a/ui/src/app/dataservices/shared/vdb-status.model.ts +++ b/ui/src/app/dataservices/shared/vdb-status.model.ts @@ -29,8 +29,8 @@ export class VdbStatus { private errors: string[] = []; /** - * @param {Object} json the JSON representation of a VdbStatus - * @returns {VdbStatus} the new VdbStatus (never null) + * @param json the JSON representation of a VdbStatus + * @returns the new VdbStatus (never null) */ public static create( json: object = {} ): VdbStatus { const vdbStatus = new VdbStatus(); @@ -43,98 +43,98 @@ export class VdbStatus { } /** - * @returns {string} the vdbStatus name + * @returns the vdbStatus name */ public getName(): string { return this.name; } /** - * @returns {string} the vdbStatus deployedName + * @returns the vdbStatus deployedName */ public getDeployedName(): string { return this.deployedName; } /** - * @returns {string} the vdbStatus version (can be null) + * @returns the vdbStatus version (can be null) */ public getVersion(): string { return this.version; } /** - * @returns {boolean} the vdbStatus active state + * @returns the vdbStatus active state */ public isActive(): boolean { return this.active; } /** - * @returns {boolean} the vdbStatus loading state + * @returns the vdbStatus loading state */ public isLoading(): boolean { return this.loading; } /** - * @returns {boolean} the vdbStatus failed state + * @returns the vdbStatus failed state */ public isFailed(): boolean { return this.failed; } /** - * @returns {string[]} the errors (never null) + * @returns the errors (never null) */ public getErrors(): string[] { return this.errors; } /** - * @param {string} name the vdbStatus name + * @param name the vdbStatus name */ public setName( name: string ): void { this.name = name; } /** - * @param {string} deployedName the vdbStatus deployedName + * @param deployedName the vdbStatus deployedName */ public setDeployedName( deployedName: string ): void { this.deployedName = deployedName; } /** - * @param {string} version the vdbStatus version (optional) + * @param version the vdbStatus version (optional) */ public setVersion( version?: string ): void { this.version = version ? version : "1"; } /** - * @param {boolean} active the active state + * @param active the active state */ public setActive( active: boolean ): void { this.active = active; } /** - * @param {boolean} loading the loading state + * @param loading the loading state */ public setLoading( loading: boolean ): void { this.loading = loading; } /** - * @param {boolean} failed the failed state + * @param failed the failed state */ public setFailed( failed: boolean ): void { this.failed = failed; } /** - * @param {[string]} errors the status errors + * @param errors the status errors */ public setErrors( errors: string[] ): void { this.errors = errors; @@ -142,7 +142,7 @@ export class VdbStatus { /** * Set all object values using the supplied VdbStatus json - * @param {Object} values + * @param values */ public setValues(values: object = {}): void { Object.assign(this, values); diff --git a/ui/src/app/dataservices/shared/vdb.model.ts b/ui/src/app/dataservices/shared/vdb.model.ts index 6df84a81..48c2d0fd 100644 --- a/ui/src/app/dataservices/shared/vdb.model.ts +++ b/ui/src/app/dataservices/shared/vdb.model.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { Identifiable } from "@shared/identifiable"; -import { SortDirection } from "@shared/sort-direction.enum"; +import { Identifiable } from "../../shared/identifiable"; +import { SortDirection } from "../../shared/sort-direction.enum"; /** * Vdb model @@ -33,8 +33,8 @@ export class Vdb implements Identifiable< string > { private vdb__version: string; /** - * @param {Object} json the JSON representation of a Vdb - * @returns {Vdb} the new Vdb (never null) + * @param json the JSON representation of a Vdb + * @returns the new Vdb (never null) */ public static create( json: object = {} ): Vdb { const vdb = new Vdb(); @@ -43,8 +43,8 @@ export class Vdb implements Identifiable< string > { } /** - * @param {Vdb[]} vdbs the vdbs being sorted - * @param {SortDirection} sortDirection the sort direction + * @param vdbs the vdbs being sorted + * @param sortDirection the sort direction */ public static sort( vdbs: Vdb[], sortDirection: SortDirection ): void { @@ -86,105 +86,105 @@ export class Vdb implements Identifiable< string > { } /** - * @returns {string} the vdb identifier (can be null) + * @returns the vdb identifier (can be null) */ public getId(): string { return this.keng__id; } /** - * @returns {string} the vdb name (can be null) + * @returns the vdb name (can be null) */ public getName(): string { return this.vdb__name; } /** - * @returns {string} the vdb description (can be null) + * @returns the vdb description (can be null) */ public getDescription(): string { return this.vdb__description; } /** - * @returns {string} the vdb dataPath (can be null) + * @returns the vdb dataPath (can be null) */ public getDataPath(): string { return this.keng__dataPath; } /** - * @returns {string} the vdb originalFile (can be null) + * @returns the vdb originalFile (can be null) */ public getOriginalFile(): string { return this.vdb__originalFile; } /** - * @returns {string} the vdb type name (can be null) + * @returns the vdb type name (can be null) */ public getType(): string { return this.keng__kType; } /** - * @returns {boolean} the vdb preview status + * @returns the vdb preview status */ public isPreview(): boolean { return this.vdb__preview; } /** - * @returns {string} the vdb type name (can be null) + * @returns the vdb type name (can be null) */ public getVersion(): string { return this.vdb__version; } /** - * @param {string} id the vdb identifier (optional) + * @param id the vdb identifier (optional) */ public setId( id?: string ): void { this.keng__id = id ? id : null; } /** - * @param {string} name the vdb name (optional) + * @param name the vdb name (optional) */ public setName( name?: string ): void { this.vdb__name = name ? name : null; } /** - * @param {string} description the vdb description (optional) + * @param description the vdb description (optional) */ public setDescription( description?: string ): void { this.vdb__description = description ? description : null; } /** - * @param {string} dataPath the vdb dataPath (optional) + * @param dataPath the vdb dataPath (optional) */ public setDataPath( dataPath?: string ): void { this.keng__dataPath = dataPath ? dataPath : null; } /** - * @param {string} originalFile the vdb originalFile (optional) + * @param originalFile the vdb originalFile (optional) */ public setOriginalFile( originalFile?: string ): void { this.vdb__originalFile = originalFile ? originalFile : null; } /** - * @param {boolean} preview the vdb preview status + * @param preview the vdb preview status */ public setPreview( preview: boolean ): void { this.vdb__preview = preview; } /** - * @param {string} version the vdb version + * @param version the vdb version */ public setVersion( version?: string ): void { this.vdb__version = version; @@ -192,7 +192,7 @@ export class Vdb implements Identifiable< string > { /** * Set all object values using the supplied Vdb json - * @param {Object} values + * @param values */ public setValues(values: object = {}): void { Object.assign(this, values); diff --git a/ui/src/app/dataservices/shared/vdb.service.spec.ts b/ui/src/app/dataservices/shared/vdb.service.spec.ts index 55e90f94..c06d675b 100644 --- a/ui/src/app/dataservices/shared/vdb.service.spec.ts +++ b/ui/src/app/dataservices/shared/vdb.service.spec.ts @@ -1,10 +1,10 @@ import { inject, TestBed } from "@angular/core/testing"; import { HttpModule } from "@angular/http"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; +import { AppSettingsService } from "../../core/app-settings.service"; +import { LoggerService } from "../../core/logger.service"; +import { MockAppSettingsService } from "../../core/mock-app-settings.service"; +import { NotifierService } from "../../dataservices/shared/notifier.service"; +import { VdbService } from "../../dataservices/shared/vdb.service"; describe("VdbService", () => { beforeEach(() => { diff --git a/ui/src/app/dataservices/shared/vdb.service.ts b/ui/src/app/dataservices/shared/vdb.service.ts index c8fc0aec..0f8ca671 100644 --- a/ui/src/app/dataservices/shared/vdb.service.ts +++ b/ui/src/app/dataservices/shared/vdb.service.ts @@ -17,20 +17,20 @@ import { Injectable } from "@angular/core"; import { Http } from "@angular/http"; -import { ApiService } from "@core/api.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { VdbModelSource } from "@dataservices/shared/vdb-model-source.model"; -import { VdbModel } from "@dataservices/shared/vdb-model.model"; -import { VdbStatus } from "@dataservices/shared/vdb-status.model"; -import { Vdb } from "@dataservices/shared/vdb.model"; -import { VdbsConstants } from "@dataservices/shared/vdbs-constants"; -import { Virtualization } from "@dataservices/shared/virtualization.model"; -import { environment } from "@environments/environment"; +import { ApiService } from "../../core/api.service"; +import { AppSettingsService } from "../../core/app-settings.service"; +import { LoggerService } from "../../core/logger.service"; +import { NotifierService } from "../../dataservices/shared/notifier.service"; +import { VdbModelSource } from "../../dataservices/shared/vdb-model-source.model"; +import { VdbModel } from "../../dataservices/shared/vdb-model.model"; +import { VdbStatus } from "../../dataservices/shared/vdb-status.model"; +import { Vdb } from "../../dataservices/shared/vdb.model"; +import { VdbsConstants } from "../../dataservices/shared/vdbs-constants"; +import { Virtualization } from "../../dataservices/shared/virtualization.model"; +import { environment } from "../../../environments/environment"; import { Observable } from "rxjs/Rx"; import { Subscription } from "rxjs/Subscription"; -import { QueryResults } from "@dataservices/shared/query-results.model"; +import { QueryResults } from "../../dataservices/shared/query-results.model"; @Injectable() /** @@ -51,7 +51,6 @@ export class VdbService extends ApiService { /** * Get the vdbs from the komodo rest interface - * @returns {Observable} */ public getVdbs(): Observable { return this.http @@ -65,8 +64,7 @@ export class VdbService extends ApiService { /** * Determine if the workspace has a vdb with the supplied name - * @param {string} vdbName the name of the VDB - * @returns {Observable} + * @param vdbName the name of the VDB */ public hasWorkspaceVdb(vdbName: string): Observable { return this.http @@ -85,10 +83,9 @@ export class VdbService extends ApiService { /** * Determine if the workspace has the specified vdb model view - * @param {string} vdbName the name of the VDB - * @param {string} modelName the name of the Model - * @param {string} viewName the name of the View - * @returns {Observable} + * @param vdbName the name of the VDB + * @param modelName the name of the Model + * @param viewName the name of the View */ public hasWorkspaceVdbModelView(vdbName: string, modelName: string, viewName: string): Observable { const url = environment.komodoWorkspaceUrl + VdbsConstants.vdbsRootPath + "/" + vdbName @@ -110,7 +107,6 @@ export class VdbService extends ApiService { /** * Get the status of any deployed vdbs - * @returns {Observable} */ public getTeiidVdbStatuses(): Observable { return this.http @@ -124,7 +120,6 @@ export class VdbService extends ApiService { /** * Get the status of all published vdbs (virtualizations) - * @returns {Observable} */ public getVirtualizations(): Observable { return this.http @@ -140,10 +135,9 @@ export class VdbService extends ApiService { * Validates the specified view name within the specified vdb model. If the name contains valid characters * and the name is unique, the service returns 'null'. Otherwise, a 'string' containing an error message is returned. * - * @param {string} vdbName the vdb name - * @param {string} modelName the model name - * @param {string} viewName the view name - * @returns {Observable} + * @param vdbName the vdb name + * @param modelName the model name + * @param viewName the view name */ public isValidViewName( vdbName: string, modelName: string, viewName: string ): Observable< string > { // Check that valid names were supplied @@ -174,11 +168,10 @@ export class VdbService extends ApiService { /** * Query the vdb via the komodo rest interface - * @param {string} query the SQL query - * @param {string} vdbName the vdb name - * @param {number} limit the limit for the number of result rows - * @param {number} offset the offset for the result rows - * @returns {Observable} + * @param query the SQL query + * @param vdbName the vdb name + * @param limit the limit for the number of result rows + * @param offset the offset for the result rows */ public queryVdb(query: string, vdbName: string, limit: number, offset: number): Observable { // The payload for the rest call @@ -202,8 +195,7 @@ export class VdbService extends ApiService { /** * Create a vdb via the komodo rest interface - * @param {Vdb} vdb - * @returns {Observable} + * @param vdb */ public createVdb(vdb: Vdb): Observable { return this.http @@ -217,9 +209,8 @@ export class VdbService extends ApiService { /** * Create a vdb via the komodo rest interface - * @param {string} vdbName - * @param {VdbModel} vdbModel - * @returns {Observable} + * @param vdbName + * @param vdbModel */ public createVdbModel(vdbName: string, vdbModel: VdbModel): Observable { const str = JSON.stringify(vdbModel); @@ -235,10 +226,9 @@ export class VdbService extends ApiService { /** * Create a vdbModelSource via the komodo rest interface - * @param {string} vdbName the vdb name - * @param {string} modelName the model name - * @param {VdbModelSource} vdbModelSource the modelsource name - * @returns {Observable} + * @param vdbName the vdb name + * @param modelName the model name + * @param vdbModelSource the modelsource name */ public createVdbModelSource(vdbName: string, modelName: string, vdbModelSource: VdbModelSource): Observable { return this.http @@ -254,10 +244,9 @@ export class VdbService extends ApiService { /** * Create a vdb model view via the komodo rest interface - * @param {string} vdbName - * @param {string} modelName - * @param {string} viewName - * @returns {Observable} + * @param vdbName + * @param modelName + * @param viewName */ public createVdbModelView(vdbName: string, modelName: string, viewName: string): Observable { // The payload for the rest call @@ -282,8 +271,7 @@ export class VdbService extends ApiService { /** * Delete a vdb via the komodo rest interface - * @param {string} vdbId - * @returns {Observable} + * @param vdbId */ public deleteVdb(vdbId: string): Observable { return this.http @@ -297,8 +285,7 @@ export class VdbService extends ApiService { /** * Deploys the workspace VDB with the provided name - * @param {string} vdbName - * @returns {Observable} + * @param vdbName */ public deployVdb(vdbName: string): Observable { const vdbPath = this.getKomodoUserWorkspacePath() + "/" + vdbName; @@ -318,8 +305,7 @@ export class VdbService extends ApiService { /** * Undeploy a vdb from the teiid server - * @param {string} vdbId - * @returns {Observable} + * @param vdbId */ public undeployVdb(vdbId: string): Observable { return this.http @@ -336,9 +322,9 @@ export class VdbService extends ApiService { * (1) The VDB is active * (2) The VDB is in a failed state * (3) The polling duration has lapsed - * @param {string} vdbName the name of the VDB - * @param {number} pollDurationSec the duration (sec) to poll the server - * @param {number} pollIntervalSec the interval (sec) between polling attempts + * @param vdbName the name of the VDB + * @param pollDurationSec the duration (sec) to poll the server + * @param pollIntervalSec the interval (sec) between polling attempts */ public pollForActiveVdb(vdbName: string, pollDurationSec: number, pollIntervalSec: number): void { const pollIntervalMillis = pollIntervalSec * 1000; @@ -401,8 +387,7 @@ export class VdbService extends ApiService { /** * Deletes the workspace VDB if found. Checks the workspace first, before attempting the delete. * If the VDB is not found the delete attempt is skipped. - * @param {string} vdbName the name of the vdb - * @returns {Observable} + * @param vdbName the name of the vdb */ public deleteVdbIfFound(vdbName: string): Observable { return this.hasWorkspaceVdb(vdbName) @@ -417,10 +402,9 @@ export class VdbService extends ApiService { /** * Delete a view within a vdb model via the komodo rest interface - * @param {string} vdbName the vdb name - * @param {string} modelName the model name - * @param {string} viewName the view name - * @returns {Observable} 'true' if successful + * @param vdbName the vdb name + * @param modelName the model name + * @param viewName the view name */ public deleteView(vdbName: string, modelName: string, viewName: string): Observable { return this.http @@ -436,10 +420,9 @@ export class VdbService extends ApiService { /** * Deletes the workspace VDB model view if found. Checks the workspace first, before attempting the delete. * If the View is not found the delete attempt is skipped. - * @param {string} vdbName the name of the vdb - * @param {string} modelName the name of the model - * @param {string} viewName the name of the view - * @returns {Observable} + * @param vdbName the name of the vdb + * @param modelName the name of the model + * @param viewName the name of the view */ public deleteViewIfFound(vdbName: string, modelName: string, viewName: string): Observable { return this.hasWorkspaceVdbModelView(vdbName, modelName, viewName) diff --git a/ui/src/app/dataservices/shared/view-definition.model.spec.ts b/ui/src/app/dataservices/shared/view-definition.model.spec.ts index ae859ca4..e5852baf 100644 --- a/ui/src/app/dataservices/shared/view-definition.model.spec.ts +++ b/ui/src/app/dataservices/shared/view-definition.model.spec.ts @@ -1,6 +1,6 @@ -import { ViewDefinition } from "@dataservices/shared/view-definition.model"; -import { CompositionOperator } from "@dataservices/shared/composition-operator.enum"; -import { CompositionType } from "@dataservices/shared/composition-type.enum"; +import { ViewDefinition } from "../../dataservices/shared/view-definition.model"; +import { CompositionOperator } from "../../dataservices/shared/composition-operator.enum"; +import { CompositionType } from "../../dataservices/shared/composition-type.enum"; describe("ViewDefinition", () => { let viewDefn1: ViewDefinition; diff --git a/ui/src/app/dataservices/shared/view-definition.model.ts b/ui/src/app/dataservices/shared/view-definition.model.ts index 2c26a5df..ebee3f9b 100644 --- a/ui/src/app/dataservices/shared/view-definition.model.ts +++ b/ui/src/app/dataservices/shared/view-definition.model.ts @@ -15,12 +15,12 @@ * limitations under the License. */ -import { Composition } from "@dataservices/shared/composition.model"; -import { PathUtils } from "@dataservices/shared/path-utils"; -import { VdbsConstants } from "@dataservices/shared/vdbs-constants"; -import { CompositionOperator } from "@dataservices/shared/composition-operator.enum"; -import { CompositionType } from "@dataservices/shared/composition-type.enum"; -import { ProjectedColumn } from "@dataservices/shared/projected-column.model"; +import { Composition } from "../../dataservices/shared/composition.model"; +import { PathUtils } from "../../dataservices/shared/path-utils"; +import { VdbsConstants } from "../../dataservices/shared/vdbs-constants"; +import { CompositionOperator } from "../../dataservices/shared/composition-operator.enum"; +import { CompositionType } from "../../dataservices/shared/composition-type.enum"; +import { ProjectedColumn } from "../../dataservices/shared/projected-column.model"; /** * ViewDefinition model @@ -36,8 +36,8 @@ export class ViewDefinition { private defaultProjectedColumns: ProjectedColumn[] = []; /** - * @param {Object} json the JSON representation of a ViewDefinition - * @returns {ViewDefinition} the new ViewDefinition (never null) + * @param json the JSON representation of a ViewDefinition + * @returns the new ViewDefinition (never null) */ public static create( json: object = {} ): ViewDefinition { const viewDefn = new ViewDefinition(); @@ -94,42 +94,42 @@ export class ViewDefinition { } /** - * @returns {string} the view definition name + * @returns the view definition name */ public getName(): string { return this.viewName; } /** - * @param {string} name the view definition name + * @param name the view definition name */ public setName( name?: string ): void { this.viewName = name ? name : null; } /** - * @returns {string} the view description + * @returns the view description */ public getDescription(): string { return this.keng__description; } /** - * @param {string} description the view description + * @param description the view description */ public setDescription( description?: string ): void { this.keng__description = description ? description : ""; } /** - * @returns {string[]} the view source paths + * @returns the view source paths */ public getSourcePaths(): string[] { return this.sourcePaths; } /** - * @param {string[]} sourcePaths the view source paths + * @param sourcePaths the view source paths */ public setSourcePaths( sourcePaths: string[] = [] ): void { this.sourcePaths = sourcePaths; @@ -138,14 +138,14 @@ export class ViewDefinition { } /** - * @returns {Composition[]} the view compositions + * @returns the view compositions */ public getCompositions(): Composition[] { return this.compositions; } /** - * @param {Composition[]} compositions the view compositions + * @param compositions the view compositions */ public setCompositions( compositions: Composition[] = [] ): void { this.compositions = compositions; @@ -154,14 +154,14 @@ export class ViewDefinition { } /** - * @returns {ProjectedColumn[]} the view projected columns + * @returns the view projected columns */ public getProjectedColumns(): ProjectedColumn[] { return this.projectedColumns; } /** - * @param {ProjectedColumns} projColumns the projected columns + * @param projColumns the projected columns */ public setProjectedColumns( projColumns: ProjectedColumn[] ): void { this.projectedColumns = projColumns; @@ -169,7 +169,7 @@ export class ViewDefinition { /** * Get the projected columns that are currently selected - * @returns {ProjectedColumn[]} the view selected projected columns + * @returns the view selected projected columns */ public getSelectedProjectedColumns(): ProjectedColumn[] { const selectedProjCols: ProjectedColumn[] = []; @@ -184,7 +184,7 @@ export class ViewDefinition { /** * Add Composition to the View * - * @param {Composition} compositionToAdd the composition to add + * @param compositionToAdd the composition to add */ public addComposition( compositionToAdd: Composition ): void { const index = this.compositions.findIndex( ( comp ) => comp.getName() === compositionToAdd.getName() ); @@ -197,7 +197,7 @@ export class ViewDefinition { } /** - * @param {string} compositionToRemove the composition name to remove + * @param compositionToRemove the composition name to remove */ public removeComposition( compositionToRemove: string ): void { const index = this.compositions.findIndex( ( comp ) => comp.getName() === compositionToRemove ); @@ -212,7 +212,7 @@ export class ViewDefinition { /** * Add source path to the list of source paths * - * @param {string} sourcePathToAdd the source path to add + * @param sourcePathToAdd the source path to add */ public addSourcePath( sourcePathToAdd: string ): void { const index = this.sourcePaths.findIndex( ( sPath ) => @@ -229,7 +229,7 @@ export class ViewDefinition { /** * Add source paths to the list of source paths. * - * @param {string[]} sourcePathsToAdd the source paths being added + * @param sourcePathsToAdd the source paths being added */ public addSourcePaths( sourcePathsToAdd: string[] = [] ): void { const self = this; @@ -240,7 +240,7 @@ export class ViewDefinition { } /** - * @param {string} sourcePathToRemove the source path to remove + * @param sourcePathToRemove the source path to remove */ public removeSourcePath( sourcePathToRemove: string ): void { const index = this.sourcePaths.findIndex( ( sourcePath ) => @@ -254,7 +254,7 @@ export class ViewDefinition { } /** - * @param {string[]} sourcePathsToRemove the source paths to remove + * @param sourcePathsToRemove the source paths to remove */ public removeSourcePaths( sourcePathsToRemove: string[] ): void { const self = this; @@ -266,7 +266,7 @@ export class ViewDefinition { /** * Determine if this view definition currenly has the specified source path - * @param {string} sourcePathToTest the source path + * @param sourcePathToTest the source path */ public hasSourcePath( sourcePathToTest: string ): boolean { const index = this.sourcePaths.findIndex( ( sourcePath ) => @@ -280,7 +280,7 @@ export class ViewDefinition { /** * Determine whether the view definition is in a complete state - * @returns {boolean} true if complete + * @returns true if complete */ public get complete(): boolean { // Checks to determine whether the viewDefinition is complete. @@ -331,7 +331,7 @@ export class ViewDefinition { /** * Determine whether the view definition is editable - * @returns {boolean} true if editable + * @returns true if editable */ public get editable(): boolean { return this.isEditable; @@ -339,7 +339,7 @@ export class ViewDefinition { /** * Set the ViewDefinition editable status - * @param {boolean} editable true if editable + * @param editable true if editable */ public setEditable(editable: boolean): void { this.isEditable = editable; @@ -347,7 +347,7 @@ export class ViewDefinition { /** * Get the preview SQL for the view, given the current selections - * @returns {string} the view SQL + * @returns the view SQL */ public getPreviewSql( sourcePath?: string ): string { @@ -369,8 +369,8 @@ export class ViewDefinition { const rightTable = this.getPreviewTableName(composition.getRightSourcePath()); const leftCriteriaColName = composition.getLeftCriteriaColumn(); const rightCriteriaColName = composition.getRightCriteriaColumn(); - const criteriaOperator = CompositionOperator.toSql(composition.getOperator()); - const joinType = CompositionType.toSql(composition.getType()); + const criteriaOperator = this.getCompositionOperatorSql(composition.getOperator()); + const joinType = this.getCompositionTypeSql(composition.getType()); const projColsSql = this.getProjectedColumnsSql(); return "SELECT " + projColsSql + " FROM " + leftTable + " AS A " + joinType + " " + rightTable + " AS B ON " + @@ -387,9 +387,41 @@ export class ViewDefinition { return ""; } + private getCompositionTypeSql( type: CompositionType ): string { + if ( type === CompositionType.INNER_JOIN ) { + return "INNER JOIN"; + } else if ( type === CompositionType.LEFT_OUTER_JOIN ) { + return "LEFT OUTER JOIN"; + } else if ( type === CompositionType.RIGHT_OUTER_JOIN ) { + return "RIGHT OUTER JOIN"; + } else if ( type === CompositionType.FULL_OUTER_JOIN ) { + return "FULL OUTER JOIN"; + } else if ( type === CompositionType.UNION ) { + return "UNION"; + } + return "INNER JOIN"; + } + + private getCompositionOperatorSql( oper: CompositionOperator ): string { + if (oper === CompositionOperator.EQ) { + return "="; + } else if (oper === CompositionOperator.LT) { + return "<"; + } else if (oper === CompositionOperator.GT) { + return ">"; + } else if (oper === CompositionOperator.LE) { + return "<="; + } else if (oper === CompositionOperator.GE) { + return ">="; + } else if (oper === CompositionOperator.NE) { + return "<>"; + } + return "="; + } + /** * Determine if the current projected columns is '*' - * @return {boolean} 'true' if select all + * @return 'true' if select all */ public isProjectAllColumns(): boolean { return this.getProjectedColumns().length === 1 && this.getProjectedColumns()[0].getName() === "ALL" && this.getProjectedColumns()[0].getType() === "ALL"; @@ -404,7 +436,7 @@ export class ViewDefinition { /** * Get the SQL string for the current projected columns - * @return {string} the projected columns SQL + * @return the projected columns SQL */ private getProjectedColumnsSql(): string { // TODO: This function will need more work as the ViewDefinition is refined (addition of aliases, etc) @@ -452,7 +484,7 @@ export class ViewDefinition { /** * Get the name of the supplied column * @param col the column - * @return {string} the column sql name + * @return the column sql name */ private getSqlColumnName(col: ProjectedColumn): string { if (col && col !== null) { @@ -467,7 +499,7 @@ export class ViewDefinition { /** * Generates the table name for the preview query, given the source path - * @param {string} sourcePath the path for the view source + * @param sourcePath the path for the view source */ private getPreviewTableName( sourcePath: string ): string { let sourceNodeName = "unknownSource"; @@ -482,14 +514,14 @@ export class ViewDefinition { } /** - * @returns {boolean} 'true' if ViewDefinition isSelected + * @returns 'true' if ViewDefinition isSelected */ public get selected(): boolean { return this.isSelected; } /** - * @param {boolean} selected the ViewDefinition isSelected state + * @param selected the ViewDefinition isSelected state */ public setSelected( selected: boolean ): void { this.isSelected = selected; @@ -497,7 +529,7 @@ export class ViewDefinition { /** * Determine if the supplied ViewDefinition is equal to this - * @param {Object} values + * @param values */ public isEqual( otherView: ViewDefinition ): boolean { let equal = false; @@ -552,15 +584,12 @@ export class ViewDefinition { /** * Set all object values using the supplied ViewDefinition json - * @param {Object} values + * @param values */ public setValues(values: object = {}): void { Object.assign(this, values); } - /** - * @returns {{}} a JSON representation of the view definition - */ public toJSON(): {} { return { viewName: this.viewName, @@ -573,7 +602,7 @@ export class ViewDefinition { } /** - * @returns {string} a string representation of the event + * @returns a string representation of the event */ public toString(): string { let text = `viewName: ${this.viewName}, keng__description: ${this.keng__description}, isComplete: ${this.complete}`; diff --git a/ui/src/app/dataservices/shared/view-editor-state.model.spec.ts b/ui/src/app/dataservices/shared/view-editor-state.model.spec.ts index b71fde72..dce25fba 100644 --- a/ui/src/app/dataservices/shared/view-editor-state.model.spec.ts +++ b/ui/src/app/dataservices/shared/view-editor-state.model.spec.ts @@ -1,6 +1,6 @@ -import { ViewEditorState } from "@dataservices/shared/view-editor-state.model"; -import { CompositionType } from "@dataservices/shared/composition-type.enum"; -import { CompositionOperator } from "@dataservices/shared/composition-operator.enum"; +import { ViewEditorState } from "../../dataservices/shared/view-editor-state.model"; +import { CompositionType } from "../../dataservices/shared/composition-type.enum"; +import { CompositionOperator } from "../../dataservices/shared/composition-operator.enum"; describe("ViewEditorState", () => { let viewEditorState: ViewEditorState; diff --git a/ui/src/app/dataservices/shared/view-editor-state.model.ts b/ui/src/app/dataservices/shared/view-editor-state.model.ts index 9123aa0f..8ffae66f 100644 --- a/ui/src/app/dataservices/shared/view-editor-state.model.ts +++ b/ui/src/app/dataservices/shared/view-editor-state.model.ts @@ -15,9 +15,9 @@ * limitations under the License. */ -import { ViewDefinition } from "@dataservices/shared/view-definition.model"; -import { CommandFactory } from "@dataservices/virtualization/view-editor/command/command-factory"; -import { Undoable } from "@dataservices/virtualization/view-editor/command/undo-redo/undoable"; +import { ViewDefinition } from "../../dataservices/shared/view-definition.model"; +import { CommandFactory } from "../../dataservices/virtualization/view-editor/command/command-factory"; +import { Undoable } from "../../dataservices/virtualization/view-editor/command/undo-redo/undoable"; /** * ViewEditorState model @@ -28,8 +28,8 @@ export class ViewEditorState { private viewDefinition: ViewDefinition; /** - * @param {Object} json the JSON representation of a ViewEditorState - * @returns {ViewEditorState} the new ViewEditorState (never null) + * @param json the JSON representation of a ViewEditorState + * @returns the new ViewEditorState (never null) */ public static create( json: object = {} ): ViewEditorState { const editorState = new ViewEditorState(); @@ -57,50 +57,47 @@ export class ViewEditorState { } /** - * @returns {string} the editor state id + * @returns the editor state id */ public getId(): string { return this.id; } /** - * @param {string} id the editor state id + * @param id the editor state id */ public setId( id?: string ): void { this.id = id ? id : null; } /** - * @returns {ViewDefinition} the editor state view definition + * @returns the editor state view definition */ public getViewDefinition(): ViewDefinition { return this.viewDefinition; } /** - * @param {ViewDefinition} viewDefn the editor state view definition + * @param viewDefn the editor state view definition */ public setViewDefinition( viewDefn?: ViewDefinition ): void { this.viewDefinition = viewDefn ? viewDefn : null; } /** - * @returns {Undoable[]} the editor state undoables array + * @returns the editor state undoables array */ public getUndoables(): Undoable[] { return this.undoables; } /** - * @param {Undoable[]} undoables the editor state undoables array + * @param undoables the editor state undoables array */ public setUndoables( undoables: Undoable[] ): void { this.undoables = undoables; } - /** - * @returns {{}} a JSON representation of the ViewEditorState - */ public toJSON(): {} { const undoablesJson = []; this.undoables.forEach( ( undoable ) => undoablesJson.push( undoable.toJSON() ) ); @@ -113,7 +110,7 @@ export class ViewEditorState { } /** - * @returns {string} a string representation of the event + * @returns a string representation of the event */ public toString(): string { const text = `id: ${this.id}`; diff --git a/ui/src/app/dataservices/shared/virt-route.model.ts b/ui/src/app/dataservices/shared/virt-route.model.ts index 9daf0aaf..d7476313 100644 --- a/ui/src/app/dataservices/shared/virt-route.model.ts +++ b/ui/src/app/dataservices/shared/virt-route.model.ts @@ -33,8 +33,8 @@ export class VirtRoute { private secure: boolean; /** - * @param {Object} json the JSON representation of a VirtRoute - * @returns {VirtRoute} the new VirtRoute (never null) + * @param json the JSON representation of a VirtRoute + * @returns the new VirtRoute (never null) */ public static create( json: object = {} ): VirtRoute { const route = new VirtRoute(); @@ -48,49 +48,49 @@ export class VirtRoute { } /** - * @returns {string} the route name (can be null) + * @returns the route name (can be null) */ public getName(): string { return this.name; } /** - * @returns {string} the route protocol (can be null) + * @returns the route protocol (can be null) */ public getProtocol(): string { return this.protocol; } /** - * @returns {string} the route host (can be null) + * @returns the route host (can be null) */ public getHost(): string { return this.host; } /** - * @returns {string} the route port (can be null) + * @returns the route port (can be null) */ public getPort(): string { return this.port; } /** - * @returns {string} the route path (can be null) + * @returns the route path (can be null) */ public getPath(): string { return this.path; } /** - * @returns {string} the route target (can be null) + * @returns the route target (can be null) */ public getTarget(): string { return this.target; } /** - * @returns {boolean} whether the route is secure + * @returns whether the route is secure */ public isSecure(): boolean { return this.secure; @@ -98,7 +98,7 @@ export class VirtRoute { /** * Set all object values using the supplied VirtRoute json - * @param {Object} values + * @param values */ public setValues(values: object = {}): void { Object.assign(this, values); diff --git a/ui/src/app/dataservices/shared/virtualization.model.spec.ts b/ui/src/app/dataservices/shared/virtualization.model.spec.ts index 65570c92..24845b09 100644 --- a/ui/src/app/dataservices/shared/virtualization.model.spec.ts +++ b/ui/src/app/dataservices/shared/virtualization.model.spec.ts @@ -1,5 +1,5 @@ -import { PublishState } from "@dataservices/shared/publish-state.enum"; -import { Virtualization } from "@dataservices/shared/virtualization.model"; +import { PublishState } from "../../dataservices/shared/publish-state.enum"; +import { Virtualization } from "../../dataservices/shared/virtualization.model"; describe("Virtualization", () => { let virtualization: Virtualization; diff --git a/ui/src/app/dataservices/shared/virtualization.model.ts b/ui/src/app/dataservices/shared/virtualization.model.ts index 19036c56..6c7510ad 100644 --- a/ui/src/app/dataservices/shared/virtualization.model.ts +++ b/ui/src/app/dataservices/shared/virtualization.model.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { PublishState } from "@dataservices/shared/publish-state.enum"; -import { VirtRoute } from "@dataservices/shared/virt-route.model"; +import { PublishState } from "../../dataservices/shared/publish-state.enum"; +import { VirtRoute } from "../../dataservices/shared/virt-route.model"; /** * Virtualization model @@ -34,8 +34,8 @@ export class Virtualization { private virtRoutes: Array; /** - * @param {Object} json the JSON representation of a Virtualization - * @returns {Virtualization} the new Virtualization (never null) + * @param json the JSON representation of a Virtualization + * @returns the new Virtualization (never null) */ public static create( json: object = {} ): Virtualization { const virtual = new Virtualization(); @@ -51,56 +51,56 @@ export class Virtualization { } /** - * @returns {string} the virtualization name (can be null) + * @returns the virtualization name (can be null) */ public getVdbName(): string { return this.vdb_name; } /** - * @returns {string} the virtualization build_name (can be null) + * @returns the virtualization build_name (can be null) */ public getBuildName(): string { return this.build_name; } /** - * @returns {string} the virtualization deployment name (can be null) + * @returns the virtualization deployment name (can be null) */ public getDeploymentName(): string { return this.deployment_name; } /** - * @returns {string} the virtualization build status (can be null) + * @returns the virtualization build status (can be null) */ public getBuildStatus(): string { return this.build_status; } /** - * @returns {string} the virtualization build status message (can be null) + * @returns the virtualization build status message (can be null) */ public getBuildStatusMsg(): string { return this.build_status_message; } /** - * @returns {string} the virtualization namespace (can be null) + * @returns the virtualization namespace (can be null) */ public getNamespace(): string { return this.namespace; } /** - * @returns {string} the virtualization last updated date and time (can be null) + * @returns the virtualization last updated date and time (can be null) */ public getLastUpdated(): string { return this.last_updated; } /** - * @returns {PublishState} the published state of this virtualization (derived from build state) + * @returns the published state of this virtualization (derived from build state) */ public getPublishState(): PublishState { return this.publishState; @@ -121,7 +121,7 @@ export class Virtualization { /** * Set all object values using the supplied Virtualization json - * @param {Object} values + * @param values */ public setValues(values: object = {}): void { Object.assign(this, values); diff --git a/ui/src/app/dataservices/sql-control/sql-control.component.spec.ts b/ui/src/app/dataservices/sql-control/sql-control.component.spec.ts index 32ccd4d2..2176ca50 100644 --- a/ui/src/app/dataservices/sql-control/sql-control.component.spec.ts +++ b/ui/src/app/dataservices/sql-control/sql-control.component.spec.ts @@ -2,15 +2,15 @@ import { async, ComponentFixture, TestBed } from "@angular/core/testing"; import { FormsModule } from "@angular/forms"; import { HttpModule } from "@angular/http"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; -import { Dataservice } from "@dataservices/shared/dataservice.model"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { SelectionService } from "@core/selection.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; +import { AppSettingsService } from "../../core/app-settings.service"; +import { LoggerService } from "../../core/logger.service"; +import { MockAppSettingsService } from "../../core/mock-app-settings.service"; +import { Dataservice } from "../../dataservices/shared/dataservice.model"; +import { DataserviceService } from "../../dataservices/shared/dataservice.service"; +import { MockVdbService } from "../../dataservices/shared/mock-vdb.service"; +import { NotifierService } from "../../dataservices/shared/notifier.service"; +import { SelectionService } from "../../core/selection.service"; +import { VdbService } from "../../dataservices/shared/vdb.service"; import { CodemirrorModule } from "ng2-codemirror"; import { ActionModule, @@ -24,8 +24,8 @@ import { WizardModule } from "patternfly-ng"; import { SqlControlComponent } from "./sql-control.component"; -import { SqlView } from "@dataservices/shared/sql-view.model"; -import { MockDataserviceService } from "@dataservices/shared/mock-dataservice.service"; +import { SqlView } from "../../dataservices/shared/sql-view.model"; +import { MockDataserviceService } from "../../dataservices/shared/mock-dataservice.service"; describe("SqlControlComponent", () => { let component: SqlControlComponent; diff --git a/ui/src/app/dataservices/sql-control/sql-control.component.ts b/ui/src/app/dataservices/sql-control/sql-control.component.ts index 3115404e..c5258fbe 100644 --- a/ui/src/app/dataservices/sql-control/sql-control.component.ts +++ b/ui/src/app/dataservices/sql-control/sql-control.component.ts @@ -17,18 +17,18 @@ import { Input, ViewEncapsulation } from "@angular/core"; import { Component, OnInit } from "@angular/core"; -import { LoggerService } from "@core/logger.service"; -import { ColumnData } from "@dataservices/shared/column-data.model"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { QueryResults } from "@dataservices/shared/query-results.model"; -import { RowData } from "@dataservices/shared/row-data.model"; -import { LoadingState } from "@shared/loading-state.enum"; +import { LoggerService } from "../../core/logger.service"; +import { ColumnData } from "../../dataservices/shared/column-data.model"; +import { DataserviceService } from "../../dataservices/shared/dataservice.service"; +import { QueryResults } from "../../dataservices/shared/query-results.model"; +import { RowData } from "../../dataservices/shared/row-data.model"; +import { LoadingState } from "../../shared/loading-state.enum"; import "codemirror/addon/display/placeholder.js"; import "codemirror/addon/selection/active-line.js"; import "codemirror/mode/sql/sql.js"; import { NgxDataTableConfig, TableConfig } from "patternfly-ng"; -import { SqlView } from "@dataservices/shared/sql-view.model"; -import { SelectionService } from "@core/selection.service"; +import { SqlView } from "../../dataservices/shared/sql-view.model"; +import { SelectionService } from "../../core/selection.service"; @Component({ encapsulation: ViewEncapsulation.None, @@ -226,7 +226,7 @@ export class SqlControlComponent implements OnInit { /* * Refresh the Query results - * @param {QueryResults} results the results for a query + * @param results the results for a query */ private refreshData(results: QueryResults): void { this.queryResults = results; diff --git a/ui/src/app/dataservices/test-dataservice/test-dataservice.component.spec.ts b/ui/src/app/dataservices/test-dataservice/test-dataservice.component.spec.ts index 02f4b467..e3ea28ec 100644 --- a/ui/src/app/dataservices/test-dataservice/test-dataservice.component.spec.ts +++ b/ui/src/app/dataservices/test-dataservice/test-dataservice.component.spec.ts @@ -1,17 +1,17 @@ import { async, ComponentFixture, TestBed } from "@angular/core/testing"; import { FormsModule } from "@angular/forms"; 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 { Dataservice } from "@dataservices/shared/dataservice.model"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { MockDataserviceService } from "@dataservices/shared/mock-dataservice.service"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { SqlControlComponent } from "@dataservices/sql-control/sql-control.component"; -import { TestDataserviceComponent } from "@dataservices/test-dataservice/test-dataservice.component"; +import { AppSettingsService } from "../../core/app-settings.service"; +import { CoreModule } from "../../core/core.module"; +import { MockAppSettingsService } from "../../core/mock-app-settings.service"; +import { Dataservice } from "../../dataservices/shared/dataservice.model"; +import { DataserviceService } from "../../dataservices/shared/dataservice.service"; +import { MockDataserviceService } from "../../dataservices/shared/mock-dataservice.service"; +import { MockVdbService } from "../../dataservices/shared/mock-vdb.service"; +import { NotifierService } from "../../dataservices/shared/notifier.service"; +import { VdbService } from "../../dataservices/shared/vdb.service"; +import { SqlControlComponent } from "../../dataservices/sql-control/sql-control.component"; +import { TestDataserviceComponent } from "../../dataservices/test-dataservice/test-dataservice.component"; import { CodemirrorModule } from "ng2-codemirror"; import { ActionModule, @@ -23,7 +23,7 @@ import { SortModule, TableModule, WizardModule } from "patternfly-ng"; -import { SelectionService } from "@core/selection.service"; +import { SelectionService } from "../../core/selection.service"; describe("TestDataserviceComponent", () => { let component: TestDataserviceComponent; diff --git a/ui/src/app/dataservices/test-dataservice/test-dataservice.component.ts b/ui/src/app/dataservices/test-dataservice/test-dataservice.component.ts index 49850121..1a8810ff 100644 --- a/ui/src/app/dataservices/test-dataservice/test-dataservice.component.ts +++ b/ui/src/app/dataservices/test-dataservice/test-dataservice.component.ts @@ -1,13 +1,13 @@ import { Component } from "@angular/core"; import { Router } from "@angular/router"; import { ActivatedRoute } from "@angular/router"; -import { LoggerService } from "@core/logger.service"; -import { Dataservice } from "@dataservices/shared/dataservice.model"; -import { DataservicesConstants } from "@dataservices/shared/dataservices-constants"; -import { AbstractPageComponent } from "@shared/abstract-page.component"; -import { LoadingState } from "@shared/loading-state.enum"; -import { SqlView } from "@dataservices/shared/sql-view.model"; -import { SelectionService } from "@core/selection.service"; +import { LoggerService } from "../../core/logger.service"; +import { Dataservice } from "../../dataservices/shared/dataservice.model"; +import { DataservicesConstants } from "../../dataservices/shared/dataservices-constants"; +import { AbstractPageComponent } from "../../shared/abstract-page.component"; +import { LoadingState } from "../../shared/loading-state.enum"; +import { SqlView } from "../../dataservices/shared/sql-view.model"; +import { SelectionService } from "../../core/selection.service"; @Component({ selector: "app-test-dataservice", @@ -70,7 +70,7 @@ export class TestDataserviceComponent extends AbstractPageComponent { } /** - * @returns {string} the quick look service name + * @returns the quick look service name */ public get quickLookSql(): string { return this.quickLookQueryText; diff --git a/ui/src/app/dataservices/virtualization/view-editor/add-composition-wizard/add-composition-wizard.component.spec.ts b/ui/src/app/dataservices/virtualization/view-editor/add-composition-wizard/add-composition-wizard.component.spec.ts index 4eb3d40f..aa7c3bf6 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/add-composition-wizard/add-composition-wizard.component.spec.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/add-composition-wizard/add-composition-wizard.component.spec.ts @@ -6,17 +6,17 @@ import { TableModule, WizardModule } from "patternfly-ng"; -import { ConnectionTreeSelectorComponent } from "@dataservices/virtualization/view-editor/connection-table-dialog/connection-tree-selector/connection-tree-selector.component"; +import { ConnectionTreeSelectorComponent } from "../../../../dataservices/virtualization/view-editor/connection-table-dialog/connection-tree-selector/connection-tree-selector.component"; import { TreeModule } from "angular-tree-component"; import { FormsModule } from "@angular/forms"; -import { MockConnectionService } from "@connections/shared/mock-connection.service"; -import { ConnectionService } from "@connections/shared/connection.service"; +import { MockConnectionService } from "../../../../connections/shared/mock-connection.service"; +import { ConnectionService } from "../../../../connections/shared/connection.service"; import { HttpModule } from "@angular/http"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; +import { MockVdbService } from "../../../../dataservices/shared/mock-vdb.service"; +import { VdbService } from "../../../../dataservices/shared/vdb.service"; +import { AppSettingsService } from "../../../../core/app-settings.service"; +import { LoggerService } from "../../../../core/logger.service"; +import { NotifierService } from "../../../../dataservices/shared/notifier.service"; describe('AddCompositionWizardComponent', () => { let component: AddCompositionWizardComponent; diff --git a/ui/src/app/dataservices/virtualization/view-editor/add-composition-wizard/add-composition-wizard.component.ts b/ui/src/app/dataservices/virtualization/view-editor/add-composition-wizard/add-composition-wizard.component.ts index 554f19e4..1bb67907 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/add-composition-wizard/add-composition-wizard.component.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/add-composition-wizard/add-composition-wizard.component.ts @@ -7,20 +7,20 @@ import { WizardEvent, WizardStepConfig } from "patternfly-ng"; -import { LoggerService } from "@core/logger.service"; -import { Composition } from "@dataservices/shared/composition.model"; -import { SchemaNode } from "@connections/shared/schema-node.model"; -import { LoadingState } from "@shared/loading-state.enum"; -import { ConnectionsConstants } from "@connections/shared/connections-constants"; -import { ConnectionService } from "@connections/shared/connection.service"; -import { ConnectionTreeSelectorComponent } from "@dataservices/virtualization/view-editor/connection-table-dialog/connection-tree-selector/connection-tree-selector.component"; -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; -import { Column } from "@dataservices/shared/column.model"; -import { CompositionType } from "@dataservices/shared/composition-type.enum"; -import { CompositionOperator } from "@dataservices/shared/composition-operator.enum"; -import { PathUtils } from "@dataservices/shared/path-utils"; -import { Command } from "@dataservices/virtualization/view-editor/command/command"; -import { ViewEditorService } from "@dataservices/virtualization/view-editor/view-editor.service"; +import { LoggerService } from "../../../../core/logger.service"; +import { Composition } from "../../../../dataservices/shared/composition.model"; +import { SchemaNode } from "../../../../connections/shared/schema-node.model"; +import { LoadingState } from "../../../../shared/loading-state.enum"; +import { ConnectionsConstants } from "../../../../connections/shared/connections-constants"; +import { ConnectionService } from "../../../../connections/shared/connection.service"; +import { ConnectionTreeSelectorComponent } from "../../../../dataservices/virtualization/view-editor/connection-table-dialog/connection-tree-selector/connection-tree-selector.component"; +import { ViewEditorI18n } from "../../../../dataservices/virtualization/view-editor/view-editor-i18n"; +import { Column } from "../../../../dataservices/shared/column.model"; +import { CompositionType } from "../../../../dataservices/shared/composition-type.enum"; +import { CompositionOperator } from "../../../../dataservices/shared/composition-operator.enum"; +import { PathUtils } from "../../../../dataservices/shared/path-utils"; +import { Command } from "../../../../dataservices/virtualization/view-editor/command/command"; +import { ViewEditorService } from "../../../../dataservices/virtualization/view-editor/view-editor.service"; enum CompositeSide { LEFT = 0, @@ -222,8 +222,8 @@ export class AddCompositionWizardComponent implements OnInit { /** * Load the columns for the specified CompositeSide - * @param {CompositeSide} side the side (left or right) - * @param {boolean} initSelected if 'true' will attempt init the column selections + * @param side the side (left or right) + * @param initSelected if 'true' will attempt init the column selections */ private loadColumns(side: CompositeSide, initSelected = false): void { const fullPath = this.getSourcePath(side); @@ -264,8 +264,8 @@ export class AddCompositionWizardComponent implements OnInit { /** * Get the path for the specified source - * @param {CompositeSide} side the side (left or right) - * @return {string} the source path + * @param side the side (left or right) + * @return the source path */ private getSourcePath( side: CompositeSide ): string { if ( side === CompositeSide.LEFT ) { @@ -276,8 +276,8 @@ export class AddCompositionWizardComponent implements OnInit { /** * Set the specified columns loading state for the side - * @param {CompositeSide} side the side (left or right) - * @param {LoadingState} state the loading state + * @param side the side (left or right) + * @param state the loading state */ private setColumnLoadingState( side: CompositeSide, state: LoadingState): void { if ( side === CompositeSide.LEFT ) { @@ -289,8 +289,8 @@ export class AddCompositionWizardComponent implements OnInit { /** * Set the specified columns for the side - * @param {CompositeSide} side the side (left or right) - * @param {Column[]} cols the array of Columns + * @param side the side (left or right) + * @param cols the array of Columns */ private setColumns( side: CompositeSide, cols: Column[] ): void { if ( !cols ) cols = []; @@ -303,7 +303,7 @@ export class AddCompositionWizardComponent implements OnInit { /** * Get a title for the Left Composition table - * @returns {string} the left title + * @returns the left title */ public get leftCompositionTableTitle(): string { return this.generateTableTitle(CompositeSide.LEFT); @@ -311,7 +311,7 @@ export class AddCompositionWizardComponent implements OnInit { /** * Get a title for the Right Composition table - * @returns {string} the right title + * @returns the right title */ public get rightCompositionTableTitle(): string { return this.generateTableTitle(CompositeSide.RIGHT); @@ -319,8 +319,8 @@ export class AddCompositionWizardComponent implements OnInit { /** * Generate a table title for the specified side of the composite - * @param {CompositeSide} side the side (left or right) - * @return {string} the title + * @param side the side (left or right) + * @return the title */ private generateTableTitle(side: CompositeSide): string { let title = ""; @@ -410,7 +410,6 @@ export class AddCompositionWizardComponent implements OnInit { /** * Determine if schema node tree is loading - * @returns {boolean} */ public get treeLoading( ): boolean { return ( this.compositionTablesLoadingState === LoadingState.LOADING ); @@ -418,7 +417,6 @@ export class AddCompositionWizardComponent implements OnInit { /** * Determine if schema node tree loading completed, and was successful - * @returns {boolean} */ public get treeLoadedSuccess( ): boolean { return ( this.compositionTablesLoadingState === LoadingState.LOADED_VALID ); @@ -426,7 +424,6 @@ export class AddCompositionWizardComponent implements OnInit { /** * Determine if schema node tree loading completed, but failed - * @returns {boolean} */ public get treeLoadedFailed( ): boolean { return ( this.compositionTablesLoadingState === LoadingState.LOADED_INVALID ); @@ -434,7 +431,6 @@ export class AddCompositionWizardComponent implements OnInit { /** * Determine if left columns are loading - * @returns {boolean} */ public get lhColumnsLoading( ): boolean { return ( this.compositionLHColumnsLoadingState === LoadingState.LOADING ); @@ -442,7 +438,6 @@ export class AddCompositionWizardComponent implements OnInit { /** * Determine if left columns loading completed, and was successful - * @returns {boolean} */ public get lhColumnsLoadedSuccess( ): boolean { return ( this.compositionLHColumnsLoadingState === LoadingState.LOADED_VALID ); @@ -450,7 +445,6 @@ export class AddCompositionWizardComponent implements OnInit { /** * Determine if left columns loading completed, but failed - * @returns {boolean} */ public get lhColumnsLoadedFailed( ): boolean { return ( this.compositionLHColumnsLoadingState === LoadingState.LOADED_INVALID ); @@ -458,7 +452,6 @@ export class AddCompositionWizardComponent implements OnInit { /** * Determine if right columns are loading - * @returns {boolean} */ public get rhColumnsLoading( ): boolean { return ( this.compositionRHColumnsLoadingState === LoadingState.LOADING ); @@ -466,7 +459,6 @@ export class AddCompositionWizardComponent implements OnInit { /** * Determine if right columns loading completed, and was successful - * @returns {boolean} */ public get rhColumnsLoadedSuccess( ): boolean { return ( this.compositionRHColumnsLoadingState === LoadingState.LOADED_VALID ); @@ -474,7 +466,6 @@ export class AddCompositionWizardComponent implements OnInit { /** * Determine if right columns loading completed, but failed - * @returns {boolean} */ public get rhColumnsLoadedFailed( ): boolean { return ( this.compositionRHColumnsLoadingState === LoadingState.LOADED_INVALID ); @@ -532,7 +523,7 @@ export class AddCompositionWizardComponent implements OnInit { /** * Handles tree node selection - * @param {SchemaNode} $event + * @param $event */ public onTreeNodeSelected( $event: SchemaNode ): void { const selectedNode = $event; @@ -552,7 +543,7 @@ export class AddCompositionWizardComponent implements OnInit { /** * Handles tree node de-selection - * @param {SchemaNode} $event + * @param $event */ public onTreeNodeDeselected( $event: SchemaNode ): void { this.selectedTreeNodePath = null; @@ -644,7 +635,7 @@ export class AddCompositionWizardComponent implements OnInit { /** * Generate the composition name using the left and right node names - * @return {string} the composition name + * @return the composition name */ private generateCompositionName(): string { const leftPath = this.composition.getLeftSourcePath(); diff --git a/ui/src/app/dataservices/virtualization/view-editor/command/add-composition-command.ts b/ui/src/app/dataservices/virtualization/view-editor/command/add-composition-command.ts index 1ace8a52..131a8e7d 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/command/add-composition-command.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/command/add-composition-command.ts @@ -15,24 +15,20 @@ * limitations under the License. */ -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; -import { Command } from "@dataservices/virtualization/view-editor/command/command"; -import { Composition } from "@dataservices/shared/composition.model"; -import { CommandType } from "@dataservices/virtualization/view-editor/command/command-type.enum"; +import { ViewEditorI18n } from "../../../../dataservices/virtualization/view-editor/view-editor-i18n"; +import { Command } from "../../../../dataservices/virtualization/view-editor/command/command"; +import { Composition } from "../../../../dataservices/shared/composition.model"; +import { CommandType } from "../../../../dataservices/virtualization/view-editor/command/command-type.enum"; export class AddCompositionCommand extends Command { /** * The command identifier. - * - * @type {string} */ public static readonly id = CommandType.ADD_COMPOSITION_COMMAND; /** * The name of the command argument whose value is the stringified composition - * - * @type {string} */ public static readonly addedComposition = "addedComposition"; @@ -40,9 +36,9 @@ export class AddCompositionCommand extends Command { * Constructor * 'addedComposition' must be Composition object -OR- stringified composition * - * @param {string | Composition} addedComposition the Composition object, or the stringified composition being + * @param addedComposition the Composition object, or the stringified composition being * added (cannot be `null` or empty) - * @param {string} id the command id. If not supplied, an id is generated. + * @param id the command id. If not supplied, an id is generated. */ public constructor( addedComposition: string | Composition, id?: string ) { super( AddCompositionCommand.id, ViewEditorI18n.addCompositionCommandName ); @@ -67,25 +63,16 @@ export class AddCompositionCommand extends Command { this._args.set( Command.identArg, id); } - /** - * @returns {string} the composition name - */ public getComposition(): Composition { const compStr = this.getArg( AddCompositionCommand.addedComposition ) as string; const comp = Composition.create(JSON.parse(compStr)); return comp; } - /** - * @returns {string} json payload for this command - */ public getPayload( ): string { return this.getArg( AddCompositionCommand.addedComposition ) as string; } - /** - * @returns {string} a unique short identifier of this command - */ public getId( ): string { return this.getArg( Command.identArg ) as string; } diff --git a/ui/src/app/dataservices/virtualization/view-editor/command/add-sources-command.ts b/ui/src/app/dataservices/virtualization/view-editor/command/add-sources-command.ts index de69f13b..c03713ec 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/command/add-sources-command.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/command/add-sources-command.ts @@ -15,24 +15,20 @@ * limitations under the License. */ -import { SchemaNode } from "@connections/shared/schema-node.model"; -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; -import { Command } from "@dataservices/virtualization/view-editor/command/command"; -import { CommandType } from "@dataservices/virtualization/view-editor/command/command-type.enum"; +import { SchemaNode } from "../../../../connections/shared/schema-node.model"; +import { ViewEditorI18n } from "../../../../dataservices/virtualization/view-editor/view-editor-i18n"; +import { Command } from "../../../../dataservices/virtualization/view-editor/command/command"; +import { CommandType } from "../../../../dataservices/virtualization/view-editor/command/command-type.enum"; export class AddSourcesCommand extends Command { /** * The command identifier. - * - * @type {string} */ public static readonly id = CommandType.ADD_SOURCES_COMMAND; /** * The name of the command argument whose value is the paths of the sources being added. - * - * @type {string} */ public static readonly addedSourcePaths = "addedSourcePaths"; @@ -43,9 +39,9 @@ export class AddSourcesCommand extends Command { * 'addedSources' must be an array of SchemaNodes -OR- * string of the source paths (comma delimited) - path form: "connection=aConn/schema=aSchema/table=aTable" * - * @param {string | SchemaNode} addedSources the string representation of the sources or the schema nodes of the sources + * @param addedSources the string representation of the sources or the schema nodes of the sources * being added (cannot be `null` or empty) - * @param {string} id the command id. If not supplied, an id is generated. + * @param id the command id. If not supplied, an id is generated. */ public constructor( addedSources: string | SchemaNode[], id?: string ) { super( AddSourcesCommand.id, ViewEditorI18n.addSourcesCommandName ); @@ -83,26 +79,17 @@ export class AddSourcesCommand extends Command { this._args.set( Command.identArg, id); } - /** - * @returns {string[]} an array of the paths of the sources being added - */ public getSourcePaths(): string[] { const argValue = this.getArg( AddSourcesCommand.addedSourcePaths ) as string; return argValue.split( AddSourcesCommand.delim ); } - /** - * @returns {string} the json payload for this command - */ public getPayload(sourcePath?: string): string { if (sourcePath) return sourcePath; return this.getArg( Command.identArg ) as string; } - /** - * @returns {string} a unique short identifier of this command - */ public getId( ): string { return this.getArg( Command.identArg ) as string; } diff --git a/ui/src/app/dataservices/virtualization/view-editor/command/command-factory.spec.ts b/ui/src/app/dataservices/virtualization/view-editor/command/command-factory.spec.ts index b24239fb..341795af 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/command/command-factory.spec.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/command/command-factory.spec.ts @@ -1,10 +1,10 @@ -import { SchemaNode } from "@connections/shared/schema-node.model"; -import { CommandFactory } from "@dataservices/virtualization/view-editor/command/command-factory"; -import { AddSourcesCommand } from "@dataservices/virtualization/view-editor/command/add-sources-command"; -import { RemoveSourcesCommand } from "@dataservices/virtualization/view-editor/command/remove-sources-command"; -import { NoOpCommand } from "@dataservices/virtualization/view-editor/command/no-op-command"; -import { UpdateViewNameCommand } from "@dataservices/virtualization/view-editor/command/update-view-name-command"; -import { UpdateViewDescriptionCommand } from "@dataservices/virtualization/view-editor/command/update-view-description-command"; +import { SchemaNode } from "../../../../connections/shared/schema-node.model"; +import { CommandFactory } from "../../../../dataservices/virtualization/view-editor/command/command-factory"; +import { AddSourcesCommand } from "../../../../dataservices/virtualization/view-editor/command/add-sources-command"; +import { RemoveSourcesCommand } from "../../../../dataservices/virtualization/view-editor/command/remove-sources-command"; +import { NoOpCommand } from "../../../../dataservices/virtualization/view-editor/command/no-op-command"; +import { UpdateViewNameCommand } from "../../../../dataservices/virtualization/view-editor/command/update-view-name-command"; +import { UpdateViewDescriptionCommand } from "../../../../dataservices/virtualization/view-editor/command/update-view-description-command"; describe( "Command Factory Tests", () => { diff --git a/ui/src/app/dataservices/virtualization/view-editor/command/command-factory.ts b/ui/src/app/dataservices/virtualization/view-editor/command/command-factory.ts index 7f07dc07..68fc21c4 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/command/command-factory.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/command/command-factory.ts @@ -15,24 +15,24 @@ * limitations under the License. */ -import { Command } from "@dataservices/virtualization/view-editor/command/command"; -import { AddCompositionCommand } from "@dataservices/virtualization/view-editor/command/add-composition-command"; -import { AddSourcesCommand } from "@dataservices/virtualization/view-editor/command/add-sources-command"; -import { UpdateViewDescriptionCommand } from "@dataservices/virtualization/view-editor/command/update-view-description-command"; -import { UpdateViewNameCommand } from "@dataservices/virtualization/view-editor/command/update-view-name-command"; -import { RemoveSourcesCommand } from "@dataservices/virtualization/view-editor/command/remove-sources-command"; -import { SchemaNode } from "@connections/shared/schema-node.model"; -import { NoOpCommand } from "@dataservices/virtualization/view-editor/command/no-op-command"; -import { Undoable } from "@dataservices/virtualization/view-editor/command/undo-redo/undoable"; -import { Composition } from "@dataservices/shared/composition.model"; -import { RemoveCompositionCommand } from "@dataservices/virtualization/view-editor/command/remove-composition-command"; -import { UpdateProjectedColumnsCommand } from "@dataservices/virtualization/view-editor/command/update-projected-columns-command"; +import { Command } from "../../../../dataservices/virtualization/view-editor/command/command"; +import { AddCompositionCommand } from "../../../../dataservices/virtualization/view-editor/command/add-composition-command"; +import { AddSourcesCommand } from "../../../../dataservices/virtualization/view-editor/command/add-sources-command"; +import { UpdateViewDescriptionCommand } from "../../../../dataservices/virtualization/view-editor/command/update-view-description-command"; +import { UpdateViewNameCommand } from "../../../../dataservices/virtualization/view-editor/command/update-view-name-command"; +import { RemoveSourcesCommand } from "../../../../dataservices/virtualization/view-editor/command/remove-sources-command"; +import { SchemaNode } from "../../../../connections/shared/schema-node.model"; +import { NoOpCommand } from "../../../../dataservices/virtualization/view-editor/command/no-op-command"; +import { Undoable } from "../../../../dataservices/virtualization/view-editor/command/undo-redo/undoable"; +import { Composition } from "../../../../dataservices/shared/composition.model"; +import { RemoveCompositionCommand } from "../../../../dataservices/virtualization/view-editor/command/remove-composition-command"; +import { UpdateProjectedColumnsCommand } from "../../../../dataservices/virtualization/view-editor/command/update-projected-columns-command"; export class CommandFactory { /** - * @param {string | SchemaNode[]} addedSources the JSON representation of or the schema nodes of the sources being added - * @returns {Command} the add sources command or a no op command if sources are empty + * @param addedSources the JSON representation of or the schema nodes of the sources being added + * @returns the add sources command or a no op command if sources are empty */ public static createAddSourcesCommand( addedSources: string | SchemaNode[], id?: string ): Command { if ( !addedSources || addedSources.length === 0 ) { @@ -43,8 +43,7 @@ export class CommandFactory { } /** - * @param {string | Composition} addedSources the JSON representation of or the composition being added - * @returns {Command} the add composition command or a no op command if composition is null + * @param addedSources the JSON representation of or the composition being added */ public static createAddCompositionCommand( addedComposition: string | Composition, id?: string ): Command { if ( !addedComposition || addedComposition === null ) { @@ -54,16 +53,12 @@ export class CommandFactory { return new AddCompositionCommand( addedComposition, id ); } - /** - * @returns {Command} a no op command (never `null`) - */ public static createNoOpCommand(): Command { return NoOpCommand.NO_OP; } /** - * @param {string | SchemaNode[]} removedSources the JSON representation of or the schema nodes of the sources being removed - * @returns {Command} the remove sources command or a no op command if sources are `undefined` or `null` + * @param removedSources the JSON representation of or the schema nodes of the sources being removed */ public static createRemoveSourcesCommand( removedSources: string | SchemaNode[], id: string ): Command { if ( !removedSources || removedSources.length === 0 ) { @@ -74,8 +69,7 @@ export class CommandFactory { } /** - * @param {string | SchemaNode[]} removedSources the JSON representation of or the schema nodes of the sources being removed - * @returns {Command} the remove sources command or a no op command if sources are `undefined` or `null` + * @param removedSources the JSON representation of or the schema nodes of the sources being removed */ public static createRemoveCompositionCommand( removedComposition: string | Composition, id: string ): Command { if ( !removedComposition || removedComposition === null ) { @@ -87,8 +81,7 @@ export class CommandFactory { /** * - * @param {Command} cmd the command whose undoable is being requested - * @returns {Undoable | Error} the undoable or an error if an undoable cannot be created + * @param cmd the command whose undoable is being requested */ public static createUndoable( cmd: Command ): Undoable | Error { if ( cmd.isUndoable() ) { @@ -105,8 +98,7 @@ export class CommandFactory { } /** - * @param {Command} cmd the command whose undo command is being requested - * @returns {Command | Error} the undo command or an error if an undo command cannot be created + * @param cmd the command whose undo command is being requested */ public static createUndoCommand( cmd: Command ): Command | Error { switch ( cmd.id ) { @@ -147,9 +139,8 @@ export class CommandFactory { } /** - * @param {string} newDescription the new view description (can be `null` or empty if old description has a value) - * @param {string} oldDescription the view description being replaced (can be `null` or empty if new description has a value) - * @returns {Command | Error} the update view description command or an error if both the new an old description is missing + * @param newDescription the new view description (can be `null` or empty if old description has a value) + * @param oldDescription the view description being replaced (can be `null` or empty if new description has a value) */ public static createUpdateViewDescriptionCommand( newDescription: string, oldDescription: string ): Command | Error { @@ -165,9 +156,8 @@ export class CommandFactory { } /** - * @param {string} newName the new view name (can be `null` or empty if the old name has a value) - * @param {string} oldName the view name being replaced (can be `null` or empty if the new name has a value) - * @returns {Command | Error} the update view name command or an error if both the new and old name is missing + * @param newName the new view name (can be `null` or empty if the old name has a value) + * @param oldName the view name being replaced (can be `null` or empty if the new name has a value) */ public static createUpdateViewNameCommand( newName: string, oldName: string ): Command | Error { @@ -183,9 +173,9 @@ export class CommandFactory { } /** - * @param {string | ProjectedColumns} newProjColumns the stringified representation of or the new projected columns - * @param {string | ProjectedColumns} oldProjColumns the stringified representation of or the old projected columns - * @returns {Command} the update projected columns command or a no op command if args are not supplied + * @param newProjColumns the stringified representation of or the new projected columns + * @param oldProjColumns the stringified representation of or the old projected columns + * @returns the update projected columns command or a no op command if args are not supplied */ public static createUpdateProjectedColumnsCommand( newProjColumns: string, oldProjColumns: string ): Command { @@ -199,8 +189,8 @@ export class CommandFactory { /** * Constructs a command object from JSON. * - * @param {object} json the JSON being converted to a command - * @returns {Command | Error} the decoded command or an error if one could not be constructed + * @param json the JSON being converted to a command + * @returns the decoded command or an error if one could not be constructed */ public static decode( json: object = {} ): Command | Error { const cmdId = json[ Command.idPropJson ]; @@ -282,8 +272,7 @@ export class CommandFactory { } /** - * @param {Object} json the JSON representation of a Undoable - * @returns {Undoable | Error} the new Undoable or an error if the undoable could not be created + * @param json the JSON representation of a Undoable */ public static decodeUndoable( json: object = {} ): Undoable | Error { let undo: Command = null; diff --git a/ui/src/app/dataservices/virtualization/view-editor/command/command.ts b/ui/src/app/dataservices/virtualization/view-editor/command/command.ts index dac0c431..6e91b2ae 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/command/command.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/command/command.ts @@ -19,14 +19,12 @@ export abstract class Command { /** * The name of the JSON key used to store the arguments. - * @type {string} */ public static readonly argsPropJson = "args"; /** * The name of the JSON key used to store the command identifier. * - * @type {string} */ public static readonly idPropJson = "id"; @@ -50,9 +48,6 @@ export abstract class Command { this._name = name; } - /** - * @returns {Map} a copy of the arguments to the command (never `null` but can be empty) - */ public get args(): Map< string, any > { const copy = new Map< string, any >(); @@ -76,24 +71,19 @@ export abstract class Command { } /** - * @param {string} argName the name of the arg whose value is being requested - * @returns {any} the arg value or `undefined` if not found + * @param argName the name of the arg whose value is being requested */ public getArg( argName: string ): any { return this._args.get( argName ); } - /** - * @returns {string} the unique identifier of the command (never `null` or empty) - */ public get id(): string { return this._id; } // noinspection JSMethodCanBeStatic /** - * @param {string} argName the name of the argument being checked - * @returns {boolean} `true` if the argument should not be serialized + * @param argName the name of the argument being checked */ protected isTransient( argName: string ): boolean { return false; @@ -101,30 +91,19 @@ export abstract class Command { /** * Subclasses need to override if they do not have an associated undo command. - * - * @returns {boolean} `true` if the command is undoable */ public isUndoable(): boolean { return true; } - /** - * @returns {string} a short name of the command (never `null` or empty) - */ public get name(): string { return this._name; } - /** - * @returns {string} a unique 9 digit number preceeded with an underscore '_' - */ public get idGen(): string { return '_' + Math.random().toString(36).substr(2, 9); } - /** - * @returns {{}} a JSON representation of the command - */ public toJSON(): {} { return { id: this.id, @@ -132,9 +111,6 @@ export abstract class Command { }; } - /** - * @returns {string} a string representation of the command - */ public toString(): string { let text = `${this.id}`; let firstTime = true; diff --git a/ui/src/app/dataservices/virtualization/view-editor/command/no-op-command.ts b/ui/src/app/dataservices/virtualization/view-editor/command/no-op-command.ts index b542dccf..5e99b2c7 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/command/no-op-command.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/command/no-op-command.ts @@ -14,23 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { Command } from "@dataservices/virtualization/view-editor/command/command"; -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; -import { CommandType } from "@dataservices/virtualization/view-editor/command/command-type.enum"; +import { Command } from "../../../../dataservices/virtualization/view-editor/command/command"; +import { ViewEditorI18n } from "../../../../dataservices/virtualization/view-editor/view-editor-i18n"; +import { CommandType } from "../../../../dataservices/virtualization/view-editor/command/command-type.enum"; export class NoOpCommand extends Command { /** * The command identifier. - * - * @type {string} */ public static readonly id = CommandType.NO_OP_COMMAND; /** * The shared instance of the no op command. - * - * @type {NoOpCommand} */ public static readonly NO_OP = new NoOpCommand(); @@ -40,8 +36,6 @@ export class NoOpCommand extends Command { /** * Overridden to ensure an empty map is always returned. - * - * @returns {Map} an empty map */ public get args(): Map< string, any > { return new Map< string, any >(); @@ -50,15 +44,14 @@ export class NoOpCommand extends Command { /** * Overridden to ensure `undefined` is always returned. * - * @param {string} argName the name of the arg being requested - * @returns {string} undefined always + * @param argName the name of the arg being requested */ public getArg( argName: string ): any { return undefined; } /** - * @returns {boolean} `false` + * @returns `false` */ public isUndoable(): boolean { return false; diff --git a/ui/src/app/dataservices/virtualization/view-editor/command/remove-composition-command.ts b/ui/src/app/dataservices/virtualization/view-editor/command/remove-composition-command.ts index 334b0ee3..f67026a3 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/command/remove-composition-command.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/command/remove-composition-command.ts @@ -15,24 +15,20 @@ * limitations under the License. */ -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; -import { Command } from "@dataservices/virtualization/view-editor/command/command"; -import { Composition } from "@dataservices/shared/composition.model"; -import { CommandType } from "@dataservices/virtualization/view-editor/command/command-type.enum"; +import { ViewEditorI18n } from "../../../../dataservices/virtualization/view-editor/view-editor-i18n"; +import { Command } from "../../../../dataservices/virtualization/view-editor/command/command"; +import { Composition } from "../../../../dataservices/shared/composition.model"; +import { CommandType } from "../../../../dataservices/virtualization/view-editor/command/command-type.enum"; export class RemoveCompositionCommand extends Command { /** * The command identifier. - * - * @type {string} */ public static readonly id = CommandType.REMOVE_COMPOSITION_COMMAND; /** * The name of the command argument whose value is the compositions being removed. - * - * @type {string} */ public static readonly removedComposition = "removedComposition"; @@ -40,9 +36,9 @@ export class RemoveCompositionCommand extends Command { * Constructor * 'removedCompositionName' must be an array of Compositions -OR- stringified composition * - * @param {string | Composition} removedComposition the Composition object, or the stringified composition being + * @param removedComposition the Composition object, or the stringified composition being * removed (cannot be `null` or empty) - * @param {string} id the command id. If not supplied, an id is generated. + * @param id the command id. If not supplied, an id is generated. */ public constructor( removedComposition: string | Composition, id: string ) { super( RemoveCompositionCommand.id, ViewEditorI18n.removeCompositionCommandName ); @@ -60,7 +56,7 @@ export class RemoveCompositionCommand extends Command { } /** - * @returns {string} the composition + * @returns the composition */ public getComposition(): Composition { const compStr = this.getArg( RemoveCompositionCommand.removedComposition ) as string; @@ -68,15 +64,15 @@ export class RemoveCompositionCommand extends Command { } /** - * @param {Composition} composition the Composition to use in generating the id - * @returns {string} the json payload for this command + * @param composition the Composition to use in generating the id + * @returns the json payload for this command */ public getPayload(composition?: Composition): string { return JSON.stringify(composition); } /** - * @returns {string} a unique short identifier of this command + * @returns a unique short identifier of this command */ public getId( ): string { return this.getArg( Command.identArg ) as string; diff --git a/ui/src/app/dataservices/virtualization/view-editor/command/remove-sources-command.ts b/ui/src/app/dataservices/virtualization/view-editor/command/remove-sources-command.ts index c99d8b73..472bd512 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/command/remove-sources-command.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/command/remove-sources-command.ts @@ -15,24 +15,20 @@ * limitations under the License. */ -import { SchemaNode } from "@connections/shared/schema-node.model"; -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; -import { Command } from "@dataservices/virtualization/view-editor/command/command"; -import { CommandType } from "@dataservices/virtualization/view-editor/command/command-type.enum"; +import { SchemaNode } from "../../../../connections/shared/schema-node.model"; +import { ViewEditorI18n } from "../../../../dataservices/virtualization/view-editor/view-editor-i18n"; +import { Command } from "../../../../dataservices/virtualization/view-editor/command/command"; +import { CommandType } from "../../../../dataservices/virtualization/view-editor/command/command-type.enum"; export class RemoveSourcesCommand extends Command { /** * The command identifier. - * - * @type {string} */ public static readonly id = CommandType.REMOVE_SOURCES_COMMAND; /** * The name of the command argument whose value is the paths of the sources being removed. - * - * @type {string} */ public static readonly removedSourcePaths = "removedSourcePaths"; @@ -43,9 +39,9 @@ export class RemoveSourcesCommand extends Command { * 'removedSources' must be an array of SchemaNodes -OR- * string of the source paths (comma delimited) - path form: "connection=aConn/schema=aSchema/table=aTable" * - * @param {string | SchemaNode} removedSources the string representation of the sources or the schema nodes of the sources + * @param removedSources the string representation of the sources or the schema nodes of the sources * being removed (cannot be `null` or empty) - * @param {string} id the command id (cannot be 'null' or empty) + * @param id the command id (cannot be 'null' or empty) */ public constructor( removedSources: string | SchemaNode[], id: string ) { super( RemoveSourcesCommand.id, ViewEditorI18n.removeSourcesCommandName ); @@ -76,7 +72,7 @@ export class RemoveSourcesCommand extends Command { } /** - * @returns {string[]} an array of the paths of the sources being added + * @returns an array of the paths of the sources being added */ public getSourcePaths(): string[] { const argValue = this.getArg( RemoveSourcesCommand.removedSourcePaths ) as string; @@ -84,7 +80,7 @@ export class RemoveSourcesCommand extends Command { } /** - * @returns {string} the json payload for this command + * @returns the json payload for this command */ public getPayload(sourcePath?: string): string { if (sourcePath) @@ -93,7 +89,7 @@ export class RemoveSourcesCommand extends Command { } /** - * @returns {string} a unique identifier of this command + * @returns a unique identifier of this command */ public getId( ): string { return this.getArg( Command.identArg ) as string; diff --git a/ui/src/app/dataservices/virtualization/view-editor/command/undo-redo/undo-manager.spec.ts b/ui/src/app/dataservices/virtualization/view-editor/command/undo-redo/undo-manager.spec.ts index a0d8b452..60265616 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/command/undo-redo/undo-manager.spec.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/command/undo-redo/undo-manager.spec.ts @@ -1,8 +1,8 @@ -import { UndoManager } from "@dataservices/virtualization/view-editor/command/undo-redo/undo-manager"; -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; -import { CommandFactory } from "@dataservices/virtualization/view-editor/command/command-factory"; -import { Command } from "@dataservices/virtualization/view-editor/command/command"; -import { Undoable } from "@dataservices/virtualization/view-editor/command/undo-redo/undoable"; +import { UndoManager } from "../../../../../dataservices/virtualization/view-editor/command/undo-redo/undo-manager"; +import { ViewEditorI18n } from "../../../../../dataservices/virtualization/view-editor/view-editor-i18n"; +import { CommandFactory } from "../../../../../dataservices/virtualization/view-editor/command/command-factory"; +import { Command } from "../../../../../dataservices/virtualization/view-editor/command/command"; +import { Undoable } from "../../../../../dataservices/virtualization/view-editor/command/undo-redo/undoable"; describe( "UndoManager Tests", () => { diff --git a/ui/src/app/dataservices/virtualization/view-editor/command/undo-redo/undo-manager.ts b/ui/src/app/dataservices/virtualization/view-editor/command/undo-redo/undo-manager.ts index 2b10ca1d..2d58eabf 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/command/undo-redo/undo-manager.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/command/undo-redo/undo-manager.ts @@ -14,17 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { UndoNode } from "@dataservices/virtualization/view-editor/command/undo-redo/undo-node"; -import { Undoable } from "@dataservices/virtualization/view-editor/command/undo-redo/undoable"; -import { Command } from "@dataservices/virtualization/view-editor/command/command"; -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; +import { UndoNode } from "../../../../../dataservices/virtualization/view-editor/command/undo-redo/undo-node"; +import { Undoable } from "../../../../../dataservices/virtualization/view-editor/command/undo-redo/undoable"; +import { Command } from "../../../../../dataservices/virtualization/view-editor/command/command"; +import { ViewEditorI18n } from "../../../../../dataservices/virtualization/view-editor/view-editor-i18n"; export class UndoManager { /** * The name of the JSON property whose value is the array of {@link Undoable}s. - * - * @type {string} */ public static readonly undoables = "undoables"; @@ -37,7 +35,7 @@ export class UndoManager { } /** - * @param {Undoable} undoable the undoable being added (cannot be `null`) + * @param undoable the undoable being added (cannot be `null`) */ public add( undoable: Undoable ): void { const node = new UndoNode( undoable ); @@ -54,14 +52,14 @@ export class UndoManager { } /** - * @returns {boolean} `true` if there is a redo command can be executed + * @returns `true` if there is a redo command can be executed */ public canRedo(): boolean { return this.currentIndex.right !== null; } /** - * @returns {boolean} `true` if there is an undo command can be executed + * @returns `true` if there is an undo command can be executed */ public canUndo(): boolean { return this.currentIndex !== this.rootNode; @@ -87,7 +85,7 @@ export class UndoManager { * Calling this method does not affect the undo manager command stack. If the redo method will be executed call * the `popRedoCommand` method instead. * - * @returns {Command} the current redo command to execute (never `null`) + * @returns the current redo command to execute (never `null`) * @throws {RangeError} if there is not an available redo command */ public peekRedoCommand(): Command { @@ -102,7 +100,7 @@ export class UndoManager { * Calling this method does not affect the undo manager command stack. If the undo method will be executed call * the `popUndoCommand` method instead. * - * @returns {Command} the available undo command + * @returns the available undo command * @throws {RangeError} if there is not an undo command */ public peekUndoCommand(): Command { @@ -116,7 +114,7 @@ export class UndoManager { /** * Removes the current redo command from the redo command stack. * - * @returns {Command} the current redo command to execute (never `null`) + * @returns the current redo command to execute (never `null`) * @throws {RangeError} if there is not an available redo command */ public popRedoCommand(): Command { @@ -131,7 +129,7 @@ export class UndoManager { /** * Removes the current undo command from the undo command stack. * - * @returns {Command} the current undo command to execute (never `null`) + * @returns the current undo command to execute (never `null`) * @throws {RangeError} if there is not an undo command */ public popUndoCommand(): Command { @@ -145,7 +143,7 @@ export class UndoManager { } /** - * @returns {string} a short description, suitable for use in tooltips, of the next available redo command + * @returns a short description, suitable for use in tooltips, of the next available redo command */ public redoLabel(): string { let label = ViewEditorI18n.redoActionTooltip; @@ -158,8 +156,8 @@ export class UndoManager { } /** - * @param {boolean} includeAll if `false` will include from the first up to the current node - * @returns {Undoable[]} a collection of undoables in order from the first to the last (can be empty) + * @param includeAll if `false` will include from the first up to the current node + * @returns a collection of undoables in order from the first to the last (can be empty) */ public toArray( includeAll: boolean = false ): Undoable[] { const result: Undoable[] = []; @@ -189,7 +187,7 @@ export class UndoManager { } /** - * @returns {string} a string representation of this undo manager + * @returns a string representation of this undo manager */ public toString(): string { let result = ""; @@ -209,7 +207,7 @@ export class UndoManager { } /** - * @returns {string} a short description, suitable for use in tooltips, of the next available undo command + * @returns a short description, suitable for use in tooltips, of the next available undo command */ public undoLabel(): string { let label = ViewEditorI18n.undoActionTooltip; diff --git a/ui/src/app/dataservices/virtualization/view-editor/command/undo-redo/undo-node.ts b/ui/src/app/dataservices/virtualization/view-editor/command/undo-redo/undo-node.ts index ed25d7c8..727aab2e 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/command/undo-redo/undo-node.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/command/undo-redo/undo-node.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { Undoable } from "@dataservices/virtualization/view-editor/command/undo-redo/undoable"; +import { Undoable } from "../../../../../dataservices/virtualization/view-editor/command/undo-redo/undoable"; export class UndoNode { @@ -30,35 +30,35 @@ export class UndoNode { } /** - * @returns {UndoNode} the node to the left or `null` + * @returns the node to the left or `null` */ public get left(): UndoNode { return this._left; } /** - * @param {UndoNode} node the new left node + * @param node the new left node */ public set left( node: UndoNode ) { this._left = node; } /** - * @returns {UndoNode} the node to the right or `null` + * @returns the node to the right or `null` */ public get right(): UndoNode { return this._right; } /** - * @param {UndoNode} node the new right node + * @param node the new right node */ public set right( node: UndoNode ) { this._right = node; } /** - * @returns {Undoable} the undoable associated with this node (never `null`) + * @returns the undoable associated with this node (never `null`) */ public get undoable(): Undoable { return this._undoable; diff --git a/ui/src/app/dataservices/virtualization/view-editor/command/undo-redo/undoable.spec.ts b/ui/src/app/dataservices/virtualization/view-editor/command/undo-redo/undoable.spec.ts index 80455b67..dcd09a54 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/command/undo-redo/undoable.spec.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/command/undo-redo/undoable.spec.ts @@ -1,6 +1,6 @@ -import { Undoable } from "@dataservices/virtualization/view-editor/command/undo-redo/undoable"; -import { UpdateViewNameCommand } from "@dataservices/virtualization/view-editor/command/update-view-name-command"; -import { CommandFactory } from "@dataservices/virtualization/view-editor/command/command-factory"; +import { Undoable } from "../../../../../dataservices/virtualization/view-editor/command/undo-redo/undoable"; +import { UpdateViewNameCommand } from "../../../../../dataservices/virtualization/view-editor/command/update-view-name-command"; +import { CommandFactory } from "../../../../../dataservices/virtualization/view-editor/command/command-factory"; describe("Undoable", () => { let result: Undoable | Error; diff --git a/ui/src/app/dataservices/virtualization/view-editor/command/undo-redo/undoable.ts b/ui/src/app/dataservices/virtualization/view-editor/command/undo-redo/undoable.ts index 173df0e6..0f7f897e 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/command/undo-redo/undoable.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/command/undo-redo/undoable.ts @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { Command } from "@dataservices/virtualization/view-editor/command/command"; +import { Command } from "../../../../../dataservices/virtualization/view-editor/command/command"; export class Undoable { @@ -23,8 +23,8 @@ export class Undoable { /** * Constructs an undoable. !! ** The undo and redo commands should not be `null` *** !! - * @param {Command} undoCmd the undo command (should not be `null`) - * @param {Command} redoCmd the redo command (should not be `null`) + * @param undoCmd the undo command (should not be `null`) + * @param redoCmd the redo command (should not be `null`) */ public constructor( undoCmd: Command, redoCmd: Command ) { @@ -33,14 +33,14 @@ export class Undoable { } /** - * @returns {Command} the redo command (never `null`) + * @returns the redo command (never `null`) */ public get redoCommand(): Command { return this._redoCmd; } /** - * @returns {{}} a JSON representation of this undoable + * @returns JSON representation of this undoable */ public toJSON(): {} { return { @@ -50,14 +50,14 @@ export class Undoable { } /** - * @returns {string} a string representation of this undoable + * @returns a string representation of this undoable */ public toString(): string { return "undo: " + this.undoCommand.toString() + ", redo: " + this.redoCommand.toString(); } /** - * @returns {Command} the undo command (never `null`) + * @returns the undo command (never `null`) */ public get undoCommand(): Command { return this._undoCmd; diff --git a/ui/src/app/dataservices/virtualization/view-editor/command/update-projected-columns-command.ts b/ui/src/app/dataservices/virtualization/view-editor/command/update-projected-columns-command.ts index e9eb427c..6ee7ea2f 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/command/update-projected-columns-command.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/command/update-projected-columns-command.ts @@ -15,42 +15,36 @@ * limitations under the License. */ -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; -import { Command } from "@dataservices/virtualization/view-editor/command/command"; -import { CommandType } from "@dataservices/virtualization/view-editor/command/command-type.enum"; -import { ProjectedColumn } from "@dataservices/shared/projected-column.model"; +import { ViewEditorI18n } from "../../../../dataservices/virtualization/view-editor/view-editor-i18n"; +import { Command } from "../../../../dataservices/virtualization/view-editor/command/command"; +import { CommandType } from "../../../../dataservices/virtualization/view-editor/command/command-type.enum"; +import { ProjectedColumn } from "../../../../dataservices/shared/projected-column.model"; export class UpdateProjectedColumnsCommand extends Command { /** * The command identifier. - * - * @type {string} */ public static readonly id = CommandType.UPDATE_PROJECTED_COLUMNS_COMMAND; /** * The name of the command argument whose value is the new projected columns of the view. - * - * @type {string} */ public static readonly newProjectedColumns = "newProjectedColumns"; /** * The name of the command argument whose value is the replaced projected columns of the view. - * - * @type {string} */ public static readonly oldProjectedColumns = "oldProjectedColumns"; /** * Constructor * the specified ProjectedColumns must be a ProjectedColumns object -OR- stringified projected columns - * @param {string | ProjectedColumn[]} newProjectedColumns the new projected columns or stringified projected columns + * @param newProjectedColumns the new projected columns or stringified projected columns * (cannot be `null` or empty) - * @param {string | ProjectedColumn[]} oldProjectedColumns the projected columns being replaced or stringified columns + * @param oldProjectedColumns the projected columns being replaced or stringified columns * (cannot be `null` or empty) - * @param {string} id the command id. If not supplied, an id is generated. + * @param id the command id. If not supplied, an id is generated. */ public constructor( newProjectedColumns: string | ProjectedColumn[], oldProjectedColumns: string | ProjectedColumn[], id?: string) { @@ -82,9 +76,6 @@ export class UpdateProjectedColumnsCommand extends Command { this._args.set( Command.identArg, id); } - /** - * @returns {ProjectedColumns} the new projected columns - */ public getNewProjectedColumns(): ProjectedColumn[] { const newColsStr = this.getArg( UpdateProjectedColumnsCommand.newProjectedColumns ) as string; const newCols = JSON.parse(newColsStr); @@ -97,14 +88,14 @@ export class UpdateProjectedColumnsCommand extends Command { } /** - * @returns {string} json payload for new projected columns + * @returns json payload for new projected columns */ public getNewProjecteColumnsPayload( ): string { return this.getArg( UpdateProjectedColumnsCommand.newProjectedColumns ) as string; } /** - * @returns {ProjectedColumn[]} the old projected columns + * @returns the old projected columns */ public getOldProjectedColumns(): ProjectedColumn[] { const oldColsStr = this.getArg( UpdateProjectedColumnsCommand.oldProjectedColumns ) as string; @@ -118,14 +109,14 @@ export class UpdateProjectedColumnsCommand extends Command { } /** - * @returns {string} json payload for old projected columns + * @returns json payload for old projected columns */ public getOldProjecteColumnsPayload( ): string { return this.getArg( UpdateProjectedColumnsCommand.oldProjectedColumns ) as string; } /** - * @returns {string} a unique short identifier of this command + * @returns a unique short identifier of this command */ public getId( ): string { return this.getArg( Command.identArg ) as string; diff --git a/ui/src/app/dataservices/virtualization/view-editor/command/update-view-description-command.ts b/ui/src/app/dataservices/virtualization/view-editor/command/update-view-description-command.ts index 2ba0b073..c1e3e3ff 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/command/update-view-description-command.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/command/update-view-description-command.ts @@ -15,36 +15,30 @@ * limitations under the License. */ -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; -import { Command } from "@dataservices/virtualization/view-editor/command/command"; -import { CommandType } from "@dataservices/virtualization/view-editor/command/command-type.enum"; +import { ViewEditorI18n } from "../../../../dataservices/virtualization/view-editor/view-editor-i18n"; +import { Command } from "../../../../dataservices/virtualization/view-editor/command/command"; +import { CommandType } from "../../../../dataservices/virtualization/view-editor/command/command-type.enum"; export class UpdateViewDescriptionCommand extends Command { /** * The command identifier. - * - * @type {string} */ public static readonly id = CommandType.UPDATE_VIEW_DESCRIPTION_COMMAND; /** * The name of the command argument whose value is the new description of the view. - * - * @type {string} */ public static readonly newDescription = "newDescription"; /** * The name of the command argument whose value is the replaced description of the view. - * - * @type {string} */ public static readonly oldDescription = "oldDescription"; /** - * @param {string} newViewDescription the new view description (can be `null` or empty) - * @param {string} oldViewDescription the view description being replaced (can be `null` or empty) + * @param newViewDescription the new view description (can be `null` or empty) + * @param oldViewDescription the view description being replaced (can be `null` or empty) */ public constructor( newViewDescription: string, oldViewDescription: string ) { diff --git a/ui/src/app/dataservices/virtualization/view-editor/command/update-view-name-command.ts b/ui/src/app/dataservices/virtualization/view-editor/command/update-view-name-command.ts index 81bfc3a7..4130ad6d 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/command/update-view-name-command.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/command/update-view-name-command.ts @@ -15,36 +15,30 @@ * limitations under the License. */ -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; -import { Command } from "@dataservices/virtualization/view-editor/command/command"; -import { CommandType } from "@dataservices/virtualization/view-editor/command/command-type.enum"; +import { ViewEditorI18n } from "../../../../dataservices/virtualization/view-editor/view-editor-i18n"; +import { Command } from "../../../../dataservices/virtualization/view-editor/command/command"; +import { CommandType } from "../../../../dataservices/virtualization/view-editor/command/command-type.enum"; export class UpdateViewNameCommand extends Command { /** * The command identifier. - * - * @type {string} */ public static readonly id = CommandType.UPDATE_VIEW_NAME_COMMAND; /** * The name of the command argument whose value is the new name of the view. - * - * @type {string} */ public static readonly newName = "newName"; /** * The name of the command argument whose value is the replaced name of the view. - * - * @type {string} */ public static readonly oldName = "oldName"; /** - * @param {string} newViewName the new view name (can be `null` or empty) - * @param {string} oldViewName the view name being replaced (can be `null` or empty) + * @param newViewName the new view name (can be `null` or empty) + * @param oldViewName the view name being replaced (can be `null` or empty) */ public constructor( newViewName: string, oldViewName: string ) { diff --git a/ui/src/app/dataservices/virtualization/view-editor/connection-table-dialog/connection-table-dialog.component.spec.ts b/ui/src/app/dataservices/virtualization/view-editor/connection-table-dialog/connection-table-dialog.component.spec.ts index c7a7a5e0..2523207e 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/connection-table-dialog/connection-table-dialog.component.spec.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/connection-table-dialog/connection-table-dialog.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from "@angular/core/testing"; import { ConnectionTableDialogComponent } from "./connection-table-dialog.component"; -import { ConnectionTreeSelectorComponent } from "@dataservices/virtualization/view-editor/connection-table-dialog/connection-tree-selector/connection-tree-selector.component"; +import { ConnectionTreeSelectorComponent } from "../../../../dataservices/virtualization/view-editor/connection-table-dialog/connection-tree-selector/connection-tree-selector.component"; import { TreeModule } from "angular-tree-component"; import { HttpModule } from "@angular/http"; import { @@ -15,13 +15,13 @@ import { TableModule, WizardModule } from "patternfly-ng"; import { BsModalRef, ModalModule } from "ngx-bootstrap"; -import { ConnectionService } from "@connections/shared/connection.service"; -import { MockConnectionService } from "@connections/shared/mock-connection.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; +import { ConnectionService } from "../../../../connections/shared/connection.service"; +import { MockConnectionService } from "../../../../connections/shared/mock-connection.service"; +import { VdbService } from "../../../../dataservices/shared/vdb.service"; +import { MockVdbService } from "../../../../dataservices/shared/mock-vdb.service"; +import { AppSettingsService } from "../../../../core/app-settings.service"; +import { LoggerService } from "../../../../core/logger.service"; +import { NotifierService } from "../../../../dataservices/shared/notifier.service"; describe("ConnectionTableDialogComponent", () => { let component: ConnectionTableDialogComponent; diff --git a/ui/src/app/dataservices/virtualization/view-editor/connection-table-dialog/connection-table-dialog.component.ts b/ui/src/app/dataservices/virtualization/view-editor/connection-table-dialog/connection-table-dialog.component.ts index 5017a33b..3cf6d7d9 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/connection-table-dialog/connection-table-dialog.component.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/connection-table-dialog/connection-table-dialog.component.ts @@ -19,13 +19,13 @@ import { Component, OnInit, ViewChild } from "@angular/core"; import { Output } from "@angular/core"; import { EventEmitter } from "@angular/core"; import { BsModalRef } from "ngx-bootstrap"; -import { ConnectionTreeSelectorComponent } from "@dataservices/virtualization/view-editor/connection-table-dialog/connection-tree-selector/connection-tree-selector.component"; -import { SchemaNode } from "@connections/shared/schema-node.model"; -import { ConnectionsConstants } from "@connections/shared/connections-constants"; -import { LoadingState } from "@shared/loading-state.enum"; -import { ConnectionService } from "@connections/shared/connection.service"; -import { LoggerService } from "@core/logger.service"; -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; +import { ConnectionTreeSelectorComponent } from "../../../../dataservices/virtualization/view-editor/connection-table-dialog/connection-tree-selector/connection-tree-selector.component"; +import { SchemaNode } from "../../../../connections/shared/schema-node.model"; +import { ConnectionsConstants } from "../../../../connections/shared/connections-constants"; +import { LoadingState } from "../../../../shared/loading-state.enum"; +import { ConnectionService } from "../../../../connections/shared/connection.service"; +import { LoggerService } from "../../../../core/logger.service"; +import { ViewEditorI18n } from "../../../../dataservices/virtualization/view-editor/view-editor-i18n"; @Component({ selector: "app-connection-table-dialog", @@ -109,7 +109,7 @@ export class ConnectionTableDialogComponent implements OnInit { /** * Handles tree node selection - * @param {SchemaNode} $event + * @param $event */ public onTreeNodeSelected( $event: SchemaNode ): void { const selectedNode = $event; @@ -124,7 +124,7 @@ export class ConnectionTableDialogComponent implements OnInit { /** * Handles tree node de-selection - * @param {SchemaNode} $event + * @param $event */ public onTreeNodeDeselected( $event: SchemaNode ): void { const selectedNode = $event; diff --git a/ui/src/app/dataservices/virtualization/view-editor/connection-table-dialog/connection-tree-selector/connection-tree-selector.component.spec.ts b/ui/src/app/dataservices/virtualization/view-editor/connection-table-dialog/connection-tree-selector/connection-tree-selector.component.spec.ts index 05b8041a..432e55c1 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/connection-table-dialog/connection-tree-selector/connection-tree-selector.component.spec.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/connection-table-dialog/connection-tree-selector/connection-tree-selector.component.spec.ts @@ -1,16 +1,16 @@ import { async, ComponentFixture, TestBed } from "@angular/core/testing"; import { ConnectionTreeSelectorComponent } from "./connection-tree-selector.component"; -import { LoggerService } from "@core/logger.service"; -import { MockConnectionService } from "@connections/shared/mock-connection.service"; -import { ConnectionService } from "@connections/shared/connection.service"; +import { LoggerService } from "../../../../../core/logger.service"; +import { MockConnectionService } from "../../../../../connections/shared/mock-connection.service"; +import { ConnectionService } from "../../../../../connections/shared/connection.service"; import { TreeModule } from "angular-tree-component"; import { HttpModule } from "@angular/http"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; +import { VdbService } from "../../../../../dataservices/shared/vdb.service"; +import { MockVdbService } from "../../../../../dataservices/shared/mock-vdb.service"; +import { AppSettingsService } from "../../../../../core/app-settings.service"; +import { NotifierService } from "../../../../../dataservices/shared/notifier.service"; +import { MockAppSettingsService } from "../../../../../core/mock-app-settings.service"; describe("ConnectionTreeSelectorComponent", () => { let component: ConnectionTreeSelectorComponent; diff --git a/ui/src/app/dataservices/virtualization/view-editor/connection-table-dialog/connection-tree-selector/connection-tree-selector.component.ts b/ui/src/app/dataservices/virtualization/view-editor/connection-table-dialog/connection-tree-selector/connection-tree-selector.component.ts index 8b6442ca..1fb59293 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/connection-table-dialog/connection-tree-selector/connection-tree-selector.component.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/connection-table-dialog/connection-tree-selector/connection-tree-selector.component.ts @@ -16,9 +16,9 @@ */ import { Component, EventEmitter, OnInit, Output } from "@angular/core"; -import { ConnectionService } from "@connections/shared/connection.service"; -import { SchemaNode } from "@connections/shared/schema-node.model"; -import { LoggerService } from "@core/logger.service"; +import { ConnectionService } from "../../../../../connections/shared/connection.service"; +import { SchemaNode } from "../../../../../connections/shared/schema-node.model"; +import { LoggerService } from "../../../../../core/logger.service"; import { TreeNode } from "angular-tree-component/dist/defs/api"; @Component({ diff --git a/ui/src/app/dataservices/virtualization/view-editor/create-view-dialog/create-view-dialog.component.spec.ts b/ui/src/app/dataservices/virtualization/view-editor/create-view-dialog/create-view-dialog.component.spec.ts index 04cfebdb..4fb770c5 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/create-view-dialog/create-view-dialog.component.spec.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/create-view-dialog/create-view-dialog.component.spec.ts @@ -8,12 +8,12 @@ import { NotificationModule } from "patternfly-ng"; import { FormsModule, ReactiveFormsModule } from "@angular/forms"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { LoggerService } from "@core/logger.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { SelectionService } from "@core/selection.service"; +import { VdbService } from "../../../../dataservices/shared/vdb.service"; +import { MockVdbService } from "../../../../dataservices/shared/mock-vdb.service"; +import { AppSettingsService } from "../../../../core/app-settings.service"; +import { LoggerService } from "../../../../core/logger.service"; +import { NotifierService } from "../../../../dataservices/shared/notifier.service"; +import { SelectionService } from "../../../../core/selection.service"; describe('CreateViewDialogComponent', () => { let component: CreateViewDialogComponent; diff --git a/ui/src/app/dataservices/virtualization/view-editor/create-view-dialog/create-view-dialog.component.ts b/ui/src/app/dataservices/virtualization/view-editor/create-view-dialog/create-view-dialog.component.ts index b62a4457..a8becc00 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/create-view-dialog/create-view-dialog.component.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/create-view-dialog/create-view-dialog.component.ts @@ -19,12 +19,12 @@ import { Component, OnInit } from "@angular/core"; import { Output } from "@angular/core"; import { EventEmitter } from "@angular/core"; import { BsModalRef } from "ngx-bootstrap"; -import { LoggerService } from "@core/logger.service"; -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; +import { LoggerService } from "../../../../core/logger.service"; +import { ViewEditorI18n } from "../../../../dataservices/virtualization/view-editor/view-editor-i18n"; import { AbstractControl, FormControl, FormGroup } from "@angular/forms"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { ViewDefinition } from "@dataservices/shared/view-definition.model"; -import { SelectionService } from "@core/selection.service"; +import { VdbService } from "../../../../dataservices/shared/vdb.service"; +import { ViewDefinition } from "../../../../dataservices/shared/view-definition.model"; +import { SelectionService } from "../../../../core/selection.service"; @Component({ selector: "app-create-view-dialog", @@ -98,7 +98,7 @@ export class CreateViewDialogComponent implements OnInit { /** * Handler for view name changes. - * @param {AbstractControl} input + * @param input */ public handleNameChanged( input: AbstractControl ): void { const self = this; diff --git a/ui/src/app/dataservices/virtualization/view-editor/editor-views/editor-views.component.spec.ts b/ui/src/app/dataservices/virtualization/view-editor/editor-views/editor-views.component.spec.ts index ef5e7bdb..f4bd200d 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/editor-views/editor-views.component.spec.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/editor-views/editor-views.component.spec.ts @@ -1,17 +1,17 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { HttpModule } from "@angular/http"; -import { LoggerService } from "@core/logger.service"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { MockDataserviceService } from "@dataservices/shared/mock-dataservice.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { ViewEditorService } from "@dataservices/virtualization/view-editor/view-editor.service"; -import { EditorViewsComponent } from '@dataservices/virtualization/view-editor/editor-views/editor-views.component'; -import { MessageLogComponent } from "@dataservices/virtualization/view-editor/editor-views/message-log/message-log.component"; -import { ViewPreviewComponent } from "@dataservices/virtualization/view-editor/editor-views/view-preview/view-preview.component"; +import { LoggerService } from "../../../../core/logger.service"; +import { MockAppSettingsService } from "../../../../core/mock-app-settings.service"; +import { AppSettingsService } from "../../../../core/app-settings.service"; +import { VdbService } from "../../../../dataservices/shared/vdb.service"; +import { MockVdbService } from "../../../../dataservices/shared/mock-vdb.service"; +import { DataserviceService } from "../../../../dataservices/shared/dataservice.service"; +import { MockDataserviceService } from "../../../../dataservices/shared/mock-dataservice.service"; +import { NotifierService } from "../../../../dataservices/shared/notifier.service"; +import { ViewEditorService } from "../../../../dataservices/virtualization/view-editor/view-editor.service"; +import { EditorViewsComponent } from '../../../../dataservices/virtualization/view-editor/editor-views/editor-views.component'; +import { MessageLogComponent } from "../../../../dataservices/virtualization/view-editor/editor-views/message-log/message-log.component"; +import { ViewPreviewComponent } from "../../../../dataservices/virtualization/view-editor/editor-views/view-preview/view-preview.component"; import { TabsModule } from "ngx-bootstrap"; import { ActionModule, @@ -23,7 +23,7 @@ import { SortModule, TableModule, WizardModule } from "patternfly-ng"; -import { SelectionService } from "@core/selection.service"; +import { SelectionService } from "../../../../core/selection.service"; describe('EditorViewsComponent', () => { let component: EditorViewsComponent; diff --git a/ui/src/app/dataservices/virtualization/view-editor/editor-views/editor-views.component.ts b/ui/src/app/dataservices/virtualization/view-editor/editor-views/editor-views.component.ts index d75a6769..6a15bb90 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/editor-views/editor-views.component.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/editor-views/editor-views.component.ts @@ -16,12 +16,12 @@ */ import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; -import { LoggerService } from "@core/logger.service"; -import { ViewEditorService } from "@dataservices/virtualization/view-editor/view-editor.service"; -import { ViewEditorPart } from "@dataservices/virtualization/view-editor/view-editor-part.enum"; -import { ViewEditorEvent } from "@dataservices/virtualization/view-editor/event/view-editor-event"; +import { LoggerService } from "../../../../core/logger.service"; +import { ViewEditorService } from "../../../../dataservices/virtualization/view-editor/view-editor.service"; +import { ViewEditorPart } from "../../../../dataservices/virtualization/view-editor/view-editor-part.enum"; +import { ViewEditorEvent } from "../../../../dataservices/virtualization/view-editor/event/view-editor-event"; import { Subscription } from "rxjs/Subscription"; -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; +import { ViewEditorI18n } from "../../../../dataservices/virtualization/view-editor/view-editor-i18n"; @Component({ encapsulation: ViewEncapsulation.None, @@ -61,7 +61,7 @@ export class EditorViewsComponent implements OnInit, OnDestroy { } /** - * @param {ViewEditorEvent} event the event being processed + * @param event the event being processed */ public handleEditorEvent( event: ViewEditorEvent ): void { this.logger.debug( "EditorViewsComponent received event: " + event.toString() ); diff --git a/ui/src/app/dataservices/virtualization/view-editor/editor-views/message-log/message-log.component.spec.ts b/ui/src/app/dataservices/virtualization/view-editor/editor-views/message-log/message-log.component.spec.ts index 12d2da53..fe89540c 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/editor-views/message-log/message-log.component.spec.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/editor-views/message-log/message-log.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { HttpModule } from "@angular/http"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; -import { AppSettingsService } from "@core/app-settings.service"; +import { MockAppSettingsService } from "../../../../../core/mock-app-settings.service"; +import { AppSettingsService } from "../../../../../core/app-settings.service"; import { ActionModule, CardModule, @@ -12,15 +12,15 @@ import { SortModule, TableModule, WizardModule } from "patternfly-ng"; -import { LoggerService } from "@core/logger.service"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { MockDataserviceService } from "@dataservices/shared/mock-dataservice.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { ViewEditorService } from "@dataservices/virtualization/view-editor/view-editor.service"; -import { MessageLogComponent } from '@dataservices/virtualization/view-editor/editor-views/message-log/message-log.component'; -import { SelectionService } from "@core/selection.service"; +import { LoggerService } from "../../../../../core/logger.service"; +import { DataserviceService } from "../../../../../dataservices/shared/dataservice.service"; +import { MockDataserviceService } from "../../../../../dataservices/shared/mock-dataservice.service"; +import { VdbService } from "../../../../../dataservices/shared/vdb.service"; +import { MockVdbService } from "../../../../../dataservices/shared/mock-vdb.service"; +import { NotifierService } from "../../../../../dataservices/shared/notifier.service"; +import { ViewEditorService } from "../../../../../dataservices/virtualization/view-editor/view-editor.service"; +import { MessageLogComponent } from '../../../../../dataservices/virtualization/view-editor/editor-views/message-log/message-log.component'; +import { SelectionService } from "../../../../../core/selection.service"; describe('MessageLogComponent', () => { let component: MessageLogComponent; diff --git a/ui/src/app/dataservices/virtualization/view-editor/editor-views/message-log/message-log.component.ts b/ui/src/app/dataservices/virtualization/view-editor/editor-views/message-log/message-log.component.ts index 7805e289..affbc3a1 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/editor-views/message-log/message-log.component.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/editor-views/message-log/message-log.component.ts @@ -16,11 +16,11 @@ */ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { LoggerService } from "@core/logger.service"; -import { ViewEditorService } from "@dataservices/virtualization/view-editor/view-editor.service"; +import { LoggerService } from "../../../../../core/logger.service"; +import { ViewEditorService } from "../../../../../dataservices/virtualization/view-editor/view-editor.service"; import { EmptyStateConfig, NgxDataTableConfig, TableConfig } from "patternfly-ng"; -import { Message } from "@dataservices/virtualization/view-editor/editor-views/message-log/message"; -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; +import { Message } from "../../../../../dataservices/virtualization/view-editor/editor-views/message-log/message"; +import { ViewEditorI18n } from "../../../../../dataservices/virtualization/view-editor/view-editor-i18n"; @Component({ encapsulation: ViewEncapsulation.None, @@ -84,7 +84,7 @@ export class MessageLogComponent implements OnInit { } /** - * @returns {Message[]} the log messages + * @returns the log messages */ public get rows(): Message[] { return this.editorService.getMessages(); diff --git a/ui/src/app/dataservices/virtualization/view-editor/editor-views/message-log/message.ts b/ui/src/app/dataservices/virtualization/view-editor/editor-views/message-log/message.ts index a106a6eb..db5863e8 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/editor-views/message-log/message.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/editor-views/message-log/message.ts @@ -14,8 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { MessageType } from "@dataservices/virtualization/view-editor/editor-views/message-log/message-type.enum"; -import { Problem } from "@dataservices/virtualization/view-editor/editor-views/message-log/problem"; +import { MessageType } from "../../../../../dataservices/virtualization/view-editor/editor-views/message-log/message-type.enum"; +import { Problem } from "../../../../../dataservices/virtualization/view-editor/editor-views/message-log/problem"; export class Message { @@ -33,8 +33,8 @@ export class Message { /** * Factory method to create a message using a problem. * - * @param {Problem} problem the unique message identifier - * @param {string} context the object context or path that generated the message (optional) + * @param problem the unique message identifier + * @param context the object context or path that generated the message (optional) */ public static create( problem: Problem, context?: string ): Message { @@ -44,10 +44,10 @@ export class Message { /** * Factory method to create a message. * - * @param {string} id the unique message identifier - * @param {MessageType} type the message type - * @param {string} description the message description - * @param {string} context the object context or path that generated the message (optional) + * @param id the unique message identifier + * @param type the message type + * @param description the message description + * @param context the object context or path that generated the message (optional) */ private static doCreate( id: string, type: MessageType, @@ -72,49 +72,49 @@ export class Message { } /** - * @returns {string} the object context or path (can be `null`) + * @returns the object context or path (can be `null`) */ public get context(): string { return this._context; } /** - * @returns {string} the message description + * @returns the message description */ public get description(): string { return this._description; } /** - * @returns {string} the unique message identifier + * @returns the unique message identifier */ public get id(): string { return this._id; } /** - * @returns {boolean} `true` if an error message + * @returns `true` if an error message */ public isError(): boolean { return this._type === MessageType.ERROR; } /** - * @returns {boolean} `true` if an informational message + * @returns `true` if an informational message */ public isInfo(): boolean { return this._type === MessageType.INFO; } /** - * @returns {boolean} `true` if a warning message + * @returns `true` if a warning message */ public isWarning(): boolean { return this._type === MessageType.WARNING; } /** - * @returns {string} a string representation of the event + * @returns a string representation of the event */ public toString(): string { let result = `message id: ${this.id}, type: ${this.type}, description: ${this.description}`; @@ -127,7 +127,7 @@ export class Message { } /** - * @returns {string} the message type + * @returns the message type */ public get type(): MessageType { return this._type; diff --git a/ui/src/app/dataservices/virtualization/view-editor/editor-views/message-log/problem.ts b/ui/src/app/dataservices/virtualization/view-editor/editor-views/message-log/problem.ts index 7e76bb0a..92aae846 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/editor-views/message-log/problem.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/editor-views/message-log/problem.ts @@ -14,8 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { MessageType } from "@dataservices/virtualization/view-editor/editor-views/message-log/message-type.enum"; -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; +import { MessageType } from "../../../../../dataservices/virtualization/view-editor/editor-views/message-log/message-type.enum"; +import { ViewEditorI18n } from "../../../../../dataservices/virtualization/view-editor/view-editor-i18n"; export class Problem { @@ -39,21 +39,21 @@ export class Problem { } /** - * @returns {string} the description + * @returns the description */ public get description(): string { return this._description; } /** - * @returns {string} the identifier + * @returns the identifier */ public get id(): string { return this._id; } /** - * @returns {string} the type + * @returns the type */ public get type(): MessageType { return this._type; diff --git a/ui/src/app/dataservices/virtualization/view-editor/editor-views/view-preview/view-preview.component.spec.ts b/ui/src/app/dataservices/virtualization/view-editor/editor-views/view-preview/view-preview.component.spec.ts index 46279900..78812131 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/editor-views/view-preview/view-preview.component.spec.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/editor-views/view-preview/view-preview.component.spec.ts @@ -1,11 +1,11 @@ import { HttpModule } from "@angular/http"; import { async, ComponentFixture, TestBed } from "@angular/core/testing"; import { RouterTestingModule } from "@angular/router/testing"; -import { LoggerService } from "@core/logger.service"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { ViewEditorService } from "@dataservices/virtualization/view-editor/view-editor.service"; -import { ViewPreviewComponent } from "@dataservices/virtualization/view-editor/editor-views/view-preview/view-preview.component"; +import { LoggerService } from "../../../../../core/logger.service"; +import { MockAppSettingsService } from "../../../../../core/mock-app-settings.service"; +import { AppSettingsService } from "../../../../../core/app-settings.service"; +import { ViewEditorService } from "../../../../../dataservices/virtualization/view-editor/view-editor.service"; +import { ViewPreviewComponent } from "../../../../../dataservices/virtualization/view-editor/editor-views/view-preview/view-preview.component"; import { ActionModule, CardModule, @@ -16,12 +16,12 @@ import { SortModule, TableModule, WizardModule } from "patternfly-ng"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { MockDataserviceService } from "@dataservices/shared/mock-dataservice.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { SelectionService } from "@core/selection.service"; +import { DataserviceService } from "../../../../../dataservices/shared/dataservice.service"; +import { MockDataserviceService } from "../../../../../dataservices/shared/mock-dataservice.service"; +import { VdbService } from "../../../../../dataservices/shared/vdb.service"; +import { MockVdbService } from "../../../../../dataservices/shared/mock-vdb.service"; +import { NotifierService } from "../../../../../dataservices/shared/notifier.service"; +import { SelectionService } from "../../../../../core/selection.service"; describe("ViewPreviewComponent", () => { let component: ViewPreviewComponent; diff --git a/ui/src/app/dataservices/virtualization/view-editor/editor-views/view-preview/view-preview.component.ts b/ui/src/app/dataservices/virtualization/view-editor/editor-views/view-preview/view-preview.component.ts index 4188d621..4f53a2b7 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/editor-views/view-preview/view-preview.component.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/editor-views/view-preview/view-preview.component.ts @@ -16,21 +16,21 @@ */ import { Component, OnDestroy, OnInit, ViewEncapsulation } from "@angular/core"; -import { LoggerService } from "@core/logger.service"; -import { ViewEditorEvent } from "@dataservices/virtualization/view-editor/event/view-editor-event"; -import { ViewEditorService } from "@dataservices/virtualization/view-editor/view-editor.service"; -import { QueryResults } from "@dataservices/shared/query-results.model"; -import { ColumnData } from "@dataservices/shared/column-data.model"; -import { RowData } from "@dataservices/shared/row-data.model"; +import { LoggerService } from "../../../../../core/logger.service"; +import { ViewEditorEvent } from "../../../../../dataservices/virtualization/view-editor/event/view-editor-event"; +import { ViewEditorService } from "../../../../../dataservices/virtualization/view-editor/view-editor.service"; +import { QueryResults } from "../../../../../dataservices/shared/query-results.model"; +import { ColumnData } from "../../../../../dataservices/shared/column-data.model"; +import { RowData } from "../../../../../dataservices/shared/row-data.model"; import { EmptyStateConfig, NgxDataTableConfig, TableConfig } from "patternfly-ng"; import { Subscription } from "rxjs/Subscription"; -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; -import { ViewEditorProgressChangeId } from "@dataservices/virtualization/view-editor/event/view-editor-save-progress-change-id.enum"; -import { Command } from "@dataservices/virtualization/view-editor/command/command"; -import { AddSourcesCommand } from "@dataservices/virtualization/view-editor/command/add-sources-command"; -import { RemoveSourcesCommand } from "@dataservices/virtualization/view-editor/command/remove-sources-command"; -import { AddCompositionCommand } from "@dataservices/virtualization/view-editor/command/add-composition-command"; -import { RemoveCompositionCommand } from "@dataservices/virtualization/view-editor/command/remove-composition-command"; +import { ViewEditorI18n } from "../../../../../dataservices/virtualization/view-editor/view-editor-i18n"; +import { ViewEditorProgressChangeId } from "../../../../../dataservices/virtualization/view-editor/event/view-editor-save-progress-change-id.enum"; +import { Command } from "../../../../../dataservices/virtualization/view-editor/command/command"; +import { AddSourcesCommand } from "../../../../../dataservices/virtualization/view-editor/command/add-sources-command"; +import { RemoveSourcesCommand } from "../../../../../dataservices/virtualization/view-editor/command/remove-sources-command"; +import { AddCompositionCommand } from "../../../../../dataservices/virtualization/view-editor/command/add-composition-command"; +import { RemoveCompositionCommand } from "../../../../../dataservices/virtualization/view-editor/command/remove-composition-command"; @Component({ encapsulation: ViewEncapsulation.None, @@ -53,8 +53,8 @@ export class ViewPreviewComponent implements OnInit, OnDestroy { private _previewSql = null; /** - * @param {ViewEditorService} editorService the editor service - * @param {LoggerService} logger the logger + * @param editorService the editor service + * @param logger the logger */ constructor( editorService: ViewEditorService, logger: LoggerService ) { @@ -76,7 +76,7 @@ export class ViewPreviewComponent implements OnInit, OnDestroy { } /** - * @param {ViewEditorEvent} event the event being processed + * @param event the event being processed */ public handleEditorEvent( event: ViewEditorEvent ): void { this.logger.debug( "ViewPreviewComponent received event: " + event.toString() ); diff --git a/ui/src/app/dataservices/virtualization/view-editor/event/view-editor-event-type.enum.ts b/ui/src/app/dataservices/virtualization/view-editor/event/view-editor-event-type.enum.ts index f53436c6..0cc1a571 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/event/view-editor-event-type.enum.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/event/view-editor-event-type.enum.ts @@ -15,11 +15,11 @@ * limitations under the License. */ -import { QueryResults } from "@dataservices/shared/query-results.model"; -import { ViewEditorPart } from "@dataservices/virtualization/view-editor/view-editor-part.enum"; -import { Command } from "@dataservices/virtualization/view-editor/command/command"; -import { Message } from "@dataservices/virtualization/view-editor/editor-views/message-log/message"; -import { ViewEditorProgressChangeId } from "@dataservices/virtualization/view-editor/event/view-editor-save-progress-change-id.enum"; +import { QueryResults } from "../../../../dataservices/shared/query-results.model"; +import { ViewEditorPart } from "../../../../dataservices/virtualization/view-editor/view-editor-part.enum"; +import { Command } from "../../../../dataservices/virtualization/view-editor/command/command"; +import { Message } from "../../../../dataservices/virtualization/view-editor/editor-views/message-log/message"; +import { ViewEditorProgressChangeId } from "../../../../dataservices/virtualization/view-editor/event/view-editor-save-progress-change-id.enum"; export enum ViewEditorEventType { diff --git a/ui/src/app/dataservices/virtualization/view-editor/event/view-editor-event.ts b/ui/src/app/dataservices/virtualization/view-editor/event/view-editor-event.ts index f541aab4..770d963c 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/event/view-editor-event.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/event/view-editor-event.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { ViewEditorPart } from "@dataservices/virtualization/view-editor/view-editor-part.enum"; -import { ViewEditorEventType } from "@dataservices/virtualization/view-editor/event/view-editor-event-type.enum"; +import { ViewEditorPart } from "../../../../dataservices/virtualization/view-editor/view-editor-part.enum"; +import { ViewEditorEventType } from "../../../../dataservices/virtualization/view-editor/event/view-editor-event-type.enum"; export class ViewEditorEvent { @@ -27,10 +27,10 @@ export class ViewEditorEvent { /** * Factory method to create an event. * - * @param {ViewEditorPart} source the source of the event - * @param {ViewEditorEventType} type the type of event - * @param {object[]} args the optional args - * @returns {ViewEditorEvent} the created event + * @param source the source of the event + * @param type the type of event + * @param args the optional args + * @returns the created event */ public static create( source: ViewEditorPart, type: ViewEditorEventType, @@ -50,70 +50,70 @@ export class ViewEditorEvent { } /** - * @returns {any[]} the optional args to the event (never `null` but can be empty) + * @returns the optional args to the event (never `null` but can be empty) */ public get args(): any[] { return this._args; } /** - * @returns {ViewEditorPart} the event source + * @returns the event source */ public get source(): ViewEditorPart { return this._source; } /** - * @returns {boolean} `true` if the canvas editor part was the source of the event + * @returns `true` if the canvas editor part was the source of the event */ public sourceIsCanvas(): boolean { return this.source === ViewEditorPart.CANVAS; } /** - * @returns {boolean} `true` if the editor was the source of the event + * @returns `true` if the editor was the source of the event */ public sourceIsEditor(): boolean { return this.source === ViewEditorPart.EDITOR; } /** - * @returns {boolean} `true` if the header editor part was the source of the event + * @returns `true` if the header editor part was the source of the event */ public sourceIsHeader(): boolean { return this.source === ViewEditorPart.HEADER; } /** - * @returns {boolean} `true` if the message log part was the source of the event + * @returns `true` if the message log part was the source of the event */ public sourceIsMessageLog(): boolean { return this.source === ViewEditorPart.MESSAGE_LOG; } /** - * @returns {boolean} `true` if the preview editor part was the source of the event + * @returns `true` if the preview editor part was the source of the event */ public sourceIsPreview(): boolean { return this.source === ViewEditorPart.PREVIEW; } /** - * @returns {boolean} `true` if the properties editor part was the source of the event + * @returns `true` if the properties editor part was the source of the event */ public sourceIsProperties(): boolean { return this.source === ViewEditorPart.PROPERTIES; } /** - * @returns {boolean} `true` if the projected columns editor part was the source of the event + * @returns `true` if the projected columns editor part was the source of the event */ public sourceIsProjectedSymbols(): boolean { return this.source === ViewEditorPart.PROJECTED_COLUMNS; } /** - * @returns {string} a string representation of the event + * @returns a string representation of the event */ public toString(): string { let text = `event type: ${this.type}, source: ${this.source}, args: `; @@ -135,112 +135,112 @@ export class ViewEditorEvent { } /** - * @returns {ViewEditorEventType} the event type + * @returns the event type */ public get type(): ViewEditorEventType { return this._type; } /** - * @returns {boolean} `true` if the type is {@link ViewEditorEventType.CANVAS_SELECTION_CHANGED} + * @returns `true` if the type is {@link ViewEditorEventType.CANVAS_SELECTION_CHANGED} */ public typeIsCanvasSelectionChanged(): boolean { return this.type === ViewEditorEventType.CANVAS_SELECTION_CHANGED; } /** - * @returns {boolean} `true` if the type is {@link ViewEditorEventType.EDITED_VIEW_SET} + * @returns `true` if the type is {@link ViewEditorEventType.EDITED_VIEW_SET} */ public typeIsEditedViewSet(): boolean { return this.type === ViewEditorEventType.EDITED_VIEW_SET; } /** - * @returns {boolean} `true` if the type is {@link ViewEditorEventType.EDITOR_CONFIG_CHANGED} + * @returns `true` if the type is {@link ViewEditorEventType.EDITOR_CONFIG_CHANGED} */ public typeIsEditorConfigChanged(): boolean { return this.type === ViewEditorEventType.EDITOR_CONFIG_CHANGED; } /** - * @returns {boolean} `true` if the type is {@link ViewEditorEventType.EDITOR_VIEW_SAVE_PROGRESS_CHANGED} + * @returns `true` if the type is {@link ViewEditorEventType.EDITOR_VIEW_SAVE_PROGRESS_CHANGED} */ public typeIsEditorViewSaveProgressChanged(): boolean { return this.type === ViewEditorEventType.EDITOR_VIEW_SAVE_PROGRESS_CHANGED; } /** - * @returns {boolean} `true` if the type is {@link ViewEditorEventType.LOG_MESSAGE_ADDED} + * @returns `true` if the type is {@link ViewEditorEventType.LOG_MESSAGE_ADDED} */ public typeIsLogMessageAdded(): boolean { return this.type === ViewEditorEventType.LOG_MESSAGE_ADDED; } /** - * @returns {boolean} `true` if the type is {@link ViewEditorEventType.LOG_MESSAGE_DELETED} + * @returns `true` if the type is {@link ViewEditorEventType.LOG_MESSAGE_DELETED} */ public typeIsLogMessageDeleted(): boolean { return this.type === ViewEditorEventType.LOG_MESSAGE_DELETED; } /** - * @returns {boolean} `true` if the type is {@link ViewEditorEventType.LOG_MESSAGES_CLEARED} + * @returns `true` if the type is {@link ViewEditorEventType.LOG_MESSAGES_CLEARED} */ public typeIsLogMessagesCleared(): boolean { return this.type === ViewEditorEventType.LOG_MESSAGES_CLEARED; } /** - * @returns {boolean} `true` if the type is {@link ViewEditorEventType.PREVIEW_RESULTS_CHANGED} + * @returns `true` if the type is {@link ViewEditorEventType.PREVIEW_RESULTS_CHANGED} */ public typeIsPreviewResultsChanged(): boolean { return this.type === ViewEditorEventType.PREVIEW_RESULTS_CHANGED; } /** - * @returns {boolean} `true` if the type is {@link ViewEditorEventType.READONLY_CHANGED} + * @returns `true` if the type is {@link ViewEditorEventType.READONLY_CHANGED} */ public typeIsReadonlyChanged(): boolean { return this.type === ViewEditorEventType.READONLY_CHANGED; } /** - * @returns {boolean} `true` if the type is {@link ViewEditorEventType.RESTORE_EDITOR_STATE}. + * @returns `true` if the type is {@link ViewEditorEventType.RESTORE_EDITOR_STATE}. */ public typeIsRestoreEditorState(): boolean { return this.type === ViewEditorEventType.READONLY_CHANGED; } /** - * @returns {boolean} `true` if the type is {@link ViewEditorEventType.SHOW_EDITOR_PART} + * @returns `true` if the type is {@link ViewEditorEventType.SHOW_EDITOR_PART} */ public typeIsShowEditorPart(): boolean { return this.type === ViewEditorEventType.SHOW_EDITOR_PART; } /** - * @returns {boolean} `true` if the type is {@link ViewEditorEventType.VIEW_STATE_CHANGED} + * @returns `true` if the type is {@link ViewEditorEventType.VIEW_STATE_CHANGED} */ public typeIsViewStateChanged(): boolean { return this.type === ViewEditorEventType.VIEW_STATE_CHANGED; } /** - * @returns {boolean} `true` if the type is `ViewEditorEventType.CREATE_SOURCE` + * @returns `true` if the type is `ViewEditorEventType.CREATE_SOURCE` */ public typeIsCreateSource(): boolean { return this.type === ViewEditorEventType.CREATE_SOURCE; } /** - * @returns {boolean} `true` if the type is `ViewEditorEventType.CREATE_COMPOSITION` + * @returns `true` if the type is `ViewEditorEventType.CREATE_COMPOSITION` */ public typeIsCreateComposition(): boolean { return this.type === ViewEditorEventType.CREATE_COMPOSITION; } /** - * @returns {boolean} `true` if the type is `ViewEditorEventType.DELETE_NODE` + * @returns `true` if the type is `ViewEditorEventType.DELETE_NODE` */ public typeIsDeleteNode(): boolean { return this.type === ViewEditorEventType.DELETE_NODE; diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-canvas/canvas.service.ts b/ui/src/app/dataservices/virtualization/view-editor/view-canvas/canvas.service.ts index ef0addca..98c831ac 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-canvas/canvas.service.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-canvas/canvas.service.ts @@ -15,11 +15,11 @@ * limitations under the License. */ import { Injectable, EventEmitter, ChangeDetectorRef, Output } from '@angular/core'; -import { CanvasConstants } from '@dataservices/virtualization/view-editor/view-canvas/canvas-constants'; -import { CanvasNode, CanvasLink, CanvasGraph } from '@dataservices/virtualization/view-editor/view-canvas/models'; -import { ViewCanvasEvent } from "@dataservices/virtualization/view-editor/view-canvas/event/view-canvas-event"; -import { ViewCanvasEventType } from "@dataservices/virtualization/view-editor/view-canvas/event/view-canvas-event-type.enum"; -import { Command } from "@dataservices/virtualization/view-editor/command/command"; +import { CanvasConstants } from '../../../../dataservices/virtualization/view-editor/view-canvas/canvas-constants'; +import { CanvasNode, CanvasLink, CanvasGraph } from '../../../../dataservices/virtualization/view-editor/view-canvas/models'; +import { ViewCanvasEvent } from "../../../../dataservices/virtualization/view-editor/view-canvas/event/view-canvas-event"; +import { ViewCanvasEventType } from "../../../../dataservices/virtualization/view-editor/view-canvas/event/view-canvas-event-type.enum"; +import { Command } from "../../../../dataservices/virtualization/view-editor/command/command"; import * as d3 from 'd3'; import * as _ from "lodash"; @@ -28,8 +28,6 @@ export class CanvasService { /** * An event fired when the state of the canvas has changed. - * - * @type {EventEmitter} */ @Output() public canvasEvent: EventEmitter< ViewCanvasEvent > = new EventEmitter(); diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-canvas/event/view-canvas-event.ts b/ui/src/app/dataservices/virtualization/view-editor/view-canvas/event/view-canvas-event.ts index d8e4d5f3..8a9cf732 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-canvas/event/view-canvas-event.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-canvas/event/view-canvas-event.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ViewCanvasEventType } from "@dataservices/virtualization/view-editor/view-canvas/event/view-canvas-event-type.enum"; +import { ViewCanvasEventType } from "../../../../../dataservices/virtualization/view-editor/view-canvas/event/view-canvas-event-type.enum"; export class ViewCanvasEvent { @@ -25,9 +25,9 @@ export class ViewCanvasEvent { /** * Factory method to create an event. * - * @param {ViewCanvasEventType} type the type of event - * @param {object[]} args the optional args - * @returns {ViewCanvasEvent} the created event + * @param type the type of event + * @param args the optional args + * @returns the created event */ public static create( type: ViewCanvasEventType, args?: any[] ): ViewCanvasEvent { @@ -43,15 +43,12 @@ export class ViewCanvasEvent { } } - /** - * @returns {any[]} the optional args to the event (never `null` but can be empty) - */ public get args(): any[] { return this._args; } /** - * @returns {string} a string representation of the event + * @returns a string representation of the event */ public toString(): string { let text = `event type: ${this.type}, args: `; @@ -73,14 +70,14 @@ export class ViewCanvasEvent { } /** - * @returns {ViewCanvasEventType} the event type + * @returns the event type */ public get type(): ViewCanvasEventType { return this._type; } /** - * @returns {boolean} `true` if the type is `ViewCanvasEventType.CANVAS_SELECTION_CHANGED` + * @returns `true` if the type is `ViewCanvasEventType.CANVAS_SELECTION_CHANGED` */ public typeIsCanvasSelectionChanged(): boolean { return this.type === ViewCanvasEventType.CANVAS_SELECTION_CHANGED; diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-canvas/models/canvas-graph.ts b/ui/src/app/dataservices/virtualization/view-editor/view-canvas/models/canvas-graph.ts index 9e45f04c..6baba70c 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-canvas/models/canvas-graph.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-canvas/models/canvas-graph.ts @@ -15,9 +15,9 @@ * limitations under the License. */ import { EventEmitter } from '@angular/core'; -import { CanvasService } from '@dataservices/virtualization/view-editor/view-canvas/canvas.service'; -import { CanvasNode } from '@dataservices/virtualization/view-editor/view-canvas/models/canvas-node'; -import { CanvasLink } from '@dataservices/virtualization/view-editor/view-canvas/models/canvas-link'; +import { CanvasService } from '../../../../../dataservices/virtualization/view-editor/view-canvas/canvas.service'; +import { CanvasNode } from '../../../../../dataservices/virtualization/view-editor/view-canvas/models/canvas-node'; +import { CanvasLink } from '../../../../../dataservices/virtualization/view-editor/view-canvas/models/canvas-link'; import * as d3 from 'd3'; import * as cola from 'webcola'; import * as _ from "lodash"; diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-canvas/models/canvas-link.ts b/ui/src/app/dataservices/virtualization/view-editor/view-canvas/models/canvas-link.ts index e0b7f568..5fb38212 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-canvas/models/canvas-link.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-canvas/models/canvas-link.ts @@ -16,7 +16,7 @@ */ import * as d3 from 'd3'; import * as cola from 'webcola'; -import { CanvasNode } from '@dataservices/virtualization/view-editor/view-canvas/models/canvas-node'; +import { CanvasNode } from '../../../../../dataservices/virtualization/view-editor/view-canvas/models/canvas-node'; export class CanvasLink implements cola.Link { // optional - defining optional implementation properties - required for relevant typing assistance diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-canvas/models/canvas-node.spec.ts b/ui/src/app/dataservices/virtualization/view-editor/view-canvas/models/canvas-node.spec.ts index b9f9e225..593687e4 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-canvas/models/canvas-node.spec.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-canvas/models/canvas-node.spec.ts @@ -1,4 +1,4 @@ -import { CanvasNode } from "@dataservices/virtualization/view-editor/view-canvas/models/canvas-node"; +import { CanvasNode } from "../../../../../dataservices/virtualization/view-editor/view-canvas/models/canvas-node"; describe("CanvasNode", () => { let canvasNode: CanvasNode; diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-canvas/models/canvas-node.ts b/ui/src/app/dataservices/virtualization/view-editor/view-canvas/models/canvas-node.ts index bb404afd..e90d2eb8 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-canvas/models/canvas-node.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-canvas/models/canvas-node.ts @@ -37,11 +37,15 @@ export class CanvasNode implements cola.Node { private _root = false; public static encodeId(id: string): string { - return id.replace(/\//g, '5X5').replace(/=/g, '6X6'); + // TODO: fix this + return ""; + // return id.replace(/\//g, '5X5').replace(/=/g, '6X6'); } public static decodeId(id: string): string { - return id.replace(/5X5/g, '/').replace(/6X6/g, '='); + // TODO: fix this + return ""; + // return id.replace(/5X5/g, '/').replace(/6X6/g, '='); } constructor(id: string, payload: string, type: string, label: string, root?: boolean) { diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-canvas/view-canvas.component.spec.ts b/ui/src/app/dataservices/virtualization/view-editor/view-canvas/view-canvas.component.spec.ts index ebb1dee8..2bd5de02 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-canvas/view-canvas.component.spec.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-canvas/view-canvas.component.spec.ts @@ -1,10 +1,10 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { HttpModule } from "@angular/http"; -import { LoggerService } from "@core/logger.service"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { ViewCanvasComponent } from '@dataservices/virtualization/view-editor/view-canvas/view-canvas.component'; -import { ViewEditorService } from "@dataservices/virtualization/view-editor/view-editor.service"; +import { LoggerService } from "../../../../core/logger.service"; +import { MockAppSettingsService } from "../../../../core/mock-app-settings.service"; +import { AppSettingsService } from "../../../../core/app-settings.service"; +import { ViewCanvasComponent } from '../../../../dataservices/virtualization/view-editor/view-canvas/view-canvas.component'; +import { ViewEditorService } from "../../../../dataservices/virtualization/view-editor/view-editor.service"; import { ActionModule, CardModule, @@ -15,21 +15,21 @@ import { SortModule, TableModule, WizardModule } from "patternfly-ng"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { MockDataserviceService } from "@dataservices/shared/mock-dataservice.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { ViewPropertyEditorsComponent } from "@dataservices/virtualization/view-editor/view-property-editors/view-property-editors.component"; +import { DataserviceService } from "../../../../dataservices/shared/dataservice.service"; +import { MockDataserviceService } from "../../../../dataservices/shared/mock-dataservice.service"; +import { VdbService } from "../../../../dataservices/shared/vdb.service"; +import { MockVdbService } from "../../../../dataservices/shared/mock-vdb.service"; +import { NotifierService } from "../../../../dataservices/shared/notifier.service"; +import { ViewPropertyEditorsComponent } from "../../../../dataservices/virtualization/view-editor/view-property-editors/view-property-editors.component"; import { TabsModule} from "ngx-bootstrap"; -import { GraphVisualComponent, LinkVisualComponent, NodeVisualComponent } from "@dataservices/virtualization/view-editor/view-canvas/visuals"; -import { CanvasService } from "@dataservices/virtualization/view-editor/view-canvas/canvas.service"; -import { SelectionService } from "@core/selection.service"; -import { PropertyEditorComponent } from "@dataservices/virtualization/view-editor/view-property-editors/property-editor/property-editor.component"; -import { ProjectedColumnsEditorComponent } from "@dataservices/virtualization/view-editor/view-property-editors/projected-columns-editor/projected-columns-editor.component"; -import { ViewsListComponent } from "@dataservices/virtualization/view-editor/views-list/views-list.component"; +import { GraphVisualComponent, LinkVisualComponent, NodeVisualComponent } from "../../../../dataservices/virtualization/view-editor/view-canvas/visuals"; +import { CanvasService } from "../../../../dataservices/virtualization/view-editor/view-canvas/canvas.service"; +import { SelectionService } from "../../../../core/selection.service"; +import { PropertyEditorComponent } from "../../../../dataservices/virtualization/view-editor/view-property-editors/property-editor/property-editor.component"; +import { ProjectedColumnsEditorComponent } from "../../../../dataservices/virtualization/view-editor/view-property-editors/projected-columns-editor/projected-columns-editor.component"; +import { ViewsListComponent } from "../../../../dataservices/virtualization/view-editor/views-list/views-list.component"; import { BsModalService } from "ngx-bootstrap"; -import { Dataservice } from "@dataservices/shared/dataservice.model"; +import { Dataservice } from "../../../../dataservices/shared/dataservice.model"; describe('ViewCanvasComponent', () => { let component: ViewCanvasComponent; diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-canvas/view-canvas.component.ts b/ui/src/app/dataservices/virtualization/view-editor/view-canvas/view-canvas.component.ts index 9946f225..0bf43129 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-canvas/view-canvas.component.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-canvas/view-canvas.component.ts @@ -16,29 +16,29 @@ */ import { Component, OnDestroy, OnInit, AfterViewInit, ViewEncapsulation } from "@angular/core"; -import { AddSourcesCommand } from "@dataservices/virtualization/view-editor/command/add-sources-command"; -import { RemoveSourcesCommand } from "@dataservices/virtualization/view-editor/command/remove-sources-command"; -import { LoggerService } from "@core/logger.service"; -import { ViewEditorEvent } from "@dataservices/virtualization/view-editor/event/view-editor-event"; -import { ViewEditorEventType } from "@dataservices/virtualization/view-editor/event/view-editor-event-type.enum"; -import { ViewEditorService } from "@dataservices/virtualization/view-editor/view-editor.service"; -import { ViewEditorPart } from "@dataservices/virtualization/view-editor/view-editor-part.enum"; -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; -import { ViewEditorProgressChangeId } from "@dataservices/virtualization/view-editor/event/view-editor-save-progress-change-id.enum"; -import { PathUtils } from "@dataservices/shared/path-utils"; +import { AddSourcesCommand } from "../../../../dataservices/virtualization/view-editor/command/add-sources-command"; +import { RemoveSourcesCommand } from "../../../../dataservices/virtualization/view-editor/command/remove-sources-command"; +import { LoggerService } from "../../../../core/logger.service"; +import { ViewEditorEvent } from "../../../../dataservices/virtualization/view-editor/event/view-editor-event"; +import { ViewEditorEventType } from "../../../../dataservices/virtualization/view-editor/event/view-editor-event-type.enum"; +import { ViewEditorService } from "../../../../dataservices/virtualization/view-editor/view-editor.service"; +import { ViewEditorPart } from "../../../../dataservices/virtualization/view-editor/view-editor-part.enum"; +import { ViewEditorI18n } from "../../../../dataservices/virtualization/view-editor/view-editor-i18n"; +import { ViewEditorProgressChangeId } from "../../../../dataservices/virtualization/view-editor/event/view-editor-save-progress-change-id.enum"; +import { PathUtils } from "../../../../dataservices/shared/path-utils"; import { NotificationType } from "patternfly-ng"; import { Subscription } from "rxjs/Subscription"; -import { CanvasNode, CanvasLink } from '@dataservices/virtualization/view-editor/view-canvas/models'; -import { CanvasConstants } from '@dataservices/virtualization/view-editor/view-canvas/canvas-constants'; -import { CanvasService } from '@dataservices/virtualization/view-editor/view-canvas/canvas.service'; -import { ViewCanvasEvent } from "@dataservices/virtualization/view-editor/view-canvas/event/view-canvas-event"; -import { ViewCanvasEventType } from "@dataservices/virtualization/view-editor/view-canvas/event/view-canvas-event-type.enum"; +import { CanvasNode, CanvasLink } from '../../../../dataservices/virtualization/view-editor/view-canvas/models'; +import { CanvasConstants } from '../../../../dataservices/virtualization/view-editor/view-canvas/canvas-constants'; +import { CanvasService } from '../../../../dataservices/virtualization/view-editor/view-canvas/canvas.service'; +import { ViewCanvasEvent } from "../../../../dataservices/virtualization/view-editor/view-canvas/event/view-canvas-event"; +import { ViewCanvasEventType } from "../../../../dataservices/virtualization/view-editor/view-canvas/event/view-canvas-event-type.enum"; import * as _ from "lodash"; -import { AddCompositionCommand } from "@dataservices/virtualization/view-editor/command/add-composition-command"; -import { RemoveCompositionCommand } from "@dataservices/virtualization/view-editor/command/remove-composition-command"; -import { CommandFactory } from "@dataservices/virtualization/view-editor/command/command-factory"; -import { ViewDefinition } from "@dataservices/shared/view-definition.model"; -import { Composition } from "@dataservices/shared/composition.model"; +import { AddCompositionCommand } from "../../../../dataservices/virtualization/view-editor/command/add-composition-command"; +import { RemoveCompositionCommand } from "../../../../dataservices/virtualization/view-editor/command/remove-composition-command"; +import { CommandFactory } from "../../../../dataservices/virtualization/view-editor/command/command-factory"; +import { ViewDefinition } from "../../../../dataservices/shared/view-definition.model"; +import { Composition } from "../../../../dataservices/shared/composition.model"; @Component({ encapsulation: ViewEncapsulation.None, @@ -95,7 +95,7 @@ export class ViewCanvasComponent implements OnInit, OnDestroy { } /** - * @param {ViewEditorEvent} event the event being processed + * @param event the event being processed */ public handleEditorEvent( event: ViewEditorEvent ): void { this.logger.debug( "ViewCanvasComponent received event: " + event.toString() ); @@ -142,8 +142,8 @@ export class ViewCanvasComponent implements OnInit, OnDestroy { /** * Generates a view notification message based on the progress type and viewName - * @param {ViewEditorProgressChangeId} viewProgressId the progress type - * @param {string} viewName the view name + * @param viewProgressId the progress type + * @param viewName the view name */ private getViewNotificationMessage(viewProgressId: ViewEditorProgressChangeId, viewName: string): string { let msg = ""; @@ -198,14 +198,14 @@ export class ViewCanvasComponent implements OnInit, OnDestroy { } /** - * @returns {boolean} `true` if view being edited is readonly + * @returns `true` if view being edited is readonly */ public get readOnly(): boolean { return this.editorService.isReadOnly(); } /** - * @returns {boolean} true if save view notification is to be shown + * @returns true if save view notification is to be shown */ public get showSaveViewNotification(): boolean { return this.saveViewNotificationVisible; @@ -213,7 +213,7 @@ export class ViewCanvasComponent implements OnInit, OnDestroy { /** * Initialize the canvas with the provided ViewDefinition - * @param {ViewDefinition} viewDefn the ViewDefinition + * @param viewDefn the ViewDefinition */ private initCanvas( viewDefn: ViewDefinition ): void { // Make sure canvas is cleared @@ -250,7 +250,7 @@ export class ViewCanvasComponent implements OnInit, OnDestroy { /** * Create canvas nodes using the provided AddSourcesCommand - * @param {AddSourcesCommand} command the AddSourcesCommand + * @param command the AddSourcesCommand */ private createSourceNode(command: AddSourcesCommand): void { const sourcePaths: string[] = command.getSourcePaths(); @@ -272,7 +272,7 @@ export class ViewCanvasComponent implements OnInit, OnDestroy { /** * Remove canvas nodes using the provided RemoveSourcesCommand - * @param {RemoveSourcesCommand} command the RemoveSourcesCommand + * @param command the RemoveSourcesCommand */ private removeSourceNodes(command: RemoveSourcesCommand): void { const srcPaths = command.getSourcePaths(); @@ -286,7 +286,7 @@ export class ViewCanvasComponent implements OnInit, OnDestroy { /** * Create canvas nodes using the provided AddCompositionCommand - * @param {AddCompositionCommand} command the AddCompositionCommand + * @param command the AddCompositionCommand */ private createComposition(command: AddCompositionCommand): void { const composition = command.getComposition(); @@ -298,7 +298,7 @@ export class ViewCanvasComponent implements OnInit, OnDestroy { /** * Remove canvas nodes using the provided RemoveCompositionCommand - * @param {RemoveCompositionCommand} command the RemoveCompositionCommand + * @param command the RemoveCompositionCommand */ private removeComposition(command: RemoveCompositionCommand): void { const composition = command.getComposition(); @@ -312,8 +312,8 @@ export class ViewCanvasComponent implements OnInit, OnDestroy { /** * Generate a links between the compositionNode and CanvasNode for the supplied path, if not found - * @param {string} compositionNodeId - * @param {string} sourcePath + * @param compositionNodeId + * @param sourcePath */ private createLink(compositionNodeId: string, sourcePath: string): void { const sourceNode = this.getCanvasNodeForSourcePath(sourcePath); diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-canvas/visuals/graph/graph-visual.component.ts b/ui/src/app/dataservices/virtualization/view-editor/view-canvas/visuals/graph/graph-visual.component.ts index f8ea0525..7621bde7 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-canvas/visuals/graph/graph-visual.component.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-canvas/visuals/graph/graph-visual.component.ts @@ -15,8 +15,8 @@ * limitations under the License. */ import { Component, Input, ChangeDetectorRef, HostListener, ChangeDetectionStrategy, OnInit } from '@angular/core'; -import { CanvasService } from '@dataservices/virtualization/view-editor/view-canvas/canvas.service'; -import { CanvasGraph, CanvasNode, CanvasLink } from '@dataservices/virtualization/view-editor/view-canvas/models'; +import { CanvasService } from '../../../../../../dataservices/virtualization/view-editor/view-canvas/canvas.service'; +import { CanvasGraph, CanvasNode, CanvasLink } from '../../../../../../dataservices/virtualization/view-editor/view-canvas/models'; import * as d3 from 'd3'; import * as _ from "lodash"; diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-canvas/visuals/link/link-visual.component.ts b/ui/src/app/dataservices/virtualization/view-editor/view-canvas/visuals/link/link-visual.component.ts index bd3a1fc4..d8e78035 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-canvas/visuals/link/link-visual.component.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-canvas/visuals/link/link-visual.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ import { Component, Input } from '@angular/core'; -import { CanvasLink } from '@dataservices/virtualization/view-editor/view-canvas/models'; +import { CanvasLink } from '../../../../../../dataservices/virtualization/view-editor/view-canvas/models'; @Component({ selector: '[link-visual]', diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-canvas/visuals/node/node-visual.component.ts b/ui/src/app/dataservices/virtualization/view-editor/view-canvas/visuals/node/node-visual.component.ts index 68a7cb7f..fb72c848 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-canvas/visuals/node/node-visual.component.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-canvas/visuals/node/node-visual.component.ts @@ -15,9 +15,9 @@ * limitations under the License. */ import { Component, Input } from '@angular/core'; -import { CanvasNode } from '@dataservices/virtualization/view-editor/view-canvas/models'; -import { CanvasService } from '@dataservices/virtualization/view-editor/view-canvas/canvas.service'; -import { CanvasConstants } from '@dataservices/virtualization/view-editor/view-canvas/canvas-constants'; +import { CanvasNode } from '../../../../../../dataservices/virtualization/view-editor/view-canvas/models'; +import { CanvasService } from '../../../../../../dataservices/virtualization/view-editor/view-canvas/canvas.service'; +import { CanvasConstants } from '../../../../../../dataservices/virtualization/view-editor/view-canvas/canvas-constants'; import * as _ from "lodash"; @Component({ diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-editor-header/view-editor-header.component.spec.ts b/ui/src/app/dataservices/virtualization/view-editor/view-editor-header/view-editor-header.component.spec.ts index 9eb4201b..8a1de393 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-editor-header/view-editor-header.component.spec.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-editor-header/view-editor-header.component.spec.ts @@ -2,20 +2,20 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { HttpModule } from "@angular/http"; import { FormsModule } from "@angular/forms"; import { RouterTestingModule } from "@angular/router/testing"; -import { LoggerService } from "@core/logger.service"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { ViewEditorService } from "@dataservices/virtualization/view-editor/view-editor.service"; -import { ViewEditorHeaderComponent } from '@dataservices/virtualization/view-editor/view-editor-header/view-editor-header.component'; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { MockDataserviceService } from "@dataservices/shared/mock-dataservice.service"; +import { LoggerService } from "../../../../core/logger.service"; +import { MockAppSettingsService } from "../../../../core/mock-app-settings.service"; +import { AppSettingsService } from "../../../../core/app-settings.service"; +import { ViewEditorService } from "../../../../dataservices/virtualization/view-editor/view-editor.service"; +import { ViewEditorHeaderComponent } from '../../../../dataservices/virtualization/view-editor/view-editor-header/view-editor-header.component'; +import { VdbService } from "../../../../dataservices/shared/vdb.service"; +import { MockVdbService } from "../../../../dataservices/shared/mock-vdb.service"; +import { NotifierService } from "../../../../dataservices/shared/notifier.service"; +import { DataserviceService } from "../../../../dataservices/shared/dataservice.service"; +import { MockDataserviceService } from "../../../../dataservices/shared/mock-dataservice.service"; import { TableModule } from "patternfly-ng"; -import { SelectionService } from "@core/selection.service"; +import { SelectionService } from "../../../../core/selection.service"; import { BsModalService } from "ngx-bootstrap"; -import { Dataservice } from "@dataservices/shared/dataservice.model"; +import { Dataservice } from "../../../../dataservices/shared/dataservice.model"; describe('ViewEditorHeaderComponent', () => { let component: ViewEditorHeaderComponent; diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-editor-header/view-editor-header.component.ts b/ui/src/app/dataservices/virtualization/view-editor/view-editor-header/view-editor-header.component.ts index bb46a189..ed17c4c7 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-editor-header/view-editor-header.component.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-editor-header/view-editor-header.component.ts @@ -16,7 +16,7 @@ */ import { Component, OnDestroy, OnInit, ViewEncapsulation } from "@angular/core"; -import { ViewEditorService } from "@dataservices/virtualization/view-editor/view-editor.service"; +import { ViewEditorService } from "../../../../dataservices/virtualization/view-editor/view-editor.service"; @Component({ encapsulation: ViewEncapsulation.None, @@ -46,14 +46,14 @@ export class ViewEditorHeaderComponent implements OnInit, OnDestroy { } /** - * @returns {boolean} `true` if view being edited is readonly + * @returns `true` if view being edited is readonly */ public get readOnly(): boolean { return !this.editorService.getEditorView() || this.editorService.isReadOnly(); } /** - * @returns {string} the name of the dataservice of the view being edited + * @returns the name of the dataservice of the view being edited */ public get virtualizationName(): string { const virtualization = this.editorService.getEditorVirtualization(); diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-editor.component.spec.ts b/ui/src/app/dataservices/virtualization/view-editor/view-editor.component.spec.ts index 6afbb38b..e85fefc1 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-editor.component.spec.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-editor.component.spec.ts @@ -1,24 +1,24 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from "@angular/forms"; import { RouterTestingModule } from "@angular/router/testing"; -import { ConnectionService } from "@connections/shared/connection.service"; -import { MockConnectionService } from "@connections/shared/mock-connection.service"; -import { CoreModule } from "@core/core.module"; -import { AppSettingsService } from "@core/app-settings.service"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; -import { SelectionService } from "@core/selection.service"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { ViewEditorComponent } from '@dataservices/virtualization/view-editor/view-editor.component'; -import { ViewCanvasComponent } from "@dataservices/virtualization/view-editor/view-canvas/view-canvas.component"; -import { ConnectionTableDialogComponent } from "@dataservices/virtualization/view-editor/connection-table-dialog/connection-table-dialog.component"; -import { ConnectionTreeSelectorComponent } from "@dataservices/virtualization/view-editor/connection-table-dialog/connection-tree-selector/connection-tree-selector.component"; -import { EditorViewsComponent } from "@dataservices/virtualization/view-editor/editor-views/editor-views.component"; -import { MessageLogComponent } from "@dataservices/virtualization/view-editor/editor-views/message-log/message-log.component"; -import { ViewPreviewComponent } from "@dataservices/virtualization/view-editor/editor-views/view-preview/view-preview.component"; -import { ViewEditorHeaderComponent } from "@dataservices/virtualization/view-editor/view-editor-header/view-editor-header.component"; -import { ViewPropertyEditorsComponent } from "@dataservices/virtualization/view-editor/view-property-editors/view-property-editors.component"; +import { ConnectionService } from "../../../connections/shared/connection.service"; +import { MockConnectionService } from "../../../connections/shared/mock-connection.service"; +import { CoreModule } from "../../../core/core.module"; +import { AppSettingsService } from "../../../core/app-settings.service"; +import { MockAppSettingsService } from "../../../core/mock-app-settings.service"; +import { SelectionService } from "../../../core/selection.service"; +import { MockVdbService } from "../../../dataservices/shared/mock-vdb.service"; +import { NotifierService } from "../../../dataservices/shared/notifier.service"; +import { VdbService } from "../../../dataservices/shared/vdb.service"; +import { ViewEditorComponent } from '../../../dataservices/virtualization/view-editor/view-editor.component'; +import { ViewCanvasComponent } from "../../../dataservices/virtualization/view-editor/view-canvas/view-canvas.component"; +import { ConnectionTableDialogComponent } from "../../../dataservices/virtualization/view-editor/connection-table-dialog/connection-table-dialog.component"; +import { ConnectionTreeSelectorComponent } from "../../../dataservices/virtualization/view-editor/connection-table-dialog/connection-tree-selector/connection-tree-selector.component"; +import { EditorViewsComponent } from "../../../dataservices/virtualization/view-editor/editor-views/editor-views.component"; +import { MessageLogComponent } from "../../../dataservices/virtualization/view-editor/editor-views/message-log/message-log.component"; +import { ViewPreviewComponent } from "../../../dataservices/virtualization/view-editor/editor-views/view-preview/view-preview.component"; +import { ViewEditorHeaderComponent } from "../../../dataservices/virtualization/view-editor/view-editor-header/view-editor-header.component"; +import { ViewPropertyEditorsComponent } from "../../../dataservices/virtualization/view-editor/view-property-editors/view-property-editors.component"; import { TreeModule } from "angular-tree-component"; import { TabsModule } from "ngx-bootstrap"; import { @@ -36,8 +36,8 @@ import { GraphVisualComponent, LinkVisualComponent, NodeVisualComponent -} from "@dataservices/virtualization/view-editor/view-canvas/visuals"; -import { CanvasService } from "@dataservices/virtualization/view-editor/view-canvas/canvas.service"; +} from "../../../dataservices/virtualization/view-editor/view-canvas/visuals"; +import { CanvasService } from "../../../dataservices/virtualization/view-editor/view-canvas/canvas.service"; describe('ViewEditorComponent', () => { let component: ViewEditorComponent; diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-editor.component.ts b/ui/src/app/dataservices/virtualization/view-editor/view-editor.component.ts index 4f324715..c467d7be 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-editor.component.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-editor.component.ts @@ -16,29 +16,29 @@ */ import { Component, DoCheck, OnDestroy, OnInit, TemplateRef, ViewEncapsulation } from "@angular/core"; -import { LoggerService } from "@core/logger.service"; -import { SelectionService } from "@core/selection.service"; -import { Connection } from "@connections/shared/connection.model"; -import { ConnectionService } from "@connections/shared/connection.service"; -import { DataservicesConstants } from "@dataservices/shared/dataservices-constants"; -import { ViewEditorService } from "@dataservices/virtualization/view-editor/view-editor.service"; -import { ViewEditorPart } from "@dataservices/virtualization/view-editor/view-editor-part.enum"; -import { ViewEditorEvent } from "@dataservices/virtualization/view-editor/event/view-editor-event"; -import { ViewEditorEventType } from "@dataservices/virtualization/view-editor/event/view-editor-event-type.enum"; -import { ConnectionTableDialogComponent } from "@dataservices/virtualization/view-editor/connection-table-dialog/connection-table-dialog.component"; -import { ViewEditorProgressChangeId } from "@dataservices/virtualization/view-editor/event/view-editor-save-progress-change-id.enum"; -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; -import { CommandFactory } from "@dataservices/virtualization/view-editor/command/command-factory"; +import { LoggerService } from "../../../core/logger.service"; +import { SelectionService } from "../../../core/selection.service"; +import { Connection } from "../../../connections/shared/connection.model"; +import { ConnectionService } from "../../../connections/shared/connection.service"; +import { DataservicesConstants } from "../../../dataservices/shared/dataservices-constants"; +import { ViewEditorService } from "../../../dataservices/virtualization/view-editor/view-editor.service"; +import { ViewEditorPart } from "../../../dataservices/virtualization/view-editor/view-editor-part.enum"; +import { ViewEditorEvent } from "../../../dataservices/virtualization/view-editor/event/view-editor-event"; +import { ViewEditorEventType } from "../../../dataservices/virtualization/view-editor/event/view-editor-event-type.enum"; +import { ConnectionTableDialogComponent } from "../../../dataservices/virtualization/view-editor/connection-table-dialog/connection-table-dialog.component"; +import { ViewEditorProgressChangeId } from "../../../dataservices/virtualization/view-editor/event/view-editor-save-progress-change-id.enum"; +import { ViewEditorI18n } from "../../../dataservices/virtualization/view-editor/view-editor-i18n"; +import { CommandFactory } from "../../../dataservices/virtualization/view-editor/command/command-factory"; import { BsModalService } from "ngx-bootstrap"; import { Action, ActionConfig, ToolbarConfig, ToolbarView } from "patternfly-ng"; import { Subscription } from "rxjs/Subscription"; -import { Command } from "@dataservices/virtualization/view-editor/command/command"; -import { ConfirmDialogComponent } from "@shared/confirm-dialog/confirm-dialog.component"; -import { AddCompositionWizardComponent } from "@dataservices/virtualization/view-editor/add-composition-wizard/add-composition-wizard.component"; -import { AddSourcesCommand } from "@dataservices/virtualization/view-editor/command/add-sources-command"; -import { AddCompositionCommand } from "@dataservices/virtualization/view-editor/command/add-composition-command"; -import { SchemaNode } from "@connections/shared/schema-node.model"; -import { Composition } from "@dataservices/shared/composition.model"; +import { Command } from "../../../dataservices/virtualization/view-editor/command/command"; +import { ConfirmDialogComponent } from "../../../shared/confirm-dialog/confirm-dialog.component"; +import { AddCompositionWizardComponent } from "../../../dataservices/virtualization/view-editor/add-composition-wizard/add-composition-wizard.component"; +import { AddSourcesCommand } from "../../../dataservices/virtualization/view-editor/command/add-sources-command"; +import { AddCompositionCommand } from "../../../dataservices/virtualization/view-editor/command/add-composition-command"; +import { SchemaNode } from "../../../connections/shared/schema-node.model"; +import { Composition } from "../../../dataservices/shared/composition.model"; import { Router } from "@angular/router"; import { NavigationStart } from "@angular/router"; @@ -193,7 +193,7 @@ export class ViewEditorComponent implements DoCheck, OnDestroy, OnInit { } /** - * @param {ViewEditorEvent} event the event being processed + * @param event the event being processed */ public handleEditorEvent( event: ViewEditorEvent ): void { this.logger.debug( "ViewEditorComponent received event: " + event.toString() ); @@ -347,7 +347,7 @@ export class ViewEditorComponent implements DoCheck, OnDestroy, OnInit { * 'addedSources' must be an array of SchemaNodes -OR- * string of the source paths (comma delimited) - path form: "connection=aConn/schema=aSchema/table=aTable" * - * @param {string | SchemaNode} addedSources the string representation of the sources or the schema nodes of the sources + * @param addedSources the string representation of the sources or the schema nodes of the sources * being added (cannot be `null` or empty) */ private fireAddSourcesCommand(addedSources: string | SchemaNode[]): void { @@ -364,7 +364,7 @@ export class ViewEditorComponent implements DoCheck, OnDestroy, OnInit { /** * Generates the AddCompositionCommand for the supplied composition, and fires the viewEditor state change with the command. * - * @param {Composition} addedComposition the Composition being added (cannot be `null` or empty) + * @param addedComposition the Composition being added (cannot be `null` or empty) */ private fireAddCompositionCommand(addedComposition: Composition): void { const tempCmd = CommandFactory.createAddCompositionCommand( addedComposition ); @@ -492,9 +492,6 @@ export class ViewEditorComponent implements DoCheck, OnDestroy, OnInit { this.editorService.undo(); } - /** - * @returns {string} argument array from the selection string - */ private getArgs(selection?: string): string[] { if ( selection !== null ) { return selection.split(Command.identDivider); @@ -505,7 +502,7 @@ export class ViewEditorComponent implements DoCheck, OnDestroy, OnInit { /** * Callback for when a view icon is clicked on the toolbar. * - * @param {ToolbarView} toolbarView the toolbar view representing the editor configuration to display + * @param toolbarView the toolbar view representing the editor configuration to display */ public editorConfigChange( toolbarView: ToolbarView ): void { if ( toolbarView.id !== this.editorService.getEditorConfig() ) { @@ -514,7 +511,7 @@ export class ViewEditorComponent implements DoCheck, OnDestroy, OnInit { } /** - * @returns {string} the current CSS type of the editor + * @returns the current CSS type of the editor */ public get editorCssType(): string { return this.editorService.getEditorConfig(); @@ -523,17 +520,16 @@ export class ViewEditorComponent implements DoCheck, OnDestroy, OnInit { /** * Callback for when the toolbar is configured. * - * @param {TemplateRef} addSourceTemplate the template for the add source toolbar button - * @param {TemplateRef} addCompositionTemplate the template for the add composition toolbar button - * @param {TemplateRef} sampleDataTemplate the template for the sample data toolbar button - * @param {TemplateRef} undoTemplate the template for the undo toolbar button - * @param {TemplateRef} redoTemplate the template for the redo toolbar button - * @param {TemplateRef} saveTemplate the template for the save toolbar button - * @param {TemplateRef} deleteTemplate the template for the delete toolbar button - * @param {TemplateRef} errorsTemplate the template for the show errors toolbar button - * @param {TemplateRef} warningsTemplate the template for the show warnings toolbar button - * @param {TemplateRef} infosTemplate the template for the show infos toolbar button - * @returns {ActionConfig} + * @param addSourceTemplate the template for the add source toolbar button + * @param addCompositionTemplate the template for the add composition toolbar button + * @param sampleDataTemplate the template for the sample data toolbar button + * @param undoTemplate the template for the undo toolbar button + * @param redoTemplate the template for the redo toolbar button + * @param saveTemplate the template for the save toolbar button + * @param deleteTemplate the template for the delete toolbar button + * @param errorsTemplate the template for the show errors toolbar button + * @param warningsTemplate the template for the show warnings toolbar button + * @param infosTemplate the template for the show infos toolbar button */ public getActionConfig( addSourceTemplate: TemplateRef< any >, addCompositionTemplate: TemplateRef< any >, @@ -632,7 +628,7 @@ export class ViewEditorComponent implements DoCheck, OnDestroy, OnInit { /** * Callback for when a toolbar button is clicked. * - * @param {Action} action the toolbar action that was clicked + * @param action the toolbar action that was clicked */ public handleAction( action: Action ): void { switch ( action.id ) { @@ -686,21 +682,21 @@ export class ViewEditorComponent implements DoCheck, OnDestroy, OnInit { } /** - * @returns {number} the number of error messages + * @returns the number of error messages */ public get errorMsgCount(): number { return this.editorService.getErrorMessageCount(); } /** - * @returns {number} the number of warning messages + * @returns the number of warning messages */ public get warningMsgCount(): number { return this.editorService.getWarningMessageCount(); } /** - * @returns {number} the number of informational messages + * @returns the number of informational messages */ public get infoMsgCount(): number { return this.editorService.getInfoMessageCount(); @@ -709,7 +705,7 @@ export class ViewEditorComponent implements DoCheck, OnDestroy, OnInit { /** * Indicates if the results area should be shown. * - * @returns {boolean} `true` if area should be shown + * @returns `true` if area should be shown */ public get isShowingAdditionalViews(): boolean { return this.editorCssType === this.viewsOnlyCssType || this.editorCssType === this.fullEditorCssType; @@ -718,7 +714,7 @@ export class ViewEditorComponent implements DoCheck, OnDestroy, OnInit { /** * Indicates if the canvas and properties areas should be shown. * - * @returns {boolean} `true` if areas should be shown + * @returns `true` if areas should be shown */ public get isShowingCanvas(): boolean { return this.editorCssType === this.canvasOnlyCssType || this.editorCssType === this.fullEditorCssType; @@ -727,7 +723,7 @@ export class ViewEditorComponent implements DoCheck, OnDestroy, OnInit { /** * Indicates if the canvas has a single source selected * - * @returns {boolean} `true` if canvas has single source selection + * @returns `true` if canvas has single source selection */ public get canvasSingleSourceSelected(): boolean { const selections = this.editorService.getSelection(); diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-editor.service.spec.ts b/ui/src/app/dataservices/virtualization/view-editor/view-editor.service.spec.ts index 7b6ce613..d0c01f49 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-editor.service.spec.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-editor.service.spec.ts @@ -1,15 +1,15 @@ import { TestBed, inject } from '@angular/core/testing'; import { HttpModule } from "@angular/http"; -import { LoggerService } from "@core/logger.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { ViewEditorService } from '@dataservices/virtualization/view-editor/view-editor.service'; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { MockDataserviceService } from "@dataservices/shared/mock-dataservice.service"; -import { SelectionService } from "@core/selection.service"; +import { LoggerService } from "../../../core/logger.service"; +import { AppSettingsService } from "../../../core/app-settings.service"; +import { MockAppSettingsService } from "../../../core/mock-app-settings.service"; +import { VdbService } from "../../../dataservices/shared/vdb.service"; +import { MockVdbService } from "../../../dataservices/shared/mock-vdb.service"; +import { NotifierService } from "../../../dataservices/shared/notifier.service"; +import { ViewEditorService } from '../../../dataservices/virtualization/view-editor/view-editor.service'; +import { DataserviceService } from "../../../dataservices/shared/dataservice.service"; +import { MockDataserviceService } from "../../../dataservices/shared/mock-dataservice.service"; +import { SelectionService } from "../../../core/selection.service"; describe('ViewEditorService', () => { beforeEach(() => { diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-editor.service.ts b/ui/src/app/dataservices/virtualization/view-editor/view-editor.service.ts index 1fb28f30..210adb24 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-editor.service.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-editor.service.ts @@ -16,44 +16,42 @@ */ import { EventEmitter, Injectable, Output } from "@angular/core"; -import { LoggerService } from "@core/logger.service"; -import { Dataservice } from "@dataservices/shared/dataservice.model"; -import { QueryResults } from "@dataservices/shared/query-results.model"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { ViewValidator } from "@dataservices/virtualization/view-editor/view-validator"; -import { ViewEditorPart } from "@dataservices/virtualization/view-editor/view-editor-part.enum"; -import { Message } from "@dataservices/virtualization/view-editor/editor-views/message-log/message"; -import { ViewEditorEvent } from "@dataservices/virtualization/view-editor/event/view-editor-event"; -import { ViewEditorEventType } from "@dataservices/virtualization/view-editor/event/view-editor-event-type.enum"; -import { ViewEditorProgressChangeId } from "@dataservices/virtualization/view-editor/event/view-editor-save-progress-change-id.enum"; -import { VdbsConstants } from "@dataservices/shared/vdbs-constants"; -import { Command } from "@dataservices/virtualization/view-editor/command/command"; -import { UpdateViewDescriptionCommand } from "@dataservices/virtualization/view-editor/command/update-view-description-command"; -import { UpdateViewNameCommand } from "@dataservices/virtualization/view-editor/command/update-view-name-command"; -import { AddSourcesCommand } from "@dataservices/virtualization/view-editor/command/add-sources-command"; -import { RemoveSourcesCommand } from "@dataservices/virtualization/view-editor/command/remove-sources-command"; -import { UndoManager } from "@dataservices/virtualization/view-editor/command/undo-redo/undo-manager"; -import { CommandFactory } from "@dataservices/virtualization/view-editor/command/command-factory"; -import { Undoable } from "@dataservices/virtualization/view-editor/command/undo-redo/undoable"; -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; -import { AddCompositionCommand } from "@dataservices/virtualization/view-editor/command/add-composition-command"; -import { RemoveCompositionCommand } from "@dataservices/virtualization/view-editor/command/remove-composition-command"; -import { ViewDefinition } from "@dataservices/shared/view-definition.model"; -import { ViewEditorState } from "@dataservices/shared/view-editor-state.model"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { SelectionService } from "@core/selection.service"; -import { CommandType } from "@dataservices/virtualization/view-editor/command/command-type.enum"; -import { NoOpCommand } from "@dataservices/virtualization/view-editor/command/no-op-command"; -import { UpdateProjectedColumnsCommand } from "@dataservices/virtualization/view-editor/command/update-projected-columns-command"; -import { ProjectedColumn } from "@dataservices/shared/projected-column.model"; +import { LoggerService } from "../../../core/logger.service"; +import { Dataservice } from "../../../dataservices/shared/dataservice.model"; +import { QueryResults } from "../../../dataservices/shared/query-results.model"; +import { VdbService } from "../../../dataservices/shared/vdb.service"; +import { ViewValidator } from "../../../dataservices/virtualization/view-editor/view-validator"; +import { ViewEditorPart } from "../../../dataservices/virtualization/view-editor/view-editor-part.enum"; +import { Message } from "../../../dataservices/virtualization/view-editor/editor-views/message-log/message"; +import { ViewEditorEvent } from "../../../dataservices/virtualization/view-editor/event/view-editor-event"; +import { ViewEditorEventType } from "../../../dataservices/virtualization/view-editor/event/view-editor-event-type.enum"; +import { ViewEditorProgressChangeId } from "../../../dataservices/virtualization/view-editor/event/view-editor-save-progress-change-id.enum"; +import { VdbsConstants } from "../../../dataservices/shared/vdbs-constants"; +import { Command } from "../../../dataservices/virtualization/view-editor/command/command"; +import { UpdateViewDescriptionCommand } from "../../../dataservices/virtualization/view-editor/command/update-view-description-command"; +import { UpdateViewNameCommand } from "../../../dataservices/virtualization/view-editor/command/update-view-name-command"; +import { AddSourcesCommand } from "../../../dataservices/virtualization/view-editor/command/add-sources-command"; +import { RemoveSourcesCommand } from "../../../dataservices/virtualization/view-editor/command/remove-sources-command"; +import { UndoManager } from "../../../dataservices/virtualization/view-editor/command/undo-redo/undo-manager"; +import { CommandFactory } from "../../../dataservices/virtualization/view-editor/command/command-factory"; +import { Undoable } from "../../../dataservices/virtualization/view-editor/command/undo-redo/undoable"; +import { ViewEditorI18n } from "../../../dataservices/virtualization/view-editor/view-editor-i18n"; +import { AddCompositionCommand } from "../../../dataservices/virtualization/view-editor/command/add-composition-command"; +import { RemoveCompositionCommand } from "../../../dataservices/virtualization/view-editor/command/remove-composition-command"; +import { ViewDefinition } from "../../../dataservices/shared/view-definition.model"; +import { ViewEditorState } from "../../../dataservices/shared/view-editor-state.model"; +import { DataserviceService } from "../../../dataservices/shared/dataservice.service"; +import { SelectionService } from "../../../core/selection.service"; +import { CommandType } from "../../../dataservices/virtualization/view-editor/command/command-type.enum"; +import { NoOpCommand } from "../../../dataservices/virtualization/view-editor/command/no-op-command"; +import { UpdateProjectedColumnsCommand } from "../../../dataservices/virtualization/view-editor/command/update-projected-columns-command"; +import { ProjectedColumn } from "../../../dataservices/shared/projected-column.model"; @Injectable() export class ViewEditorService { /** * An event fired when the state of the service has changed. - * - * @type {EventEmitter} */ @Output() public editorEvent: EventEmitter< ViewEditorEvent > = new EventEmitter(); @@ -88,8 +86,8 @@ export class ViewEditorService { } /** - * @param {Message} msg the message being added - * @param {ViewEditorPart} source the source that is adding the message + * @param msg the message being added + * @param source the source that is adding the message */ public addMessage( msg: Message, source: ViewEditorPart ): void { @@ -109,14 +107,14 @@ export class ViewEditorService { } /** - * @returns {boolean} `true` if there is an available undo action + * @returns `true` if there is an available undo action */ public canRedo(): boolean { return !this.isReadOnly() && this._undoMgr.canRedo(); } /** - * @returns {boolean} `true` if there is an available redo action + * @returns `true` if there is an available redo action */ public canUndo(): boolean { return !this.isReadOnly() && this._undoMgr.canUndo(); @@ -125,8 +123,8 @@ export class ViewEditorService { /** * Clears all log messages. * - * @param {ViewEditorPart} source the source that is deleting the message - * @param {string} context an optional context + * @param source the source that is deleting the message + * @param context an optional context */ public clearMessages( source: ViewEditorPart, context?: string ): void { @@ -143,8 +141,8 @@ export class ViewEditorService { } /** - * @param {string} msgId the ID of the message being deleted - * @param {ViewEditorPart} source the source that is deleting the message + * @param msgId the ID of the message being deleted + * @param source the source that is deleting the message */ public deleteMessage( msgId: string, source: ViewEditorPart ): void { @@ -168,7 +166,7 @@ export class ViewEditorService { } /** - * @param {ViewEditorEvent} event the event to broadcast + * @param event the event to broadcast */ public fire( event: ViewEditorEvent ): void { this._logger.debug( "[ViewEditorService.fire] firing event: " + event ); @@ -186,8 +184,8 @@ export class ViewEditorService { /** * Fires a `ViewEditorEventType.VIEW_STATE_CHANGED`. * - * @param {ViewEditorPart} source the source of the event - * @param {Command} command the command that was executed on the view being edited + * @param source the source of the event + * @param command the command that was executed on the view being edited */ public fireViewStateHasChanged( source: ViewEditorPart, command: Command ): void { @@ -207,15 +205,15 @@ export class ViewEditorService { } /** - * @returns {string} the editor's CSS class + * @returns the editor's CSS class */ public getEditorConfig(): string { return this._editorConfig; } /** - * @param {string} viewName the view name - * @returns {string} the ID used to persist the editor state + * @param viewName the view name + * @returns the ID used to persist the editor state */ private getEditorStateId(viewName: string): string { const serviceVdbName = this._editorVirtualization.getServiceVdbName().toLowerCase(); @@ -223,70 +221,70 @@ export class ViewEditorService { } /** - * @returns {ViewDefinition} the view being edited or `null` if not set + * @returns the view being edited or `null` if not set */ public getEditorView(): ViewDefinition { return this._editorView; } /** - * @returns {Dataservice} the virtualization of the view being edited or `null` if not set + * @returns the virtualization of the view being edited or `null` if not set */ public getEditorVirtualization(): Dataservice { return this._editorVirtualization; } /** - * @returns {number} the number of error messages + * @returns the number of error messages */ public getErrorMessageCount(): number { return this._errorMsgCount; } /** - * @returns {Message[]} the error messages + * @returns the error messages */ public getErrorMessages(): Message[] { return this._messages.filter( ( msg ) => msg.isError() ); } /** - * @returns {number} the number of informational messages + * @returns the number of informational messages */ public getInfoMessageCount(): number { return this._infoMsgCount; } /** - * @returns {Message[]} the informational messages + * @returns the informational messages */ public getInfoMessages(): Message[] { return this._messages.filter( ( msg ) => msg.isInfo() ); } /** - * @returns {number} the message count (includes error, warning, and info messages) + * @returns the message count (includes error, warning, and info messages) */ public getMessageCount(): number { return this.getMessages().length; } /** - * @returns {Message[]} the log messages (error, warning, and info) + * @returns the log messages (error, warning, and info) */ public getMessages(): Message[] { return this._messages; } /** - * @returns {string} the preview sql + * @returns the preview sql */ public getPreviewSql(): string { return this._previewSql; } /** - * @returns {QueryResults} the preview results or `null` if not set + * @returns the preview results or `null` if not set */ public getPreviewResults(): QueryResults { return this._previewResults; @@ -295,7 +293,7 @@ export class ViewEditorService { /** * A label that changes dynamically based on the next available redo command. * - * @returns {string} a short description suitable for use in a redo action + * @returns a short description suitable for use in a redo action */ public getRedoActionTooltip(): string { return this._undoMgr.redoLabel(); @@ -304,28 +302,28 @@ export class ViewEditorService { /** * A label that changes dynamically based on the next available undo command. * - * @returns {string} a short description suitable for use in an undo action + * @returns a short description suitable for use in an undo action */ public getUndoActionTooltip(): string { return this._undoMgr.undoLabel(); } /** - * @returns {number} the number of warning messages + * @returns the number of warning messages */ public getWarningMessageCount(): number { return this._warningMsgCount; } /** - * @returns {Message[]} the warning messages + * @returns the warning messages */ public getWarningMessages(): Message[] { return this._messages.filter( ( msg ) => msg.isWarning() ); } /** - * @returns {boolean} `true` if the editor has unsaved changes + * @returns `true` if the editor has unsaved changes */ public hasChanges(): boolean { let hasChanged = false; @@ -336,14 +334,14 @@ export class ViewEditorService { } /** - * @returns {boolean} `true` if the editor view can be saved + * @returns `true` if the editor view can be saved */ public canSaveView(): boolean { return this._editorView && this._editorView.getName() && this._editorView.getName().length > 0; } /** - * @returns {boolean} `true` if editor is readonly or has not been set + * @returns `true` if editor is readonly or has not been set */ public isReadOnly(): boolean { return this._readOnly; @@ -480,7 +478,7 @@ export class ViewEditorService { * Sets the view being edited. This is called when the editor is first constructed and can only be called once. * Subsequent calls are ignored. * - * @param {string} newCssClass the editor's CSS class + * @param newCssClass the editor's CSS class */ public setEditorConfig( newCssClass: string ): void { if ( this._editorConfig !== newCssClass ) { @@ -493,8 +491,8 @@ export class ViewEditorService { * Sets the view being edited. This should only be called once. Subsequent calls are ignored. Fires a * `ViewEditorEventType.VIEW_CHANGED` event having the view definition as an argument. * - * @param {ViewDefinition} viewDefn the view definition being edited - * @param {ViewEditorPart} source the source making the update + * @param viewDefn the view definition being edited + * @param source the source making the update */ public setEditorView( viewDefn: ViewDefinition, source: ViewEditorPart ): void { @@ -516,7 +514,7 @@ export class ViewEditorService { * Sets the virtualization whose view is being edited. This is called when the editor is first constructed and can * only be called once. Subsequent calls are ignored. * - * @param {Dataservice} virtualization the virtualization of the view being edited + * @param virtualization the virtualization of the view being edited */ public setEditorVirtualization( virtualization: Dataservice ): void { if ( !this._editorVirtualization ) { @@ -593,9 +591,9 @@ export class ViewEditorService { * Sets the preview results. Fires a `ViewEditorEventType.PREVIEW_RESULTS_CHANGED` event having the results as an * argument. * - * @param {string} sql the preview query - * @param {QueryResults} results the new preview results - * @param {ViewEditorPart} source the source making the update + * @param sql the preview query + * @param results the new preview results + * @param source the source making the update */ public setPreviewResults( sql: string, results: QueryResults, @@ -609,8 +607,8 @@ export class ViewEditorService { * Sets the readonly property of the editor. Fires a `ViewEditorEventType.READONLY_CHANGED` event having the * readonly property as an argument. * - * @param {boolean} newReadOnly the new readonly value - * @param {ViewEditorPart} source the source making the update + * @param newReadOnly the new readonly value + * @param source the source making the update */ public setReadOnly( newReadOnly: boolean, source: ViewEditorPart ): void { @@ -762,7 +760,6 @@ export class ViewEditorService { /** * Get the Command type from the selection string * @param selection the selection - * @return {CommandType} the command type */ public getSelectionCommandType(selection?: string): CommandType { let argStr = null; @@ -796,7 +793,7 @@ export class ViewEditorService { /** * Get the payload from the selection string * @param selection the selection - * @return {string} the command id + * @return the command id */ public getSelectionPayload(selection?: string): string { if (selection !== null) { diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/projected-columns-editor/projected-columns-editor.component.spec.ts b/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/projected-columns-editor/projected-columns-editor.component.spec.ts index 56a225c8..3cd384ee 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/projected-columns-editor/projected-columns-editor.component.spec.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/projected-columns-editor/projected-columns-editor.component.spec.ts @@ -2,16 +2,16 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ProjectedColumnsEditorComponent } from './projected-columns-editor.component'; import { TableModule } from "patternfly-ng"; -import { LoggerService } from "@core/logger.service"; -import { SelectionService } from "@core/selection.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { MockDataserviceService } from "@dataservices/shared/mock-dataservice.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; -import { ViewEditorService } from "@dataservices/virtualization/view-editor/view-editor.service"; +import { LoggerService } from "../../../../../core/logger.service"; +import { SelectionService } from "../../../../../core/selection.service"; +import { AppSettingsService } from "../../../../../core/app-settings.service"; +import { MockAppSettingsService } from "../../../../../core/mock-app-settings.service"; +import { DataserviceService } from "../../../../../dataservices/shared/dataservice.service"; +import { MockDataserviceService } from "../../../../../dataservices/shared/mock-dataservice.service"; +import { NotifierService } from "../../../../../dataservices/shared/notifier.service"; +import { VdbService } from "../../../../../dataservices/shared/vdb.service"; +import { MockVdbService } from "../../../../../dataservices/shared/mock-vdb.service"; +import { ViewEditorService } from "../../../../../dataservices/virtualization/view-editor/view-editor.service"; import { HttpModule } from "@angular/http"; describe('ProjectedColumnsEditorComponent', () => { diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/projected-columns-editor/projected-columns-editor.component.ts b/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/projected-columns-editor/projected-columns-editor.component.ts index 4198c63f..81a38036 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/projected-columns-editor/projected-columns-editor.component.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/projected-columns-editor/projected-columns-editor.component.ts @@ -1,20 +1,20 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { ViewEditorService } from "@dataservices/virtualization/view-editor/view-editor.service"; -import { SelectionService } from "@core/selection.service"; +import { ViewEditorService } from "../../../../../dataservices/virtualization/view-editor/view-editor.service"; +import { SelectionService } from "../../../../../core/selection.service"; import { EmptyStateConfig, TableConfig, TableEvent } from "patternfly-ng"; -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; -import { ProjectedColumn } from "@dataservices/shared/projected-column.model"; -import { CommandFactory } from "@dataservices/virtualization/view-editor/command/command-factory"; -import { Command } from "@dataservices/virtualization/view-editor/command/command"; -import { ViewEditorPart } from "@dataservices/virtualization/view-editor/view-editor-part.enum"; -import { LoggerService } from "@core/logger.service"; -import { ViewEditorEvent } from "@dataservices/virtualization/view-editor/event/view-editor-event"; +import { ViewEditorI18n } from "../../../../../dataservices/virtualization/view-editor/view-editor-i18n"; +import { ProjectedColumn } from "../../../../../dataservices/shared/projected-column.model"; +import { CommandFactory } from "../../../../../dataservices/virtualization/view-editor/command/command-factory"; +import { Command } from "../../../../../dataservices/virtualization/view-editor/command/command"; +import { ViewEditorPart } from "../../../../../dataservices/virtualization/view-editor/view-editor-part.enum"; +import { LoggerService } from "../../../../../core/logger.service"; +import { ViewEditorEvent } from "../../../../../dataservices/virtualization/view-editor/event/view-editor-event"; import { Subscription } from "rxjs/Subscription"; -import { UpdateProjectedColumnsCommand } from "@dataservices/virtualization/view-editor/command/update-projected-columns-command"; -import { AddSourcesCommand } from "@dataservices/virtualization/view-editor/command/add-sources-command"; -import { RemoveSourcesCommand } from "@dataservices/virtualization/view-editor/command/remove-sources-command"; -import { AddCompositionCommand } from "@dataservices/virtualization/view-editor/command/add-composition-command"; -import { RemoveCompositionCommand } from "@dataservices/virtualization/view-editor/command/remove-composition-command"; +import { UpdateProjectedColumnsCommand } from "../../../../../dataservices/virtualization/view-editor/command/update-projected-columns-command"; +import { AddSourcesCommand } from "../../../../../dataservices/virtualization/view-editor/command/add-sources-command"; +import { RemoveSourcesCommand } from "../../../../../dataservices/virtualization/view-editor/command/remove-sources-command"; +import { AddCompositionCommand } from "../../../../../dataservices/virtualization/view-editor/command/add-composition-command"; +import { RemoveCompositionCommand } from "../../../../../dataservices/virtualization/view-editor/command/remove-composition-command"; @Component({ selector: 'app-projected-columns-editor', @@ -88,7 +88,7 @@ export class ProjectedColumnsEditorComponent implements OnInit, OnDestroy { } /** - * @param {ViewEditorEvent} event the event being processed + * @param event the event being processed */ public handleEditorEvent( event: ViewEditorEvent ): void { this.logger.debug( "ProjectedColumnsEditor received event: " + event.toString() ); @@ -124,7 +124,7 @@ export class ProjectedColumnsEditorComponent implements OnInit, OnDestroy { /** * Initializes the projected columns - * @param {ProjectedColumn[]} prjCols the projected columns + * @param prjCols the projected columns */ private initProjectedColumns(prjCols: ProjectedColumn[]): void { this.projectedColumns = []; @@ -147,7 +147,7 @@ export class ProjectedColumnsEditorComponent implements OnInit, OnDestroy { /** * Updates the projected columns - * @param {ProjectedColumn[]} prjCols the projected columns + * @param prjCols the projected columns */ private updateProjectedColumns(prjCols: ProjectedColumn[]): void { const copyPrjCols: ProjectedColumn[] = []; @@ -189,7 +189,7 @@ export class ProjectedColumnsEditorComponent implements OnInit, OnDestroy { /** * Determine if a view has select all projected columns * - * @return {boolean} 'true' if view has select all projected columns + * @return 'true' if view has select all projected columns */ public get hasSelectAllProjectedColumns(): boolean { return this.isSelectStar(this.projectedColumns); @@ -202,7 +202,7 @@ export class ProjectedColumnsEditorComponent implements OnInit, OnDestroy { /** * Determine whether the editor has a view currently selected * - * @return {boolean} 'true' if has a view selection + * @return 'true' if has a view selection */ public get hasSelectedView(): boolean { const selView = this.editorService.getEditorView(); @@ -211,7 +211,7 @@ export class ProjectedColumnsEditorComponent implements OnInit, OnDestroy { /** * Handles change in Column selections - * @param {TableEvent} $event the column selection event + * @param $event the column selection event */ public handleColumnSelectionChange($event: TableEvent): void { // Change in projected column selections fire change event diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/property-editor/property-editor.component.spec.ts b/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/property-editor/property-editor.component.spec.ts index e49e34be..79a17404 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/property-editor/property-editor.component.spec.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/property-editor/property-editor.component.spec.ts @@ -1,17 +1,17 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { PropertyEditorComponent } from './property-editor.component'; -import { SelectionService } from "@core/selection.service"; -import { ViewEditorService } from "@dataservices/virtualization/view-editor/view-editor.service"; -import { LoggerService } from "@core/logger.service"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { MockDataserviceService } from "@dataservices/shared/mock-dataservice.service"; +import { SelectionService } from "../../../../../core/selection.service"; +import { ViewEditorService } from "../../../../../dataservices/virtualization/view-editor/view-editor.service"; +import { LoggerService } from "../../../../../core/logger.service"; +import { DataserviceService } from "../../../../../dataservices/shared/dataservice.service"; +import { MockDataserviceService } from "../../../../../dataservices/shared/mock-dataservice.service"; import { HttpModule } from "@angular/http"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; +import { VdbService } from "../../../../../dataservices/shared/vdb.service"; +import { MockVdbService } from "../../../../../dataservices/shared/mock-vdb.service"; +import { AppSettingsService } from "../../../../../core/app-settings.service"; +import { MockAppSettingsService } from "../../../../../core/mock-app-settings.service"; +import { NotifierService } from "../../../../../dataservices/shared/notifier.service"; describe('PropertyEditorComponent', () => { let component: PropertyEditorComponent; diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/property-editor/property-editor.component.ts b/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/property-editor/property-editor.component.ts index efe39eed..f0f3f34a 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/property-editor/property-editor.component.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/property-editor/property-editor.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit } from '@angular/core'; -import { ViewEditorService } from "@dataservices/virtualization/view-editor/view-editor.service"; -import { SelectionService } from "@core/selection.service"; -import { SelectionItem } from "@dataservices/virtualization/view-editor/view-property-editors/property-editor/selection-item.model"; -import { SelectionType } from "@dataservices/virtualization/view-editor/view-property-editors/property-editor/selection-type.enum"; +import { ViewEditorService } from "../../../../../dataservices/virtualization/view-editor/view-editor.service"; +import { SelectionService } from "../../../../../core/selection.service"; +import { SelectionItem } from "../../../../../dataservices/virtualization/view-editor/view-property-editors/property-editor/selection-item.model"; +import { SelectionType } from "../../../../../dataservices/virtualization/view-editor/view-property-editors/property-editor/selection-type.enum"; @Component({ selector: 'app-property-editor', @@ -32,8 +32,7 @@ export class PropertyEditorComponent implements OnInit { /** * Determine whether the editor has a view currently selected - * - * @return {boolean} 'true' if has a view selection + * @return 'true' if has a view selection */ public get hasSelectedView(): boolean { const selView = this.editorService.getEditorView(); @@ -42,7 +41,7 @@ export class PropertyEditorComponent implements OnInit { /** * Determine if the first selection item is Source type - * @return {boolean} 'true' if the first item in the list is a 'Source' + * @return 'true' if the first item in the list is a 'Source' */ public get firstSelectionIsSource(): boolean { const selectedItem = this.getFirstSelection(); @@ -51,7 +50,7 @@ export class PropertyEditorComponent implements OnInit { /** * Determine if the first selection item is Composition type - * @return {boolean} 'true' if the first item in the list is a 'Composition' + * @return 'true' if the first item in the list is a 'Composition' */ public get firstSelectionIsComposition(): boolean { const selectedItem = this.getFirstSelection(); @@ -60,7 +59,7 @@ export class PropertyEditorComponent implements OnInit { /** * Get the number of selected items - * @return {number} the number of selected items + * @return the number of selected items */ public get numberSelectedItems(): number { const selections = this.editorService.getSelection(); @@ -72,7 +71,7 @@ export class PropertyEditorComponent implements OnInit { /** * Get the first item in the selections - * @return {SelectionItem} the first item in the selection list + * @return the first item in the selection list */ public getFirstSelection(): SelectionItem { const selectedObj = new SelectionItem(this.editorService); diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/property-editor/selection-item.model.ts b/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/property-editor/selection-item.model.ts index 0528e2d7..ea5cb987 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/property-editor/selection-item.model.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/property-editor/selection-item.model.ts @@ -15,11 +15,11 @@ * limitations under the License. */ -import { CommandType } from "@dataservices/virtualization/view-editor/command/command-type.enum"; -import { ViewEditorService } from "@dataservices/virtualization/view-editor/view-editor.service"; -import { Composition } from "@dataservices/shared/composition.model"; -import { PathUtils } from "@dataservices/shared/path-utils"; -import { SelectionType } from "@dataservices/virtualization/view-editor/view-property-editors/property-editor/selection-type.enum"; +import { CommandType } from "../../../../../dataservices/virtualization/view-editor/command/command-type.enum"; +import { ViewEditorService } from "../../../../../dataservices/virtualization/view-editor/view-editor.service"; +import { Composition } from "../../../../../dataservices/shared/composition.model"; +import { PathUtils } from "../../../../../dataservices/shared/path-utils"; +import { SelectionType } from "../../../../../dataservices/virtualization/view-editor/view-property-editors/property-editor/selection-type.enum"; /** * SelectionItem model - interprets the selection string and provides the payload in object form @@ -37,7 +37,7 @@ export class SelectionItem { /** * Set the selection string - * @param {string} selection the selection + * @param selection the selection */ public setSelection( selection: string ): void { if ( !selection || selection === null ) return; @@ -58,7 +58,7 @@ export class SelectionItem { /** * Get the type of selection - * @return {SelectionType} the selection type + * @return the selection type */ public getSelectionType(): SelectionType { return this.selectionType; @@ -66,7 +66,7 @@ export class SelectionItem { /** * Get the source connection name - * @return {string} the source connection name + * @return the source connection name */ public getSourceConnectionName(): string { return PathUtils.getConnectionName(this.srcPath); @@ -74,7 +74,7 @@ export class SelectionItem { /** * Get the source name - * @return {string} the source name + * @return the source name */ public getSourceName(): string { return PathUtils.getSourceName(this.srcPath); @@ -82,7 +82,7 @@ export class SelectionItem { /** * Get the composition - * @return {Composition} the composition + * @return the composition */ public getComposition(): Composition { return this.comp; diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/view-property-editors.component.spec.ts b/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/view-property-editors.component.spec.ts index 33cbe53f..d1e5c76b 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/view-property-editors.component.spec.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/view-property-editors.component.spec.ts @@ -2,19 +2,19 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ViewPropertyEditorsComponent } from './view-property-editors.component'; import { TabsModule } from "ngx-bootstrap"; -import { ViewEditorService } from "@dataservices/virtualization/view-editor/view-editor.service"; +import { ViewEditorService } from "../../../../dataservices/virtualization/view-editor/view-editor.service"; import { HttpModule } from "@angular/http"; -import { LoggerService } from "@core/logger.service"; -import { VdbService } from "@dataservices/shared/vdb.service"; -import { MockVdbService } from "@dataservices/shared/mock-vdb.service"; -import { AppSettingsService } from "@core/app-settings.service"; -import { MockAppSettingsService } from "@core/mock-app-settings.service"; -import { NotifierService } from "@dataservices/shared/notifier.service"; -import { DataserviceService } from "@dataservices/shared/dataservice.service"; -import { MockDataserviceService } from "@dataservices/shared/mock-dataservice.service"; -import { SelectionService } from "@core/selection.service"; -import { PropertyEditorComponent } from "@dataservices/virtualization/view-editor/view-property-editors/property-editor/property-editor.component"; -import { ProjectedColumnsEditorComponent } from "@dataservices/virtualization/view-editor/view-property-editors/projected-columns-editor/projected-columns-editor.component"; +import { LoggerService } from "../../../../core/logger.service"; +import { VdbService } from "../../../../dataservices/shared/vdb.service"; +import { MockVdbService } from "../../../../dataservices/shared/mock-vdb.service"; +import { AppSettingsService } from "../../../../core/app-settings.service"; +import { MockAppSettingsService } from "../../../../core/mock-app-settings.service"; +import { NotifierService } from "../../../../dataservices/shared/notifier.service"; +import { DataserviceService } from "../../../../dataservices/shared/dataservice.service"; +import { MockDataserviceService } from "../../../../dataservices/shared/mock-dataservice.service"; +import { SelectionService } from "../../../../core/selection.service"; +import { PropertyEditorComponent } from "../../../../dataservices/virtualization/view-editor/view-property-editors/property-editor/property-editor.component"; +import { ProjectedColumnsEditorComponent } from "../../../../dataservices/virtualization/view-editor/view-property-editors/projected-columns-editor/projected-columns-editor.component"; import { TableModule } from "patternfly-ng"; describe('ViewPropertyEditorsComponent', () => { diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/view-property-editors.component.ts b/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/view-property-editors.component.ts index 472257c6..20715809 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/view-property-editors.component.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-property-editors/view-property-editors.component.ts @@ -16,10 +16,10 @@ */ import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; -import { LoggerService } from "@core/logger.service"; -import { ViewEditorI18n } from "@dataservices/virtualization/view-editor/view-editor-i18n"; -import { ViewEditorService } from "@dataservices/virtualization/view-editor/view-editor.service"; -import { ViewEditorEvent } from "@dataservices/virtualization/view-editor/event/view-editor-event"; +import { LoggerService } from "../../../../core/logger.service"; +import { ViewEditorI18n } from "../../../../dataservices/virtualization/view-editor/view-editor-i18n"; +import { ViewEditorService } from "../../../../dataservices/virtualization/view-editor/view-editor.service"; +import { ViewEditorEvent } from "../../../../dataservices/virtualization/view-editor/event/view-editor-event"; import { Subscription } from "rxjs/Subscription"; import 'dragula/dist/dragula.css'; @@ -62,7 +62,7 @@ export class ViewPropertyEditorsComponent implements OnInit, OnDestroy { } /** - * @param {ViewEditorEvent} event the event being processed + * @param event the event being processed */ public handleEditorEvent( event: ViewEditorEvent ): void { this.logger.debug( "ViewPropertyEditorsComponent received event: " + event.toString() ); diff --git a/ui/src/app/dataservices/virtualization/view-editor/view-validator.ts b/ui/src/app/dataservices/virtualization/view-editor/view-validator.ts index 1a2a6d75..18089f76 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/view-validator.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/view-validator.ts @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { Message } from "@dataservices/virtualization/view-editor/editor-views/message-log/message"; -import { Problem } from "@dataservices/virtualization/view-editor/editor-views/message-log/problem"; -import { ViewDefinition } from "@dataservices/shared/view-definition.model"; -import { Composition } from "@dataservices/shared/composition.model"; +import { Message } from "../../../dataservices/virtualization/view-editor/editor-views/message-log/message"; +import { Problem } from "../../../dataservices/virtualization/view-editor/editor-views/message-log/problem"; +import { ViewDefinition } from "../../../dataservices/shared/view-definition.model"; +import { Composition } from "../../../dataservices/shared/composition.model"; export class ViewValidator { /** * Validates the stated of the specified view definition. * - * @param {ViewDefinition} viewDefn the view definition whose state is being validated. - * @returns {Message[]} the validation messages (never `null` but can be empty) + * @param viewDefn the view definition whose state is being validated. + * @returns the validation messages (never `null` but can be empty) */ public static validate( viewDefn: ViewDefinition ): Message[] { const messages: Message[] = []; diff --git a/ui/src/app/dataservices/virtualization/view-editor/views-list/views-list.component.spec.ts b/ui/src/app/dataservices/virtualization/view-editor/views-list/views-list.component.spec.ts index 50ea4c2c..ef548791 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/views-list/views-list.component.spec.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/views-list/views-list.component.spec.ts @@ -1,22 +1,22 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ViewsListComponent } from './views-list.component'; -import {SelectionService} from "@core/selection.service"; -import {Dataservice} from "@dataservices/shared/dataservice.model"; -import {ViewEditorService} from "@dataservices/virtualization/view-editor/view-editor.service"; -import {MockAppSettingsService} from "@core/mock-app-settings.service"; -import {LoggerService} from "@core/logger.service"; -import {AppSettingsService} from "@core/app-settings.service"; -import {DataserviceService} from "@dataservices/shared/dataservice.service"; -import {MockVdbService} from "@dataservices/shared/mock-vdb.service"; -import {BsModalService, ComponentLoaderFactory} from "ngx-bootstrap"; -import {MockDataserviceService} from "@dataservices/shared/mock-dataservice.service"; -import {NotifierService} from "@dataservices/shared/notifier.service"; -import {VdbService} from "@dataservices/shared/vdb.service"; -import {HttpModule} from "@angular/http"; -import {FormsModule} from "@angular/forms"; -import {TableModule} from "patternfly-ng"; -import {RouterTestingModule} from "@angular/router/testing"; +import { SelectionService } from "../../../../core/selection.service"; +import { Dataservice } from "../../../../dataservices/shared/dataservice.model"; +import { ViewEditorService } from "../../../../dataservices/virtualization/view-editor/view-editor.service"; +import { MockAppSettingsService } from "../../../../core/mock-app-settings.service"; +import { LoggerService } from "../../../../core/logger.service"; +import { AppSettingsService } from "../../../../core/app-settings.service"; +import { DataserviceService } from "../../../../dataservices/shared/dataservice.service"; +import { MockVdbService } from "../../../../dataservices/shared/mock-vdb.service"; +import { BsModalService, ComponentLoaderFactory } from "ngx-bootstrap"; +import { MockDataserviceService } from "../../../../dataservices/shared/mock-dataservice.service"; +import { NotifierService } from "../../../../dataservices/shared/notifier.service"; +import { VdbService } from "../../../../dataservices/shared/vdb.service"; +import { HttpModule } from "@angular/http"; +import { FormsModule } from "@angular/forms"; +import { TableModule } from "patternfly-ng"; +import { RouterTestingModule } from "@angular/router/testing"; describe('ViewsListComponent', () => { let component: ViewsListComponent; diff --git a/ui/src/app/dataservices/virtualization/view-editor/views-list/views-list.component.ts b/ui/src/app/dataservices/virtualization/view-editor/views-list/views-list.component.ts index 1a67a828..c482c522 100644 --- a/ui/src/app/dataservices/virtualization/view-editor/views-list/views-list.component.ts +++ b/ui/src/app/dataservices/virtualization/view-editor/views-list/views-list.component.ts @@ -14,27 +14,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {AfterViewInit, Component, OnDestroy, OnInit, ViewEncapsulation} from '@angular/core'; -import {LoadingState} from "@shared/loading-state.enum"; -import {ViewDefinition} from "@dataservices/shared/view-definition.model"; -import {ViewEditorPart} from "@dataservices/virtualization/view-editor/view-editor-part.enum"; -import {EmptyStateConfig, NgxDataTableConfig, TableConfig} from "patternfly-ng"; -import {ViewEditorI18n} from "@dataservices/virtualization/view-editor/view-editor-i18n"; -import {ViewEditorProgressChangeId} from "@dataservices/virtualization/view-editor/event/view-editor-save-progress-change-id.enum"; -import {ViewEditorState} from "@dataservices/shared/view-editor-state.model"; -import {ViewEditorService} from "@dataservices/virtualization/view-editor/view-editor.service"; -import {Dataservice} from "@dataservices/shared/dataservice.model"; -import {LoggerService} from "@core/logger.service"; -import {ViewEditorEvent} from "@dataservices/virtualization/view-editor/event/view-editor-event"; -import {Subscription} from "rxjs/Subscription"; -import {BsModalService} from "ngx-bootstrap"; -import {DataserviceService} from "@dataservices/shared/dataservice.service"; -import {SelectionService} from "@core/selection.service"; -import {ConfirmDialogComponent} from "@shared/confirm-dialog/confirm-dialog.component"; -import {CommandFactory} from "@dataservices/virtualization/view-editor/command/command-factory"; -import {Command} from "@dataservices/virtualization/view-editor/command/command"; -import {CreateViewDialogComponent} from "@dataservices/virtualization/view-editor/create-view-dialog/create-view-dialog.component"; -import {ChangeDetectorRef} from "@angular/core"; +import { AfterViewInit, Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; +import { LoadingState } from "../../../../shared/loading-state.enum"; +import { ViewDefinition } from "../../../../dataservices/shared/view-definition.model"; +import { ViewEditorPart } from "../../../../dataservices/virtualization/view-editor/view-editor-part.enum"; +import { EmptyStateConfig, NgxDataTableConfig, TableConfig } from "patternfly-ng"; +import { ViewEditorI18n } from "../../../../dataservices/virtualization/view-editor/view-editor-i18n"; +import { ViewEditorProgressChangeId } from "../../../../dataservices/virtualization/view-editor/event/view-editor-save-progress-change-id.enum"; +import { ViewEditorState } from "../../../../dataservices/shared/view-editor-state.model"; +import { ViewEditorService } from "../../../../dataservices/virtualization/view-editor/view-editor.service"; +import { Dataservice } from "../../../../dataservices/shared/dataservice.model"; +import { LoggerService } from "../../../../core/logger.service"; +import { ViewEditorEvent } from "../../../../dataservices/virtualization/view-editor/event/view-editor-event"; +import { Subscription } from "rxjs/Subscription"; +import { BsModalService } from "ngx-bootstrap"; +import { DataserviceService } from "../../../../dataservices/shared/dataservice.service"; +import { SelectionService } from "../../../../core/selection.service"; +import { ConfirmDialogComponent } from "../../../../shared/confirm-dialog/confirm-dialog.component"; +import { CommandFactory } from "../../../../dataservices/virtualization/view-editor/command/command-factory"; +import { Command } from "../../../../dataservices/virtualization/view-editor/command/command"; +import { CreateViewDialogComponent } from "../../../../dataservices/virtualization/view-editor/create-view-dialog/create-view-dialog.component"; +import { ChangeDetectorRef } from "@angular/core"; @Component({ encapsulation: ViewEncapsulation.None, @@ -80,7 +80,7 @@ export class ViewsListComponent implements OnInit, OnDestroy, AfterViewInit { } /** - * @param {ViewEditorEvent} event the event being processed + * @param event the event being processed */ public handleEditorEvent( event: ViewEditorEvent ): void { this.logger.debug( "ViewsListComponent received event: " + event.toString() ); @@ -188,7 +188,7 @@ export class ViewsListComponent implements OnInit, OnDestroy, AfterViewInit { initialView = self.tableRows.find((x) => x.getName() === selectedView.getName()); } self.viewsLoadingState = LoadingState.LOADED_VALID; - if( initialView !== null) { + if ( initialView !== null) { self.selectView(initialView); } }, @@ -201,14 +201,14 @@ export class ViewsListComponent implements OnInit, OnDestroy, AfterViewInit { } /** - * @returns {boolean} `true` if view being edited is readonly + * @returns `true` if view being edited is readonly */ public get readOnly(): boolean { return !this.editorService.getEditorView() || this.editorService.isReadOnly(); } /** - * @returns {boolean} `true` if views are being loaded + * @returns `true` if views are being loaded */ public get viewsLoading(): boolean { return this.viewsLoadingState === LoadingState.LOADING; @@ -292,9 +292,9 @@ export class ViewsListComponent implements OnInit, OnDestroy, AfterViewInit { /** * Construct id for the editor state - * @param {Dataservice} dataservice the dataservice - * @param {ViewDefinition} viewDefn the view definition - * @returns {string} the ID used to persist the editor state + * @param dataservice the dataservice + * @param viewDefn the view definition + * @returns the ID used to persist the editor state */ private getEditorStateId(dataservice: Dataservice, viewDefn: ViewDefinition): string { return dataservice.getServiceVdbName().toLowerCase() + "." + viewDefn.getName(); @@ -302,7 +302,7 @@ export class ViewsListComponent implements OnInit, OnDestroy, AfterViewInit { /** * Handle Delete of the selected View - * @param {string} viewName + * @param viewName */ public onDeleteView( ): void { const viewName = this.getSelectedView().getName(); @@ -325,7 +325,7 @@ export class ViewsListComponent implements OnInit, OnDestroy, AfterViewInit { /** * Deletes the specified ViewEditorState from the userProfile, and removes ViewDefinition from the current list. - * @param {string} viewDefnName the name of the view + * @param viewDefnName the name of the view */ private doDeleteView(viewDefnName: string): void { const selectedViewDefn = this.tableRows.find((x) => x.getName() === viewDefnName); @@ -356,7 +356,7 @@ export class ViewsListComponent implements OnInit, OnDestroy, AfterViewInit { /* * Add the specified ViewDefinition to the view definitions table - * @param {ViewDefinition} viewDefn the view definition to add + * @param viewDefn the view definition to add */ private addViewDefinitionToList(viewDefn: ViewDefinition): void { const newRows: ViewDefinition[] = []; @@ -376,7 +376,7 @@ export class ViewsListComponent implements OnInit, OnDestroy, AfterViewInit { /* * Remove the specified ViewDefinition from the view definitions table - * @param {ViewDefinition} viewDefn the view definition to remove + * @param viewDefn the view definition to remove */ private removeViewDefinitionFromList(viewDefn: ViewDefinition): void { const origIndex = this.tableRows.findIndex( ( defn ) => defn.getName() === viewDefn.getName() ); @@ -429,7 +429,7 @@ export class ViewsListComponent implements OnInit, OnDestroy, AfterViewInit { } /** - * @returns {string} the view description + * @returns the view description */ public get viewDescription(): string { if ( this.editorService.getEditorView() ) { @@ -440,7 +440,7 @@ export class ViewsListComponent implements OnInit, OnDestroy, AfterViewInit { } /** - * @param {string} newDescription the new description + * @param newDescription the new description */ public set viewDescription( newDescription: string ) { if ( this.editorService.getEditorView() ) { @@ -464,7 +464,7 @@ export class ViewsListComponent implements OnInit, OnDestroy, AfterViewInit { /** * Called when text in the view description textarea changes. * - * @param {string} newDescription the new description of the view + * @param newDescription the new description of the view */ public viewDescriptionChanged( newDescription: string ): void { this.viewDescription = newDescription; diff --git a/ui/src/app/shared/abstract-page.component.ts b/ui/src/app/shared/abstract-page.component.ts index 94feca48..cc17b481 100644 --- a/ui/src/app/shared/abstract-page.component.ts +++ b/ui/src/app/shared/abstract-page.component.ts @@ -18,7 +18,7 @@ import { OnInit } from "@angular/core"; import { Response } from "@angular/http"; import { ActivatedRoute } from "@angular/router"; -import { LoggerService } from "@core/logger.service"; +import { LoggerService } from "../core/logger.service"; import "rxjs/add/observable/combineLatest"; import { Observable } from "rxjs/Observable"; @@ -31,8 +31,8 @@ export abstract class AbstractPageComponent implements OnInit { /** * C'tor. - * @param {ActivatedRoute} route - * @param {LoggerService} logger the logging service + * @param route + * @param logger the logging service */ protected constructor(route: ActivatedRoute, logger: LoggerService) { this.route = route; @@ -91,7 +91,6 @@ export abstract class AbstractPageComponent implements OnInit { /** * Called to determine whether some page data has been loaded yet. * @param key - * @return {boolean} */ public isLoaded(key: string): boolean { return !!this.dataLoaded[ key ]; diff --git a/ui/src/app/shared/id-filter.ts b/ui/src/app/shared/id-filter.ts index 0c958b13..4b628d9e 100644 --- a/ui/src/app/shared/id-filter.ts +++ b/ui/src/app/shared/id-filter.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { Identifiable } from "@shared/identifiable"; +import { Identifiable } from "../shared/identifiable"; const emptyPattern = ""; @@ -32,8 +32,8 @@ export class IdFilter { } /** - * @param {Identifiable} obj the object whose ID is being compared to the filter - * @returns {boolean} true if the ID matches the filter + * @param obj the object whose ID is being compared to the filter + * @returns true if the ID matches the filter */ public accepts( obj: Identifiable< string > ): boolean { if ( this.pattern === emptyPattern ) { @@ -45,7 +45,7 @@ export class IdFilter { } /** - * @returns {string} the pattern being matched to + * @returns the pattern being matched to */ public getPattern(): string { return this.pattern; @@ -60,7 +60,7 @@ export class IdFilter { } /** - * @param {string} pattern the pattern to match IDs with (can be empty or null) + * @param pattern the pattern to match IDs with (can be empty or null) */ public setFilter( pattern?: string ): void { if ( pattern ) { diff --git a/ui/src/app/shared/identifiable.ts b/ui/src/app/shared/identifiable.ts index a1480cf9..d846cdee 100644 --- a/ui/src/app/shared/identifiable.ts +++ b/ui/src/app/shared/identifiable.ts @@ -21,16 +21,11 @@ export interface Identifiable< T > { /** - * @typedef { object } T the type of the property that is used to identify the object - * @param {Identifiable} that the object being compared to - * @returns {number} 0 if IDs are equal, -1 if this ID is less than, or 1 if this ID is greater than + * @param that the object being compared to + * @returns 0 if IDs are equal, -1 if this ID is less than, or 1 if this ID is greater than */ compareTo( that: Identifiable< T > ): number; - /** - * @typedef { object } T the type of the property that is used to identify the object - * @returns {T} the object identifier (can be null) - */ getId(): T; } diff --git a/ui/src/app/shared/page-error/page-error.component.spec.ts b/ui/src/app/shared/page-error/page-error.component.spec.ts index 9938b625..6446f950 100644 --- a/ui/src/app/shared/page-error/page-error.component.spec.ts +++ b/ui/src/app/shared/page-error/page-error.component.spec.ts @@ -1,6 +1,6 @@ import { async, ComponentFixture, TestBed } from "@angular/core/testing"; import { HttpModule, Response, ResponseOptions } from "@angular/http"; -import { PageErrorComponent } from "@shared/page-error/page-error.component"; +import { PageErrorComponent } from "../../shared/page-error/page-error.component"; describe("PageErrorComponent", () => { let component: PageErrorComponent; diff --git a/ui/src/app/shared/page-error/page-error.component.ts b/ui/src/app/shared/page-error/page-error.component.ts index df27c3a7..3b7e69d8 100644 --- a/ui/src/app/shared/page-error/page-error.component.ts +++ b/ui/src/app/shared/page-error/page-error.component.ts @@ -54,7 +54,6 @@ export class PageErrorComponent { /** * Returns the error type. Only valid when the error code is 500. - * @return {()=>string} */ public errorMessage(): string { return this.error.statusText; @@ -69,7 +68,6 @@ export class PageErrorComponent { /** * Returns the error type. Only valid when the error code is 500. - * @return {()=>string} */ public errorType(): string { return this.errorObj().errorType; @@ -84,7 +82,6 @@ export class PageErrorComponent { /** * Returns the parsed error body. - * @return {any} */ private errorObj(): any { if (this.eobj === null) { diff --git a/ui/src/app/shared/page-not-found/page-not-found.component.spec.ts b/ui/src/app/shared/page-not-found/page-not-found.component.spec.ts index f2c135f3..a1d6b3cd 100644 --- a/ui/src/app/shared/page-not-found/page-not-found.component.spec.ts +++ b/ui/src/app/shared/page-not-found/page-not-found.component.spec.ts @@ -1,5 +1,5 @@ import { async, ComponentFixture, TestBed } from "@angular/core/testing"; -import { PageNotFoundComponent } from "@shared/page-not-found/page-not-found.component"; +import { PageNotFoundComponent } from "../../shared/page-not-found/page-not-found.component"; describe("PageNotFoundComponent", () => { let component: PageNotFoundComponent; diff --git a/ui/src/app/shared/property-form/property-control-type.enum.ts b/ui/src/app/shared/property-form/property-control-type.enum.ts index f3f9c1a4..6bf8ab27 100644 --- a/ui/src/app/shared/property-form/property-control-type.enum.ts +++ b/ui/src/app/shared/property-form/property-control-type.enum.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { PropertyDefinition } from "@shared/property-form/property-definition.model"; +import { PropertyDefinition } from "../../shared/property-form/property-definition.model"; /** * An enumeration of control types for a property. @@ -48,27 +48,27 @@ export enum PropertyControlType { /** * Namespace to allow methods on the enum. */ -export namespace PropertyControlType { - - /** - * @param {PropertyDefinition} propDefn the property whose control type is being requested - * @returns {PropertyControlType} the control type to render the property value - */ - export function toControlType( propDefn: PropertyDefinition< any > ): PropertyControlType { - if ( propDefn.isConstrainedToAllowedValues() ) { - return PropertyControlType.DROPDOWN; - } - - if ( propDefn.getTypeClassName() === "java.lang.Boolean" ) { - return PropertyControlType.CHECKBOX; - } - - if ( propDefn.isMasked() || propDefn.getId() === "password" ) { - return PropertyControlType.PASSWORD; - } - - // defaults to a text control - return PropertyControlType.TEXT; - } - -} +// export namespace PropertyControlType { +// +// /** +// * @param propDefn the property whose control type is being requested +// * @returns the control type to render the property value +// */ +// export function toControlType( propDefn: PropertyDefinition< any > ): PropertyControlType { +// if ( propDefn.isConstrainedToAllowedValues() ) { +// return PropertyControlType.DROPDOWN; +// } +// +// if ( propDefn.getTypeClassName() === "java.lang.Boolean" ) { +// return PropertyControlType.CHECKBOX; +// } +// +// if ( propDefn.isMasked() || propDefn.getId() === "password" ) { +// return PropertyControlType.PASSWORD; +// } +// +// // defaults to a text control +// return PropertyControlType.TEXT; +// } +// +// } diff --git a/ui/src/app/shared/property-form/property-definition.model.ts b/ui/src/app/shared/property-form/property-definition.model.ts index 60c8bf55..91862091 100644 --- a/ui/src/app/shared/property-form/property-definition.model.ts +++ b/ui/src/app/shared/property-form/property-definition.model.ts @@ -31,8 +31,8 @@ export class PropertyDefinition { private allowedValues: string[]; /** - * @param {Object} json the JSON representation of a Property - * @returns {PropertyDefinition} the new PropertyDefinition (never null) + * @param json the JSON representation of a Property + * @returns the new PropertyDefinition (never null) */ public static create( json: object = {} ): PropertyDefinition { const property = new PropertyDefinition(); @@ -45,184 +45,182 @@ export class PropertyDefinition { } /** - * @typedef { object } T the type of the property being queried - * @returns {T} the property value (can be null) + * @returns the property value (can be null) */ public getValue(): T { return this.value; } /** - * @returns {string} the property id + * @returns the property id */ public getId(): string { return this.keng__id; } /** - * @returns {string} the property displayName (can be null) + * @returns the property displayName (can be null) */ public getDisplayName(): string { return this.displayName; } /** - * @returns {string} the property default value (can be null) + * @returns the property default value (can be null) */ public get theDefaultValue(): string { return this.defaultValue; } /** - * @returns {string} the property description (can be null) + * @returns the property description (can be null) */ public getDescription(): string { return this.description; } /** - * @returns {string} the property category (can be null) + * @returns the property category (can be null) */ public getCategory(): string { return this.category; } /** - * @returns {string} the property typeClassName (can be null) + * @returns the property typeClassName (can be null) */ public getTypeClassName(): string { return this.typeClassName; } /** - * @returns {boolean} 'true' if required + * @returns 'true' if required */ public isRequired(): boolean { return this.required; } /** - * @returns {boolean} 'true' if advanced + * @returns 'true' if advanced */ public isAdvanced(): boolean { return this.advanced; } /** - * @returns {boolean} 'true' if masked + * @returns 'true' if masked */ public isMasked(): boolean { return this.masked; } /** - * @returns {boolean} 'true' if modifiable + * @returns 'true' if modifiable */ public isModifiable(): boolean { return this.modifiable; } /** - * @returns {boolean} 'true' if constrainedToAllowedValues + * @returns 'true' if constrainedToAllowedValues */ public isConstrainedToAllowedValues(): boolean { return this.constrainedToAllowedValues; } /** - * @returns {string[]} the array of allowed values + * @returns the array of allowed values */ public getAllowedValues(): string[] { return this.allowedValues; } /** - * @typedef { object } T the type of the property being set - * @param {T} value the property value + * @param value the property value */ public setValue( value?: T ): void { this.value = value ? value : null; } /** - * @param {string} id the property id + * @param id the property id */ public setId( id?: string ): void { this.keng__id = id ? id : null; } /** - * @param {string} displayName the property displayName + * @param displayName the property displayName */ public setDisplayName( displayName?: string ): void { this.displayName = displayName ? displayName : null; } /** - * @param {string} defaultValue the property default value + * @param defaultValue the property default value */ public setDefaultValue(defaultValue: string): void { this.defaultValue = defaultValue; } /** - * @param {string} description the property description + * @param description the property description */ public setDescription(description: string): void { this.description = description; } /** - * @param {string} category the property category + * @param category the property category */ public setCategory(category: string): void { this.category = category; } /** - * @param {string} typeClassName the property typeClassName + * @param typeClassName the property typeClassName */ public setTypeClassName(typeClassName: string): void { this.typeClassName = typeClassName; } /** - * @param {boolean} required 'true' if property is required + * @param required 'true' if property is required */ public setRequired( required?: boolean ): void { this.required = required ? required : null; } /** - * @param {boolean} advanced 'true' if property is advanced + * @param advanced 'true' if property is advanced */ public setAdvanced( advanced?: boolean ): void { this.advanced = advanced ? advanced : null; } /** - * @param {boolean} masked 'true' if property is masked + * @param masked 'true' if property is masked */ public setMasked( masked?: boolean ): void { this.masked = masked ? masked : null; } /** - * @param {boolean} modifiable 'true' if property is modifiable + * @param modifiable 'true' if property is modifiable */ public setModifiable( modifiable?: boolean ): void { this.modifiable = modifiable ? modifiable : null; } /** - * @param {boolean} constrained 'true' if property is constrained + * @param constrained 'true' if property is constrained */ public setConstraintedToAllowedValues( constrained?: boolean ): void { this.constrainedToAllowedValues = constrained ? constrained : null; } /** - * @param {string[]} allowedValues the array of allowed values + * @param allowedValues the array of allowed values */ public setAllowedValues( allowedValues?: string[] ): void { this.allowedValues = allowedValues ? allowedValues : null; @@ -230,7 +228,7 @@ export class PropertyDefinition { /** * Set all object values using the supplied Connection json - * @param {Object} values + * @param values */ public setValues(values: object = {}): void { Object.assign(this, values); diff --git a/ui/src/app/shared/property-form/property-form-property/property-form-property.component.html b/ui/src/app/shared/property-form/property-form-property/property-form-property.component.html index cecad09e..76832a27 100644 --- a/ui/src/app/shared/property-form/property-form-property/property-form-property.component.html +++ b/ui/src/app/shared/property-form/property-form-property/property-form-property.component.html @@ -1,7 +1,7 @@
-
+
diff --git a/ui/src/app/shared/property-form/property-form-property/property-form-property.component.spec.ts b/ui/src/app/shared/property-form/property-form-property/property-form-property.component.spec.ts index 8f830ba7..afb38f87 100644 --- a/ui/src/app/shared/property-form/property-form-property/property-form-property.component.spec.ts +++ b/ui/src/app/shared/property-form/property-form-property/property-form-property.component.spec.ts @@ -2,7 +2,7 @@ import { async, ComponentFixture, TestBed } from "@angular/core/testing"; import { FormBuilder, FormsModule, ReactiveFormsModule, Validators } from "@angular/forms"; import { FormGroup } from "@angular/forms"; -import { PropertyDefinition } from "@shared/property-form/property-definition.model"; +import { PropertyDefinition } from "../../../shared/property-form/property-definition.model"; import { PropertyFormPropertyComponent } from "./property-form-property.component"; describe("PropertyFormPropertyComponent", () => { diff --git a/ui/src/app/shared/property-form/property-form-property/property-form-property.component.ts b/ui/src/app/shared/property-form/property-form-property/property-form-property.component.ts index c55cf7d2..2388fd9c 100644 --- a/ui/src/app/shared/property-form/property-form-property/property-form-property.component.ts +++ b/ui/src/app/shared/property-form/property-form-property/property-form-property.component.ts @@ -18,8 +18,8 @@ import { Component, Input } from "@angular/core"; import { AbstractControl, FormGroup } from "@angular/forms"; -import { PropertyControlType } from "@shared/property-form/property-control-type.enum"; -import { PropertyDefinition } from "@shared/property-form/property-definition.model"; +import { PropertyControlType } from "../../../shared/property-form/property-control-type.enum"; +import { PropertyDefinition } from "../../../shared/property-form/property-definition.model"; @Component({ selector: "app-form-property", @@ -66,4 +66,21 @@ export class PropertyFormPropertyComponent { } return ""; } + + public getControlType( propDefn: PropertyDefinition< any > ): PropertyControlType { + if ( propDefn.isConstrainedToAllowedValues() ) { + return PropertyControlType.DROPDOWN; + } + + if ( propDefn.getTypeClassName() === "java.lang.Boolean" ) { + return PropertyControlType.CHECKBOX; + } + + if ( propDefn.isMasked() || propDefn.getId() === "password" ) { + return PropertyControlType.PASSWORD; + } + + // defaults to a text control + return PropertyControlType.TEXT; + } } diff --git a/ui/src/app/shared/property-form/property-form.component.spec.ts b/ui/src/app/shared/property-form/property-form.component.spec.ts index 80233727..28d1fd68 100644 --- a/ui/src/app/shared/property-form/property-form.component.spec.ts +++ b/ui/src/app/shared/property-form/property-form.component.spec.ts @@ -17,8 +17,8 @@ import { async, ComponentFixture, TestBed } from "@angular/core/testing"; import { ReactiveFormsModule } from "@angular/forms"; -import { PropertyFormPropertyComponent } from "@shared/property-form/property-form-property/property-form-property.component"; -import { PropertyFormComponent } from "@shared/property-form/property-form.component"; +import { PropertyFormPropertyComponent } from "../../shared/property-form/property-form-property/property-form-property.component"; +import { PropertyFormComponent } from "../../shared/property-form/property-form.component"; describe("PropertyFormComponent", () => { let component: PropertyFormComponent; diff --git a/ui/src/app/shared/property-form/property-form.component.ts b/ui/src/app/shared/property-form/property-form.component.ts index 3acdaf3f..27f5e6e3 100644 --- a/ui/src/app/shared/property-form/property-form.component.ts +++ b/ui/src/app/shared/property-form/property-form.component.ts @@ -18,8 +18,8 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; import { FormControl, FormGroup, Validators } from "@angular/forms"; -import { ObjectUtils } from "@core/utils/object-utils"; -import { PropertyDefinition } from "@shared/property-form/property-definition.model"; +import { ObjectUtils } from "../../core/utils/object-utils"; +import { PropertyDefinition } from "../../shared/property-form/property-definition.model"; @Component({ selector: "app-property-form", diff --git a/ui/src/app/shared/shared.module.ts b/ui/src/app/shared/shared.module.ts index b56f68b9..1b6dbc8a 100644 --- a/ui/src/app/shared/shared.module.ts +++ b/ui/src/app/shared/shared.module.ts @@ -19,8 +19,8 @@ import { CommonModule } from "@angular/common"; import { NgModule } from "@angular/core"; import { ReactiveFormsModule } from "@angular/forms"; -import { PageErrorComponent } from "@shared/page-error/page-error.component"; -import { TestDataService } from "@shared/test-data.service"; +import { PageErrorComponent } from "../shared/page-error/page-error.component"; +import { TestDataService } from "../shared/test-data.service"; import { ModalModule } from "ngx-bootstrap"; import { ConfirmDialogComponent } from "./confirm-dialog/confirm-dialog.component"; import { PageNotFoundComponent } from "./page-not-found/page-not-found.component"; diff --git a/ui/src/app/shared/test-data.service.spec.ts b/ui/src/app/shared/test-data.service.spec.ts index 83ff021a..1021a922 100644 --- a/ui/src/app/shared/test-data.service.spec.ts +++ b/ui/src/app/shared/test-data.service.spec.ts @@ -1,5 +1,5 @@ import { inject, TestBed } from "@angular/core/testing"; -import { TestDataService } from "@shared/test-data.service"; +import { TestDataService } from "../shared/test-data.service"; describe("TestDataService", () => { beforeEach(() => { diff --git a/ui/src/app/shared/test-data.service.ts b/ui/src/app/shared/test-data.service.ts index 99f8926c..6266cc60 100644 --- a/ui/src/app/shared/test-data.service.ts +++ b/ui/src/app/shared/test-data.service.ts @@ -16,19 +16,19 @@ */ import { Injectable } from "@angular/core"; -import { ConnectionStatus } from "@connections/shared/connection-status"; -import { Connection } from "@connections/shared/connection.model"; -import { SchemaNode } from "@connections/shared/schema-node.model"; -import { ServiceCatalogSource } from "@connections/shared/service-catalog-source.model"; -import { ConnectionSummary } from "@dataservices/shared/connection-summary.model"; -import { Dataservice } from "@dataservices/shared/dataservice.model"; -import { PublishState } from "@dataservices/shared/publish-state.enum"; -import { QueryResults } from "@dataservices/shared/query-results.model"; -import { VdbStatus } from "@dataservices/shared/vdb-status.model"; -import { Vdb } from "@dataservices/shared/vdb.model"; -import { Virtualization } from "@dataservices/shared/virtualization.model"; -import { Column } from "@dataservices/shared/column.model"; -import { ViewEditorState } from "@dataservices/shared/view-editor-state.model"; +import { ConnectionStatus } from "../connections/shared/connection-status"; +import { Connection } from "../connections/shared/connection.model"; +import { SchemaNode } from "../connections/shared/schema-node.model"; +import { ServiceCatalogSource } from "../connections/shared/service-catalog-source.model"; +import { ConnectionSummary } from "../dataservices/shared/connection-summary.model"; +import { Dataservice } from "../dataservices/shared/dataservice.model"; +import { PublishState } from "../dataservices/shared/publish-state.enum"; +import { QueryResults } from "../dataservices/shared/query-results.model"; +import { VdbStatus } from "../dataservices/shared/vdb-status.model"; +import { Vdb } from "../dataservices/shared/vdb.model"; +import { Virtualization } from "../dataservices/shared/virtualization.model"; +import { Column } from "../dataservices/shared/column.model"; +import { ViewEditorState } from "../dataservices/shared/view-editor-state.model"; @Injectable() export class TestDataService { @@ -1905,11 +1905,11 @@ export class TestDataService { /** * Create a ServiceCatalogSource using the specified info - * @param {string} id the id - * @param {string} name the name - * @param {string} type the type - * @param {boolean} bound 'true' if bound - * @returns {ServiceCatalogSource} + * @param id the id + * @param name the name + * @param type the type + * @param bound 'true' if bound + * @returns the service catalog source */ private static createServiceCatalogSource( id: string, name: string, type: string, bound: boolean ): ServiceCatalogSource { const catalogSource = new ServiceCatalogSource(); @@ -1922,9 +1922,9 @@ export class TestDataService { /** * Create a ConnectionSummary using the specified info - * @param {Connection} conn the connection - * @param {ConnectionStatus} status the connection status - * @returns {ConnectionSummary} + * @param conn the connection + * @param status the connection status + * @returns the connection summary */ private static createConnectionSummary( conn: Connection, status: ConnectionStatus ): ConnectionSummary { const connectionSummary = new ConnectionSummary(); @@ -1952,9 +1952,9 @@ export class TestDataService { /** * Get connection summaries based on supplied parameters - * @param {boolean} includeConnection include connection in the summary - * @param {boolean} includeSchemaStatus include schema status in the summary - * @returns {Connection[]} the array of test connections + * @param includeConnection include connection in the summary + * @param includeSchemaStatus include schema status in the summary + * @returns the array of test connections */ public getConnectionSummaries(includeConnection: boolean, includeSchemaStatus: boolean): ConnectionSummary[] { if (includeConnection && includeSchemaStatus) { @@ -1967,21 +1967,21 @@ export class TestDataService { } /** - * @returns {ServiceCatalogSource[]} the array of test Service Catalog datasources + * @returns the array of test Service Catalog datasources */ public getServiceCatalogSources(): ServiceCatalogSource[] { return this.catalogSources; } /** - * @returns {Dataservice[]} the array of test dataservices + * @returns the array of test dataservices */ public getDataservices(): Dataservice[] { return this.dataServices; } /** - * @returns {QueryResults} test query results + * @returns test query results */ public getQueryResults(): QueryResults { @@ -1989,7 +1989,7 @@ export class TestDataService { } /** - * @returns {Map} the array of SchemaNodes for connection + * @returns the array of SchemaNodes for connection */ public getConnectionSchemaMap(): Map { const nodesMap = new Map(); @@ -2018,7 +2018,7 @@ export class TestDataService { } /** - * @returns {Map} the array of Columns for connection:tableOption + * @returns the array of Columns for connection:tableOption */ public getConnectionSchemaColumnsMap(): Map { const columnsMap = new Map(); @@ -2088,28 +2088,28 @@ export class TestDataService { } /** - * @returns {Vdb[]} the VDB collection + * @returns the VDB collection */ public getVdbs(): Vdb[] { return this.vdbs; } /** - * @returns {VdbStatus[]} the VDB status collection + * @returns the VDB status collection */ public getVdbStatuses(): VdbStatus[] { return this.vdbStatuses; } /** - * @returns {Virtualization[]} the virtualization collection + * @returns the virtualization collection */ public getVirtualizations(): Virtualization[] { return this.virtualizations; } /** - * @returns {Map} the ViewEditorState by id map + * @returns the ViewEditorState by id map */ public getViewEditorStateMap(): Map { const stateMap = new Map(); diff --git a/ui/src/environments/environment.prod.ts b/ui/src/environments/environment.prod.ts index db7f4673..6bdab2a3 100644 --- a/ui/src/environments/environment.prod.ts +++ b/ui/src/environments/environment.prod.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { DataservicesConstants } from "@dataservices/shared/dataservices-constants"; +import { DataservicesConstants } from "../app/dataservices/shared/dataservices-constants"; export const komodoEngine = "vdb-builder"; diff --git a/ui/src/environments/environment.ts b/ui/src/environments/environment.ts index f5b0480f..5d6e77c2 100644 --- a/ui/src/environments/environment.ts +++ b/ui/src/environments/environment.ts @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { DataservicesConstants } from "@dataservices/shared/dataservices-constants"; +import { DataservicesConstants } from "../app/dataservices/shared/dataservices-constants"; // The file contents for the current environment will overwrite these during build. // The build system defaults to the dev environment which uses `environment.ts`, but if you do