More changes to get rid of tsling errors and warnings. Also a few bug…

… fixes thrown in.
teiid · Oct 11, 2017 · 55c63bd · 55c63bd
1 parent b5f364c
commit 55c63bd
Show file tree

Hide file tree

Showing 51 changed files with 183 additions and 69 deletions.
diff --git a/ngapp/e2e/app.e2e-spec.ts b/ngapp/e2e/app.e2e-spec.ts
@@ -9,6 +9,8 @@ describe("beetle-studio App", () => {
 
   it("should display welcome message", () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual("Welcome to app!");
+    expect(page.getParagraphText()).toEqual("Welcome to app!").then(() => {
+      // nothing to do
+    });
   });
 });
diff --git a/ngapp/src/app/activities/activities-cards/activities-cards.component.css b/ngapp/src/app/activities/activities-cards/activities-cards.component.css
@@ -28,7 +28,7 @@
 .activity-card {
   -webkit-transition: background-color 300ms;
   -moz-transition: background-color 300ms;
-  -ms-transition: background-color 300ms;
+  //-ms-transition: background-color 300ms;
   -o-transition: background-color 300ms;
   transition: background-color 300ms;
   height: 220px;
@@ -41,10 +41,12 @@
   background-color: rgb(221, 234, 255);
 }
 
+/*
 .activity-description {
   font-size: 13px;
   overflow-y: auto;
 }
+*/
 
 .activity-card .activity-tags {
   margin-bottom: 8px;
@@ -53,15 +55,15 @@
   font-weight: bold;
   margin-right: 5px;
 }
