Made changes to tslint.json and fixed most of the errors and warnings

teiid · Oct 6, 2017 · 1376884 · 1376884
1 parent da77aee
commit 1376884
Show file tree

Hide file tree

Showing 81 changed files with 1,285 additions and 957 deletions.
diff --git a/ngapp/e2e/app.e2e-spec.ts b/ngapp/e2e/app.e2e-spec.ts
@@ -1,14 +1,14 @@
-import { AppPage } from './app.po';
+import { AppPage } from "./app.po";
 
-describe('beetle-studio App', () => {
+describe("beetle-studio App", () => {
   let page: AppPage;
 
   beforeEach(() => {
     page = new AppPage();
   });
 
-  it('should display welcome message', () => {
+  it("should display welcome message", () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual('Welcome to app!');
+    expect(page.getParagraphText()).toEqual("Welcome to app!");
   });
 });
diff --git a/ngapp/e2e/app.po.ts b/ngapp/e2e/app.po.ts
@@ -1,11 +1,12 @@
-import { browser, by, element } from 'protractor';
+import { browser, by, element } from "protractor";
+import { promise } from "selenium-webdriver";
 
 export class AppPage {
-  navigateTo() {
-    return browser.get('/');
+  public navigateTo(): promise.Promise< any > {
+    return browser.get("/");
   }
 
-  getParagraphText() {
-    return element(by.css('app-root h1')).getText();
+  public getParagraphText(): promise.Promise<string> {
+    return element(by.css("app-root h1")).getText();
   }
 }
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
@@ -1,9 +1,8 @@
-import {async, ComponentFixture, TestBed} from '@angular/core/testing';
-
-import {ActivitiesCardsComponent} from './activities-cards.component';
+import {ActivitiesCardsComponent} from "@activities/activities-cards/activities-cards.component";
+import {async, ComponentFixture, TestBed} from "@angular/core/testing";
 import {RouterModule} from "@angular/router";
 
-describe('ActivitiesCardsComponent', () => {
+describe("ActivitiesCardsComponent", () => {
   let component: ActivitiesCardsComponent;
   let fixture: ComponentFixture<ActivitiesCardsComponent>;
 
@@ -21,7 +20,7 @@ describe('ActivitiesCardsComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should be created', () => {
+  it("should be created", () => {
     expect(component).toBeTruthy();
   });
 });
diff --git a/ngapp/src/app/activities/activities-cards/activities-cards.component.ts b/ngapp/src/app/activities/activities-cards/activities-cards.component.ts
@@ -15,34 +15,35 @@
  * limitations under the License.
  */
 
-import { Component } from '@angular/core';
-import { EventEmitter } from '@angular/core';
-import { Input } from '@angular/core';
-import { Output } from '@angular/core';
-
-import { Activity } from '@activities/shared/activity.model';
+import { Activity } from "@activities/shared/activity.model";
+import { Component } from "@angular/core";
+import { EventEmitter } from "@angular/core";
+import { Input } from "@angular/core";
+import { Output } from "@angular/core";
 
 @Component({
   moduleId: module.id,
-  selector: 'app-activities-cards',
-  templateUrl: 'activities-cards.component.html',
-  styleUrls: ['activities-cards.component.css']
+  selector: "app-activities-cards",
+  templateUrl: "activities-cards.component.html",
+  styleUrls: ["activities-cards.component.css"]
 })
 export class ActivitiesCardsComponent {
 
-  @Input() activities: Activity[];
-  @Input() selectedActivities: Activity[];
-  @Output() onActivitySelected: EventEmitter<Activity> = new EventEmitter<Activity>();
-  @Output() onActivityDeselected: EventEmitter<Activity> = new EventEmitter<Activity>();
-  @Output() onTagSelected: EventEmitter<string> = new EventEmitter<string>();
-  @Output() onStartActivity: EventEmitter<string> = new EventEmitter<string>();
-  @Output() onEditActivity: EventEmitter<string> = new EventEmitter<string>();
-  @Output() onDeleteActivity: EventEmitter<string> = new EventEmitter<string>();
+  @Input() private activities: Activity[];
+  @Input() private selectedActivities: Activity[];
+  @Output() private onActivitySelected: EventEmitter<Activity> = new EventEmitter<Activity>();
+  @Output() private onActivityDeselected: EventEmitter<Activity> = new EventEmitter<Activity>();
+  @Output() private onTagSelected: EventEmitter<string> = new EventEmitter<string>();
+  @Output() private onStartActivity: EventEmitter<string> = new EventEmitter<string>();
+  @Output() private onEditActivity: EventEmitter<string> = new EventEmitter<string>();
+  @Output() private onDeleteActivity: EventEmitter<string> = new EventEmitter<string>();
 
   /**
    * Constructor.
    */
-  constructor() {}
+  constructor() {
+    // nothing to do
+  }
 
   public toggleActivitySelected(activity: Activity): void {
     if (this.isSelected(activity)) {
@@ -75,4 +76,3 @@ export class ActivitiesCardsComponent {
   }
 
 }
-
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
@@ -1,9 +1,8 @@
-import {async, ComponentFixture, TestBed} from '@angular/core/testing';
-
-import {ActivitiesListComponent} from './activities-list.component';
+import {ActivitiesListComponent} from "@activities/activities-list/activities-list.component";
+import {async, ComponentFixture, TestBed} from "@angular/core/testing";
 import {RouterModule} from "@angular/router";
 
-describe('ActivitiesListComponent', () => {
+describe("ActivitiesListComponent", () => {
   let component: ActivitiesListComponent;
   let fixture: ComponentFixture<ActivitiesListComponent>;
 
@@ -21,7 +20,7 @@ describe('ActivitiesListComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should be created', () => {
+  it("should be created", () => {
     expect(component).toBeTruthy();
   });
 });
diff --git a/ngapp/src/app/activities/activities-list/activities-list.component.ts b/ngapp/src/app/activities/activities-list/activities-list.component.ts
@@ -15,34 +15,35 @@
  * limitations under the License.
  */
 
-import { Component } from '@angular/core';
-import { EventEmitter } from '@angular/core';
-import { Input } from '@angular/core';
-import { Output } from '@angular/core';
-
-import { Activity } from '@activities/shared/activity.model';
+import { Activity } from "@activities/shared/activity.model";
+import { Component } from "@angular/core";
+import { EventEmitter } from "@angular/core";
+import { Input } from "@angular/core";
+import { Output } from "@angular/core";
 
 @Component({
   moduleId: module.id,
-  selector: 'app-activities-list',
-  templateUrl: 'activities-list.component.html',
-  styleUrls: ['activities-list.component.css']
+  selector: "app-activities-list",
+  templateUrl: "activities-list.component.html",
+  styleUrls: ["activities-list.component.css"]
 })
 export class ActivitiesListComponent {
 
-  @Input() activities: Activity[];
-  @Input() selectedActivities: Activity[];
-  @Output() onActivitySelected: EventEmitter<Activity> = new EventEmitter<Activity>();
-  @Output() onActivityDeselected: EventEmitter<Activity> = new EventEmitter<Activity>();
-  @Output() onTagSelected: EventEmitter<string> = new EventEmitter<string>();
-  @Output() onEditActivity: EventEmitter<string> = new EventEmitter<string>();
-  @Output() onStartActivity: EventEmitter<string> = new EventEmitter<string>();
-  @Output() onDeleteActivity: EventEmitter<string> = new EventEmitter<string>();
+  @Input() private activities: Activity[];
+  @Input() private selectedActivities: Activity[];
+  @Output() private onActivitySelected: EventEmitter<Activity> = new EventEmitter<Activity>();
+  @Output() private onActivityDeselected: EventEmitter<Activity> = new EventEmitter<Activity>();
+  @Output() private onTagSelected: EventEmitter<string> = new EventEmitter<string>();
+  @Output() private onEditActivity: EventEmitter<string> = new EventEmitter<string>();
+  @Output() private onStartActivity: EventEmitter<string> = new EventEmitter<string>();
+  @Output() private onDeleteActivity: EventEmitter<string> = new EventEmitter<string>();
 
   /**
    * Constructor.
    */
-  constructor() {}
+  constructor() {
+    // nothing to do
+  }
 
   public toggleActivitySelected(activity: Activity): void {
     if (this.isSelected(activity)) {

diff --git a/ngapp/src/app/activities/activities-routing.module.ts b/ngapp/src/app/activities/activities-routing.module.ts
@@ -2,29 +2,28 @@
  * @license
  * Copyright 2017 JBoss Inc
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * Licensed under the Apache License, /
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-import { Routes } from '@angular/router';
-
 import { ActivitiesComponent } from "@activities/activities.component";
 import { AddActivityComponent } from "@activities/add-activity/add-activity.component";
+import { NgModule } from "@angular/core";
+import { RouterModule } from "@angular/router";
+import { Routes } from "@angular/router";
+
+export const activitiesRootPath = "/activities";
+export const addActivityPath = activitiesRootPath + "/add-activity";
+export const editActivityPath = activitiesRootPath + "/edit-activity";
 
 const activitiesRoutes: Routes = [
-  { path: 'activities', component: ActivitiesComponent },
-  { path: 'activities/add-activity', component: AddActivityComponent }
+  { path: activitiesRootPath, component: ActivitiesComponent },
+  { path: addActivityPath, component: AddActivityComponent }
+//  { path: editActivityPath, component: EditActivityComponent }
 ];
 
 @NgModule({

diff --git a/ngapp/src/app/activities/activities.component.html b/ngapp/src/app/activities/activities.component.html
@@ -18,22 +18,22 @@ <h2>Activities</h2>
           <div class="form-group toolbar-pf-filter">
             <label class="sr-only" for="filter">Name</label>
             <div class="input-group" style="width: 100%">
-              <input name="name-filter" [(ngModel)]="filters.nameFilter" type="text" class="form-control name-filter" id="filter" placeholder="Filter by name...">
+              <input name="name-filter" [(ngModel)]="nameFilter" type="text" class="form-control name-filter" id="filter" placeholder="Filter by name...">
             </div>
           </div>
           <div class="form-group">
             <button class="btn btn-link" type="button" (click)="toggleSortDirection()">
-              <span *ngIf="filters.sortDirection === 'ASC'" class="fa fa-sort-alpha-asc"></span>
-              <span *ngIf="filters.sortDirection === 'DESC'" class="fa fa-sort-alpha-desc"></span>
+              <span *ngIf="isSortAscending" class="fa fa-sort-alpha-asc"></span>
+              <span *ngIf="isSortDescending" class="fa fa-sort-alpha-desc"></span>
             </button>
           </div>
           <div class="form-group">
-            <a class="btn btn-primary" [routerLink]="['/activities/add-activity']">Add Activity</a>
+            <a class="btn btn-primary" [routerLink]="[ addActivityLink ]">Add Activity</a>
           </div>
           <div class="form-group toolbar-pf-view-selector">
             <ul class="list-inline">
-              <li *ngIf="filters.layout === 'list'"><a (click)="onCardLayout()"><i class="fa fa-th-list"></i></a></li>
-              <li *ngIf="filters.layout === 'card'"><a (click)="onListLayout()"><i class="fa fa-th"></i></a></li>
+              <li *ngIf="isListLayout"><a (click)="onCardLayout()"><i class="fa fa-th-list"></i></a></li>
+              <li *ngIf="isCardLayout"><a (click)="onListLayout()"><i class="fa fa-th"></i></a></li>
             </ul>
           </div>
         </form>
@@ -60,7 +60,7 @@ <h1>No Activities Found</h1>
           </p>
           <div class="blank-slate-pf-main-action">
             <div class="btn-group">
-              <a class="btn btn-primary btn-lg" [routerLink]="['/activities/add-activity']">Add Activity</a>
+              <a class="btn btn-primary btn-lg" [routerLink]="[ addActivityLink ]">Add Activity</a>
             </div>
           </div>
         </div>
@@ -79,7 +79,7 @@ <h1>No Activities Found</h1>
             <div class="card-pf card-pf-accented">
               <div class="card-pf-heading">
                 <h1 class="card-pf-title">
-                  <p><span class="spinner spinner-xs spinner-inline"></span> Loading Activities...</p>
+                  <span class="spinner spinner-xs spinner-inline"></span> Loading Activities...
                 </h1>
               </div>
             </div>
@@ -89,10 +89,10 @@ <h1 class="card-pf-title">
 
       <!-- The list or card view -->
       <div class="col-md-12" *ngIf="isLoaded('activities')">
-        <app-activities-list *ngIf="filters.layout === 'list'" [activities]="filteredActivities" [selectedActivities]="selectedActivities"
+        <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>
-        <app-activities-cards *ngIf="filters.layout === 'card'" [activities]="filteredActivities" [selectedActivities]="selectedActivities"
+        <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>
       </div>

diff --git a/ngapp/src/app/activities/activities.component.spec.ts b/ngapp/src/app/activities/activities.component.spec.ts
@@ -1,16 +1,15 @@
-import {async, ComponentFixture, TestBed} from '@angular/core/testing';
-
-import {ActivitiesComponent} from './activities.component';
-import {FormsModule} from "@angular/forms";
-import {RouterTestingModule} from "@angular/router/testing";
-import {ActivitiesListComponent} from "@activities/activities-list/activities-list.component";
 import {ActivitiesCardsComponent} from "@activities/activities-cards/activities-cards.component";
-import {ModalModule} from "ngx-bootstrap";
+import {ActivitiesListComponent} from "@activities/activities-list/activities-list.component";
+import {ActivitiesComponent} from "@activities/activities.component";
+import {async, ComponentFixture, TestBed} from "@angular/core/testing";
+import {FormsModule} from "@angular/forms";
 import {HttpModule} from "@angular/http";
+import {RouterTestingModule} from "@angular/router/testing";
 import {CoreModule} from "@core/core.module";
 import {SharedModule} from "@shared/shared.module";
+import {ModalModule} from "ngx-bootstrap";
 
-describe('ActivitiesComponent', () => {
+describe("ActivitiesComponent", () => {
   let component: ActivitiesComponent;
   let fixture: ComponentFixture<ActivitiesComponent>;
 
@@ -28,7 +27,7 @@ describe('ActivitiesComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should be created', () => {
+  it("should be created", () => {
     expect(component).toBeTruthy();
   });
 });