Ang6 - dialog rework and import improvements

teiid · Nov 16, 2018 · ec59df6 · ec59df6
1 parent 85e9f2f
commit ec59df6
Show file tree

Hide file tree

Showing 148 changed files with 903 additions and 530 deletions.
diff --git a/.../beetle-lib/src/connections/add-connection-wizard/add-connection-wizard.component.spec.ts b/.../beetle-lib/src/connections/add-connection-wizard/add-connection-wizard.component.spec.ts
@@ -2,10 +2,10 @@ import { async, ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 import { RouterTestingModule } from "@angular/router/testing";
-import { ConnectionTypeCardComponent } from "../../connections/connection-type-cards/connection-type-card/connection-type-card.component";
-import { ConnectionTypeCardsComponent } from "../../connections/connection-type-cards/connection-type-cards.component";
-import { ConnectionService } from "../../connections/shared/connection.service";
-import { MockConnectionService } from "../../connections/shared/mock-connection.service";
+import { ConnectionTypeCardComponent } from "../connection-type-cards/connection-type-card/connection-type-card.component";
+import { ConnectionTypeCardsComponent } from "../connection-type-cards/connection-type-cards.component";
+import { ConnectionService } from "../shared/connection.service";
+import { MockConnectionService } from "../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";

diff --git a/...jects/beetle-lib/src/connections/add-connection-wizard/add-connection-wizard.component.ts b/...jects/beetle-lib/src/connections/add-connection-wizard/add-connection-wizard.component.ts
@@ -25,11 +25,11 @@ 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 { ConnectionType } from "../shared/connection-type.model";
+import { ConnectionService } from "../shared/connection.service";
+import { ConnectionsConstants } from "../shared/connections-constants";
+import { NewConnection } from "../shared/new-connection.model";
+import { ServiceCatalogSource } from "../shared/service-catalog-source.model";
 import { LoggerService } from "../../core/logger.service";
 import { NotificationType, WizardEvent } from "patternfly-ng";
 import { WizardStepConfig } from "patternfly-ng";

diff --git a/ui/projects/beetle-lib/src/connections/add-connection/add-connection.component.spec.ts b/ui/projects/beetle-lib/src/connections/add-connection/add-connection.component.spec.ts
@@ -2,11 +2,11 @@ import { async, ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 import { RouterTestingModule } from "@angular/router/testing";
-import { AddConnectionWizardComponent } from "../../connections/add-connection-wizard/add-connection-wizard.component";
-import { ConnectionTypeCardComponent } from "../../connections/connection-type-cards/connection-type-card/connection-type-card.component";
-import { ConnectionTypeCardsComponent } from "../../connections/connection-type-cards/connection-type-cards.component";
-import { ConnectionService } from "../../connections/shared/connection.service";
-import { MockConnectionService } from "../../connections/shared/mock-connection.service";
+import { AddConnectionWizardComponent } from "../add-connection-wizard/add-connection-wizard.component";
+import { ConnectionTypeCardComponent } from "../connection-type-cards/connection-type-card/connection-type-card.component";
+import { ConnectionTypeCardsComponent } from "../connection-type-cards/connection-type-cards.component";
+import { ConnectionService } from "../shared/connection.service";
+import { MockConnectionService } from "../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";

diff --git a/ui/projects/beetle-lib/src/connections/add-connection/add-connection.component.ts b/ui/projects/beetle-lib/src/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 "../shared/connections-constants";
 
 @Component({
   selector: "btl-add-connection-page",

diff --git a/...ections/connection-type-cards/connection-type-card/connection-type-card.component.spec.ts b/...ections/connection-type-cards/connection-type-card/connection-type-card.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { RouterTestingModule } from "@angular/router/testing";
-import { ConnectionType } from "../../../connections/shared/connection-type.model";
+import { ConnectionType } from "../../shared/connection-type.model";
 import {
   ActionModule,
   CardModule,

diff --git a/.../beetle-lib/src/connections/connection-type-cards/connection-type-cards.component.spec.ts b/.../beetle-lib/src/connections/connection-type-cards/connection-type-cards.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { RouterTestingModule } from "@angular/router/testing";
-import { ConnectionTypeCardComponent } from "../../connections/connection-type-cards/connection-type-card/connection-type-card.component";
+import { ConnectionTypeCardComponent } from "./connection-type-card/connection-type-card.component";
 import {
   ActionModule,
   CardModule,

diff --git a/...jects/beetle-lib/src/connections/connection-type-cards/connection-type-cards.component.ts b/...jects/beetle-lib/src/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 "../shared/connection-type.model";
 
 @Component({
   encapsulation: ViewEncapsulation.None,

diff --git a/...e-lib/src/connections/connections-cards/connection-card/connection-card.component.spec.ts b/...e-lib/src/connections/connections-cards/connection-card/connection-card.component.spec.ts
@@ -1,7 +1,7 @@
 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 { ConnectionStatus } from "../../shared/connection-status";
+import { Connection } from "../../shared/connection.model";
 import { LoggerService } from "../../../core/logger.service";
 import {
   ActionModule,

diff --git a/...beetle-lib/src/connections/connections-cards/connection-card/connection-card.component.ts b/...beetle-lib/src/connections/connections-cards/connection-card/connection-card.component.ts
@@ -16,8 +16,8 @@
  */
 
 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 { Connection } from "../../shared/connection.model";
+import { ConnectionsConstants } from "../../shared/connections-constants";
 import { LoggerService } from "../../../core/logger.service";
 import { Action, ActionConfig, CardAction, CardConfig, ListConfig } from "patternfly-ng";
 

diff --git a/ui/projects/beetle-lib/src/connections/connections-cards/connections-cards.component.spec.ts b/ui/projects/beetle-lib/src/connections/connections-cards/connections-cards.component.spec.ts
@@ -1,7 +1,7 @@
 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 { ConnectionCardComponent } from "./connection-card/connection-card.component";
+import { ConnectionsCardsComponent } from "./connections-cards.component";
 import { LoggerService } from "../../core/logger.service";
 import {
   ActionModule,

diff --git a/ui/projects/beetle-lib/src/connections/connections-cards/connections-cards.component.ts b/ui/projects/beetle-lib/src/connections/connections-cards/connections-cards.component.ts
@@ -16,8 +16,8 @@
  */
 
 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 { ConnectionCardComponent } from "./connection-card/connection-card.component";
+import { Connection } from "../shared/connection.model";
 import { LoggerService } from "../../core/logger.service";
 
 @Component({

diff --git a/ui/projects/beetle-lib/src/connections/connections-list/connection-details.component.ts b/ui/projects/beetle-lib/src/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 "../shared/connection.model";
+import { ConnectionsConstants } from "../shared/connections-constants";
 import { ListConfig } from "patternfly-ng";
 
 @Component({

diff --git a/ui/projects/beetle-lib/src/connections/connections-list/connections-list.component.spec.ts b/ui/projects/beetle-lib/src/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 "./connection-details.component";
+import { ConnectionsListComponent } from "./connections-list.component";
 import {
   ActionModule,
   CardModule,

diff --git a/ui/projects/beetle-lib/src/connections/connections-list/connections-list.component.ts b/ui/projects/beetle-lib/src/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 "../shared/connection.model";
 import { Action, ActionConfig, ListConfig } from "patternfly-ng";
 
 @Component({

diff --git a/ui/projects/beetle-lib/src/connections/connections-routing.module.ts b/ui/projects/beetle-lib/src/connections/connections-routing.module.ts
@@ -17,10 +17,9 @@
 
 import { ModuleWithProviders, 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 "./add-connection/add-connection.component";
+import { ConnectionsComponent } from "./connections.component";
+import { ConnectionsConstants } from "./shared/connections-constants";
 
 export const connectionsRoutes: ModuleWithProviders<RouterModule> = RouterModule.forChild([
   { path: ConnectionsConstants.connectionsRootRoute, component: ConnectionsComponent },

diff --git a/ui/projects/beetle-lib/src/connections/connections.component.spec.ts b/ui/projects/beetle-lib/src/connections/connections.component.spec.ts
@@ -4,13 +4,13 @@ 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 { ConnectionCardComponent } from "./connections-cards/connection-card/connection-card.component";
+import { ConnectionsCardsComponent } from "./connections-cards/connections-cards.component";
+import { ConnectionDetailsComponent } from "./connections-list/connection-details.component";
+import { ConnectionsListComponent } from "./connections-list/connections-list.component";
+import { ConnectionsComponent } from "./connections.component";
+import { ConnectionService } from "./shared/connection.service";
+import { MockConnectionService } from "./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";

diff --git a/ui/projects/beetle-lib/src/connections/connections.component.ts b/ui/projects/beetle-lib/src/connections/connections.component.ts
@@ -17,10 +17,10 @@
 
 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 { ConnectionStatus } from "./shared/connection-status";
+import { Connection } from "./shared/connection.model";
+import { ConnectionService } from "./shared/connection.service";
+import { ConnectionsConstants } from "./shared/connections-constants";
 import { AppSettingsService } from "../core/app-settings.service";
 import { LoggerService } from "../core/logger.service";
 import { NotifierService } from "../dataservices/shared/notifier.service";
@@ -239,7 +239,7 @@ export class ConnectionsComponent extends AbstractPageComponent implements OnIni
 
     // Show Dialog, act upon confirmation click
     const modalRef = this.modalService.show(ConfirmDialogComponent, {initialState});
-    modalRef.content.confirmAction.take(1).subscribe((value) => {
+    (modalRef.content as ConfirmDialogComponent).confirmAction.subscribe((value) => {
       this.onDeleteConnection();
     });
   }

diff --git a/ui/projects/beetle-lib/src/connections/connections.module.ts b/ui/projects/beetle-lib/src/connections/connections.module.ts
@@ -20,16 +20,16 @@ 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 { AddConnectionWizardComponent } from "./add-connection-wizard/add-connection-wizard.component";
+import { AddConnectionComponent } from "./add-connection/add-connection.component";
+import { ConnectionCardComponent } from "./connections-cards/connection-card/connection-card.component";
+import { ConnectionsCardsComponent } from "./connections-cards/connections-cards.component";
+import { ConnectionDetailsComponent } from "./connections-list/connection-details.component";
+import { ConnectionsListComponent } from "./connections-list/connections-list.component";
+import { ConnectionsRoutingModule } from "./connections-routing.module";
+import { ConnectionsComponent } from "./connections.component";
+import { ConnectionService } from "./shared/connection.service";
+import { MockConnectionService } from "./shared/mock-connection.service";
 import { AppSettingsService } from "../core/app-settings.service";
 import { CoreModule } from "../core/core.module";
 import { LoggerService } from "../core/logger.service";

diff --git a/ui/projects/beetle-lib/src/connections/shared/connection-status.spec.ts b/ui/projects/beetle-lib/src/connections/shared/connection-status.spec.ts
@@ -1,4 +1,4 @@
-import { ConnectionStatus } from "../../connections/shared/connection-status";
+import { ConnectionStatus } from "./connection-status";
 
 describe("ConnectionStatus", () => {
   let connectionStatus: ConnectionStatus;

diff --git a/ui/projects/beetle-lib/src/connections/shared/connection-type.model.ts b/ui/projects/beetle-lib/src/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-constants";
 
 export class ConnectionType {
   private name: string;

diff --git a/ui/projects/beetle-lib/src/connections/shared/connection.model.spec.ts b/ui/projects/beetle-lib/src/connections/shared/connection.model.spec.ts
@@ -1,4 +1,4 @@
-import { Connection } from "../../connections/shared/connection.model";
+import { Connection } from "./connection.model";
 
 describe("Connection", () => {
   let connection: Connection;

diff --git a/ui/projects/beetle-lib/src/connections/shared/connection.model.ts b/ui/projects/beetle-lib/src/connections/shared/connection.model.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ConnectionStatus } from "../../connections/shared/connection-status";
+import { ConnectionStatus } from "./connection-status";
 import { VdbsConstants } from "../../dataservices/shared/vdbs-constants";
 import { Identifiable } from "../../shared/identifiable";
 import { SortDirection } from "../../shared/sort-direction.enum";

diff --git a/ui/projects/beetle-lib/src/connections/shared/connection.service.spec.ts b/ui/projects/beetle-lib/src/connections/shared/connection.service.spec.ts
@@ -1,6 +1,6 @@
 import { inject, TestBed } from "@angular/core/testing";
 import { HttpModule } from "@angular/http";
-import { ConnectionService } from "../../connections/shared/connection.service";
+import { ConnectionService } from "./connection.service";
 import { AppSettingsService } from "../../core/app-settings.service";
 import { LoggerService } from "../../core/logger.service";
 import { NotifierService } from "../../dataservices/shared/notifier.service";

diff --git a/ui/projects/beetle-lib/src/connections/shared/connection.service.ts b/ui/projects/beetle-lib/src/connections/shared/connection.service.ts
@@ -17,12 +17,12 @@
 
 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 { ConnectionStatus } from "./connection-status";
+import { ConnectionType } from "./connection-type.model";
+import { ConnectionsConstants } from "./connections-constants";
+import { NewConnection } from "./new-connection.model";
+import { SchemaNode } from "./schema-node.model";
+import { ServiceCatalogSource } from "./service-catalog-source.model";
 import { ApiService } from "../../core/api.service";
 import { AppSettingsService } from "../../core/app-settings.service";
 import { LoggerService } from "../../core/logger.service";

diff --git a/ui/projects/beetle-lib/src/connections/shared/mock-connection.service.ts b/ui/projects/beetle-lib/src/connections/shared/mock-connection.service.ts
@@ -17,11 +17,11 @@
 
 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 { Connection } from "./connection.model";
+import { ConnectionService } from "./connection.service";
+import { NewConnection } from "./new-connection.model";
+import { SchemaNode } from "./schema-node.model";
+import { ServiceCatalogSource } from "./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";

diff --git a/ui/projects/beetle-lib/src/connections/shared/schema-node.model.spec.ts b/ui/projects/beetle-lib/src/connections/shared/schema-node.model.spec.ts
@@ -1,4 +1,4 @@
-import { SchemaNode } from "../../connections/shared/schema-node.model";
+import { SchemaNode } from "./schema-node.model";
 
 describe("SchemaNode", () => {
   let schemaNode: SchemaNode;

diff --git a/ui/projects/beetle-lib/src/connections/shared/service-catalog-source.model.spec.ts b/ui/projects/beetle-lib/src/connections/shared/service-catalog-source.model.spec.ts
@@ -1,4 +1,4 @@
-import { ServiceCatalogSource } from "../../connections/shared/service-catalog-source.model";
+import { ServiceCatalogSource } from "./service-catalog-source.model";
 
 describe("ServiceCatalogSource", () => {
   let serviceCatSrc: ServiceCatalogSource;

diff --git a/ui/projects/beetle-lib/src/core/about-dialog/about-dialog.component.spec.ts b/ui/projects/beetle-lib/src/core/about-dialog/about-dialog.component.spec.ts
@@ -1,8 +1,8 @@
 import { async, ComponentFixture, TestBed } from "@angular/core/testing";
 import { HttpModule } from "@angular/http";
-import { About } from "../about-dialog/about.model";
-import { AboutService } from "../about-dialog/about.service";
-import { MockAboutService } from "../about-dialog/mock-about.service";
+import { About } from "./about.model";
+import { AboutService } from "./about.service";
+import { MockAboutService } from "./mock-about.service";
 import { AppSettingsService } from "../app-settings.service";
 import { LoggerService } from "../logger.service";
 import { MockAppSettingsService } from "../mock-app-settings.service";