-.activity-card .activity-tags .activity-tag {
+.activity-card .activity-tags /*.activity-tag*/ {
   margin-right: 5px;
   border: 1px solid #ccc;
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
   padding: 2px 4px;
 }
-.activity-card .activity-tags .activity-tag:hover {
+.activity-card .activity-tags /*.activity-tag:hover*/ {
   cursor: pointer;
   background-color: #0088ce;
   border-color: #00659c;

diff --git a/ngapp/src/app/activities/activities-cards/activities-cards.component.spec.ts b/ngapp/src/app/activities/activities-cards/activities-cards.component.spec.ts
@@ -11,7 +11,9 @@ describe("ActivitiesCardsComponent", () => {
       imports: [RouterModule],
       declarations: [ ActivitiesCardsComponent ]
     })
-    .compileComponents();
+    .compileComponents().then(() => {
+      // nothing to do
+    });
   }));
 
   beforeEach(() => {

diff --git a/ngapp/src/app/activities/activities-list/activities-list.component.css b/ngapp/src/app/activities/activities-list/activities-list.component.css
@@ -2,7 +2,7 @@
 .list-group-item {
   -webkit-transition: background-color 300ms;
   -moz-transition: background-color 300ms;
-  -ms-transition: background-color 300ms;
+  //-ms-transition: background-color 300ms;
   -o-transition: background-color 300ms;
   transition: background-color 300ms;
 }
@@ -20,15 +20,15 @@
   font-weight: bold;
   margin-right: 5px;
 }
-.list-group-item .activity-tags .activity-tag {
+.list-group-item .activity-tags /*.activity-tag*/ {
   margin-right: 5px;
   border: 1px solid #ccc;
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
   padding: 2px 4px;
 }
-.list-group-item .activity-tags .activity-tag:hover {
+.list-group-item .activity-tags /*.activity-tag:hover*/ {
   cursor: pointer;
   background-color: #0088ce;
   border-color: #00659c;

diff --git a/ngapp/src/app/activities/activities-list/activities-list.component.spec.ts b/ngapp/src/app/activities/activities-list/activities-list.component.spec.ts
@@ -11,7 +11,9 @@ describe("ActivitiesListComponent", () => {
       imports: [ RouterModule ],
       declarations: [ ActivitiesListComponent ]
     })
-    .compileComponents();
+    .compileComponents().then(() => {
+      // nothing to do
+    });
   }));
 
   beforeEach(() => {

diff --git a/ngapp/src/app/activities/activities.component.html b/ngapp/src/app/activities/activities.component.html
@@ -90,18 +90,18 @@ <h1 class="card-pf-title">
       <!-- The list or card view -->
       <div class="col-md-12" *ngIf="isLoaded('activities')">
         <app-activities-list *ngIf="isListLayout" [activities]="filteredActivities" [selectedActivities]="selectedActivities"
-                             (onEditActivity)="onEdit($event)" (onStartActivity)="onStart($event)" (onDeleteActivity)="onDelete($event)"
-                             (onActivitySelected)="onSelected($event)" (onActivityDeselected)="onDeselected($event)"></app-activities-list>
+                             (editActivity)="onEdit($event)" (startActivity)="onStart($event)" (deleteActivity)="onDelete($event)"
+                             (activitySelected)="onSelected($event)" (activityDeselected)="onDeselected($event)"></app-activities-list>
         <app-activities-cards *ngIf="isCardLayout" [activities]="filteredActivities" [selectedActivities]="selectedActivities"
-                              (onEditActivity)="onEdit($event)" (onStartActivity)="onStart($event)" (onDeleteActivity)="onDelete($event)"
-                              (onActivitySelected)="onSelected($event)" (onActivityDeselected)="onDeselected($event)"></app-activities-cards>
+                              (editActivity)="onEdit($event)" (startActivity)="onStart($event)" (deleteActivity)="onDelete($event)"
+                              (activitySelected)="onSelected($event)" (activityDeselected)="onDeselected($event)"></app-activities-cards>
       </div>
 
     </div>
 
   </div>
 
 </div>
-<app-confirm-delete #confirmDeleteDialog (onDelete)="deleteActivity()">
+<app-confirm-delete #confirmDeleteDialog (deleteSelected)="onDeleteActivity()">
   <p>Do you really want to delete the selected Activity?</p>
 </app-confirm-delete>
diff --git a/ngapp/src/app/activities/activities.component.spec.ts b/ngapp/src/app/activities/activities.component.spec.ts
@@ -18,7 +18,9 @@ describe("ActivitiesComponent", () => {
       imports: [ CoreModule, FormsModule, HttpModule, ModalModule.forRoot(), RouterTestingModule, SharedModule ],
       declarations: [ ActivitiesComponent, ActivitiesListComponent, ActivitiesCardsComponent ]
     })
-    .compileComponents();
+    .compileComponents().then(() => {
+      // nothing to do
+    });
   }));
 
   beforeEach(() => {

diff --git a/ngapp/src/app/activities/activities.component.ts b/ngapp/src/app/activities/activities.component.ts
@@ -81,7 +81,9 @@ export class ActivitiesComponent extends AbstractPageComponent {
 
   public onEdit(activityName: string): void {
     const link: string[] = [ ActivitiesConstants.editActivityPath ];
-    this.router.navigate(link);
+    this.router.navigate(link).then(() => {
+      // nothing to do
+    });
   }
 
   public onDelete(activityName: string): void {
@@ -157,7 +159,7 @@ export class ActivitiesComponent extends AbstractPageComponent {
   /**
    * Called to doDelete all selected APIs.
    */
-  public deleteActivity(): void {
+  public onDeleteActivity(): void {
     const selectedActivity =  this.filterActivities().find((x) => x.getId() === this.activityNameForDelete);
 
     const activityToDelete: NewActivity = new NewActivity();

diff --git a/ngapp/src/app/activities/activities.module.ts b/ngapp/src/app/activities/activities.module.ts
@@ -27,13 +27,15 @@ import { NgModule } from "@angular/core";
 import { FormsModule } from "@angular/forms";
 import { RouterModule } from "@angular/router";
 import { ConnectionsModule } from "@connections/connections.module";
+import { CoreModule } from "@core/core.module";
 import { SharedModule } from "@shared/shared.module";
 
 @NgModule({
   imports: [
     ActivitiesRoutingModule,
     CommonModule,
     ConnectionsModule,
+    CoreModule,
     SharedModule,
     RouterModule,
     FormsModule

diff --git a/ngapp/src/app/activities/add-activity/add-activity.component.css b/ngapp/src/app/activities/add-activity/add-activity.component.css
@@ -2,7 +2,7 @@
   padding: 15px
 }
 
-.add-activity-form .form-instructions {
+.add-activity-form /*.form-instructions*/ {
   font-size: 15px;
   padding-top: 10px
 }

diff --git a/ngapp/src/app/activities/add-activity/add-activity.component.html b/ngapp/src/app/activities/add-activity/add-activity.component.html
@@ -10,7 +10,7 @@
       <h2>Add Activity</h2>
     </div>
     <div class="add-activity-form row">
-      <app-add-activity-form (onCreateActivity)="onCreateActivity($event)" #createActivityForm></app-add-activity-form>
+      <app-add-activity-form (createActivity)="onCreateActivity($event)" #createActivityForm></app-add-activity-form>
     </div>
   </div>
 </div>
diff --git a/ngapp/src/app/activities/add-activity/add-activity.component.spec.ts b/ngapp/src/app/activities/add-activity/add-activity.component.spec.ts
@@ -20,7 +20,9 @@ describe("AddActivityComponent", () => {
         { provide: ActivityService, useClass: MockActivityService },
       ]
     })
-    .compileComponents();
+    .compileComponents().then(() => {
+      // nothing to do
+    });
   }));
 
   beforeEach(() => {

diff --git a/ngapp/src/app/activities/add-activity/add-activity.component.ts b/ngapp/src/app/activities/add-activity/add-activity.component.ts
@@ -57,7 +57,9 @@ export class AddActivityComponent extends AbstractPageComponent {
     this.activityService.createActivity(activity);
     const link: string[] = [ ActivitiesConstants.activitiesRootPath ];
     this.logger.log("[AddActivityComponent] Navigating to: %o", link);
-    this.router.navigate(link);
+    this.router.navigate(link).then(() => {
+      // nothing to do
+    });
   }
 
 }
diff --git a/ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.css b/ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.css
@@ -2,29 +2,36 @@ select {
   width: auto;
 }
 
+/*
 .create-activity-form-panel.dragging {
   border: 1px dashed #39a5dc;
   background-color: #eef;
 }
+*/
 
 .create-activity-form-panel {
   padding-top: 25px;
 }
 
+/*
 span.disabled {
   color: #999;
 }
+*/
 
 .dropdown ul {
   max-height: 250px;
   overflow: auto;
 }
 
+/*
 div.spinner {
   display: inline-block;
   margin-right: 5px;
 }
+*/
 
+/*
 .platform-toggle {
   display: inline-block;
   text-align: center;
@@ -48,13 +55,18 @@ div.spinner {
   opacity: 0.6;
   cursor: not-allowed;
 }
+*/
 .platform-toggle span.fa {
   font-size: 32px;
 }
+/*
 .platform-toggle span.lbl {
   font-size: 14px;
 }
+*/
 
+/*
 .account-link-warning {
   margin-top: 10px;
 }
+*/
diff --git a/ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.spec.ts b/ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.spec.ts
@@ -13,7 +13,9 @@ describe("AddActivityFormComponent", () => {
       imports: [ CoreModule, FormsModule, RouterTestingModule ],
       declarations: [ AddActivityFormComponent ]
     })
-    .compileComponents();
+    .compileComponents().then(() => {
+      // nothing to do
+    });
   }));
 
   beforeEach(() => {

diff --git a/ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.ts b/ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.ts
@@ -122,7 +122,9 @@ export class AddActivityFormComponent {
 
   public cancelAdd(): void {
     const link: string[] = [ ActivitiesConstants.activitiesRootPath ];
-    this.router.navigate(link);
+    this.router.navigate(link).then(() => {
+      // nothing to do
+    });
   }
 
 }
diff --git a/ngapp/src/app/app.component.spec.ts b/ngapp/src/app/app.component.spec.ts
@@ -10,7 +10,9 @@ describe("AppComponent", () => {
       declarations: [
         AppComponent
       ],
-    }).compileComponents();
+    }).compileComponents().then(() => {
+      // nothing to do
+    });
   }));
 
   it("should create the app", async(() => {

diff --git a/ngapp/src/app/connections/add-connection/add-connection.component.css b/ngapp/src/app/connections/add-connection/add-connection.component.css
@@ -2,7 +2,7 @@
   padding: 15px
 }
 
-.add-connection-form .form-instructions {
+.add-connection-form /*.form-instructions*/ {
   font-size: 15px;
   padding-top: 10px
 }

diff --git a/ngapp/src/app/connections/add-connection/add-connection.component.html b/ngapp/src/app/connections/add-connection/add-connection.component.html
@@ -10,7 +10,7 @@
       <h2>Add Connection</h2>
     </div>
     <div class="add-connection-form row">
-      <app-add-connection-form (onCreateConnection)="onCreateConnection($event)" #createConnectionForm></app-add-connection-form>
+      <app-add-connection-form (createConnection)="onCreateConnection($event)" #createConnectionForm></app-add-connection-form>
     </div>
   </div>
 </div>
diff --git a/ngapp/src/app/connections/add-connection/add-connection.component.spec.ts b/ngapp/src/app/connections/add-connection/add-connection.component.spec.ts
@@ -20,7 +20,9 @@ describe("AddConnectionComponent", () => {
         { provide: ConnectionService, useClass: MockConnectionService },
       ]
     })
-    .compileComponents();
+    .compileComponents().then(() => {
+      // nothing to do
+    });
   }));
 
   beforeEach(() => {

diff --git a/ngapp/src/app/connections/add-connection/add-connection.component.ts b/ngapp/src/app/connections/add-connection/add-connection.component.ts
@@ -61,7 +61,9 @@ export class AddConnectionComponent extends AbstractPageComponent {
         this.form.connectionCreated();
         const link: string[] = [ ConnectionsConstants.connectionsRootPath ];
         this.logger.log("[AddConnectionComponent] Navigating to: %o", link);
-        this.router.navigate(link);
+        this.router.navigate(link).then(() => {
+          // nothing to do
+        });
       }
     );
 

diff --git a/ngapp/src/app/connections/connections-cards/connections-cards.component.css b/ngapp/src/app/connections/connections-cards/connections-cards.component.css
@@ -27,7 +27,7 @@
 .connection-card {
   -webkit-transition: background-color 300ms;
   -moz-transition: background-color 300ms;
-  -ms-transition: background-color 300ms;
+  //-ms-transition: background-color 300ms;
   -o-transition: background-color 300ms;
   transition: background-color 300ms;
   height: 220px;
@@ -40,10 +40,12 @@
   background-color: rgb(221, 234, 255);
 }
 
+/*
 .connection-description {
   font-size: 13px;
   overflow-y: auto;
 }
+*/
 
 .connection-card .connection-tags {
   margin-bottom: 8px;
@@ -52,15 +54,15 @@
   font-weight: bold;
   margin-right: 5px;
 }
-.connection-card .connection-tags .connection-tag {
+.connection-card .connection-tags /*.connection-tag*/ {
   margin-right: 5px;
   border: 1px solid #ccc;
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
   padding: 2px 4px;
 }
-.connection-card .connection-tags .connection-tag:hover {
+.connection-card .connection-tags /*.connection-tag:hover*/ {
   cursor: pointer;
   background-color: #0088ce;
   border-color: #00659c;

diff --git a/ngapp/src/app/connections/connections-cards/connections-cards.component.spec.ts b/ngapp/src/app/connections/connections-cards/connections-cards.component.spec.ts
@@ -11,7 +11,9 @@ describe("ConnectionsCardsComponent", () => {
       imports: [ RouterTestingModule ],
       declarations: [ ConnectionsCardsComponent ]
     })
-    .compileComponents();
+    .compileComponents().then(() => {
+      // nothing to do
+    });
   }));
 
   beforeEach(() => {