More cleanup work

Author: David Sargent

src/app/app.module.ts

@@ -1,31 +1,30 @@
-import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { Routes, RouterModule } from '@angular/router';
-import { FeCommonModule } from './common/common.module';
-import { AppComponent } from './app.component';
-import { LoginComponent } from 'app/common/components/smart/login/login.component';
-import { TripPlannerComponent } from 'app/passengers/components/smart/trip-planner/trip-planner.component';
-import { AgmCoreModule, GoogleMapsAPIWrapper } from '@agm/core';
-import { PlacesAutocompleteComponent } from 'app/passengers/components/presentation/places-autocomplete/places-autocomplete.component';
-import { StoreModule } from '@ngrx/store';
-import { MatFormFieldModule, MatInputModule } from '@angular/material';
-import { GMapsDirectionsService } from 'app/common/states/gmaps.service';
-import { HttpModule } from '@angular/http';
-import { NotificationService } from 'app/common/states/notification.service';
-import { EventSourceService } from 'app/common/states/event-source.service';
+import {BrowserModule} from '@angular/platform-browser';
+import {NgModule} from '@angular/core';
+import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
+import {Routes, RouterModule} from '@angular/router';
+import {FeCommonModule} from './common/common.module';
+import {AppComponent} from './app.component';
+import {LoginComponent} from 'app/common/components/smart/login/login.component';
+import {TripPlannerComponent} from 'app/passengers/components/smart/trip-planner/trip-planner.component';
+import {AgmCoreModule, GoogleMapsAPIWrapper} from '@agm/core';
+import {PlacesAutocompleteComponent} from 'app/passengers/components/presentation/places-autocomplete/places-autocomplete.component';
+import {StoreModule} from '@ngrx/store';
+import {MatFormFieldModule, MatInputModule} from '@angular/material';
+import {GMapsDirectionsService} from 'app/common/states/gmaps.service';
+import {HttpModule} from '@angular/http';
+import {NotificationService} from 'app/common/states/notification.service';
+import {EventSourceService} from 'app/common/states/event-source.service';
 import 'rxjs/add/operator/map';
-import { HttpClientModule } from '@angular/common/http';
+import {HttpClientModule} from '@angular/common/http';
 import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
 import {reducers} from './action-reducer-map';
 import {StoreDevtoolsModule} from '@ngrx/store-devtools';
 import 'rxjs/add/operator/map';
-import { HttpClientModule } from '@angular/common/http';
 
 const routes: Routes = [
-    {path: '', redirectTo: 'login', pathMatch: 'full'},
-    {path: 'login', component: LoginComponent},
-    {path: 'dashboard', component: TripPlannerComponent}
+  {path: '', redirectTo: 'login', pathMatch: 'full'},
+  {path: 'login', component: LoginComponent},
+  {path: 'dashboard', component: TripPlannerComponent}
 ];
 
 @NgModule({
@@ -42,7 +41,7 @@ const routes: Routes = [
       libraries: ['places']
     }),
     StoreModule.forRoot(reducers),
-    StoreDevtoolsModule.instrument({ maxAge: 25 }),
+    StoreDevtoolsModule.instrument({maxAge: 25}),
     MatFormFieldModule,
     MatInputModule,
     MatProgressSpinnerModule,
@@ -54,4 +53,5 @@ const routes: Routes = [
   ],
   bootstrap: [AppComponent]
 })
-export class AppModule { }
+export class AppModule {
+}

src/app/common/common.module.ts

@@ -1,8 +1,8 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { AgmCoreModule } from '@agm/core'
+import { AgmCoreModule } from '@agm/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { Routes, RouterModule } from '@angular/router';
+import { RouterModule } from '@angular/router';
 import { TextBoxComponent } from './components/presentation/text-box/text-box.component';
 import { LoginComponent } from './components/smart/login/login.component';
 import { CheckBoxComponent } from './components/presentation/check-box/check-box.component';
@@ -11,8 +11,17 @@ import { RaisedButtonComponent } from './components/presentation/raised-button/r
 import { BasicButtonComponent } from './components/presentation/basic-button/basic-button.component';
 import { IconButtonComponent } from './components/presentation/icon-button/icon-button.component';
 import { GMapsDirectionsService} from './states/gmaps.service';
-import { MatToolbarModule, MatCheckboxModule, MatButtonModule, MatFormFieldModule, MatFormFieldControl, MatInputModule, MatIconModule, MatCardModule, MatAutocompleteModule,
-  MatProgressSpinnerModule } from '@angular/material';
+import {
+  MatToolbarModule,
+  MatCheckboxModule,
+  MatButtonModule,
+  MatFormFieldModule,
+  MatInputModule,
+  MatIconModule,
+  MatCardModule,
+  MatAutocompleteModule,
+  MatProgressSpinnerModule
+} from '@angular/material';
 import { HeaderComponent } from './components/presentation/header/header.component';
 import { GetEstimateButtonComponent } from './components/presentation/get-estimate-button/get-estimate-button.component';
 

src/app/common/states/event-source.service.ts

@@ -9,14 +9,17 @@ export class EventSourceService {
   constructor() { }
 
   forUrl(url: string, err: (EventSource) => void): EventSource {
-    if (!isNullOrUndefined(this.connections[url]) && (this.connections[url].conn.readyState !== 2 && this.connections[url].err !== null)) return this.connections[url];
-    let newCon = this.createEventStreamConnection(url, err);
+    if (!isNullOrUndefined(this.connections[url]) && (this.connections[url].conn.readyState !== 2 && this.connections[url].err !== null))  {
+      return this.connections[url];
+    }
+
+    const newCon = this.createEventStreamConnection(url, err);
     this.connections[url] = newCon;
     return newCon.conn;
   }
 
   private createEventStreamConnection(url: string, err: (EventSource) => void) {
-    let newCon = {
+    const newCon = {
       conn: new this.EventSource(url),
       errorHandler: err,
       errorHandlerCalled: false

src/app/common/states/notification.service.spec.ts

@@ -2,6 +2,8 @@ import { TestBed, inject } from '@angular/core/testing';
 import EventSourceMock, { sources } from 'eventsourcemock';
 import { NotificationService } from './notification.service';
 import {EventSourceService} from './event-source.service';
+import {StoreModule} from '@ngrx/store';
+import {reducers} from '../../action-reducer-map';
 
 describe('NotificationService', () => {
   let uri: string;
@@ -11,6 +13,9 @@ describe('NotificationService', () => {
     const mockEventSource = new EventSourceMock(uri);
 
     TestBed.configureTestingModule({
+      imports: [
+        StoreModule.forRoot({reducers})
+      ],
       providers: [NotificationService, EventSourceService]
     });
     const eventSourceService = TestBed.get(EventSourceService);

src/app/common/states/notification.service.ts

@@ -41,9 +41,8 @@ export class NotificationService {
 
   onInit(): void {
     const currNotificationService = this;
-    this.bindToNotificationEventSource(this.eventSourceService.forUrl(`http://localhost:32700/events?stream=${this.userId()}`, eventSource => {
-      this.bindToNotificationEventSource.call(currNotificationService, eventSource);
-    }));
+    this.bindToNotificationEventSource(this.eventSourceService.forUrl(`http://localhost:32700/events?stream=${this.userId()}`,
+        eventSource => this.bindToNotificationEventSource.call(currNotificationService, eventSource)));
     this.listenForRouteUpdates();
   }
 

src/app/common/states/reducers/notification.reducer.ts

@@ -9,8 +9,7 @@ initialState.duration = 0;
 export function notificationReducer(state: Route = initialState, action: PlannedRouteAction): Route {
   switch (action.type) {
     case 'UPDATE_ROUTE':
-      let action1 = (action as UpdatePlannedRoute);
-      return action1.data;
+      return (action as UpdatePlannedRoute).data;
 
     default:
       return state;

src/app/passengers/components/smart/trip-planner/trip-planner.component.ts

@@ -39,7 +39,7 @@ interface AppState {
 })
 export class TripPlannerComponent implements OnInit {
 
-  title: string = 'Trip Planner';
+  title = 'Trip Planner';
 
   @Input() private latitude: number;
   @Input() private longitude: number;
@@ -218,7 +218,9 @@ export class TripPlannerComponent implements OnInit {
   }
 
   onFindRideClick(event) {
-    if (this.findYourRideButtonDisabled) return;
+    if (this.findYourRideButtonDisabled) {
+      return;
+    }
 
     const pickupAddress = this.pickupTextboxValue;
     const destinationAddress = this.destinationTextboxValue;
@@ -238,7 +240,9 @@ export class TripPlannerComponent implements OnInit {
     // Until user-service is configured we will have to hit directly user service to get JWT token to contact edge-service
     const authPort = '32942';
     // To-Do: Disable "Find Ride" until inputs are validated
-    if (this.tripEstimateButtonDisabled) return;
+    if (this.tripEstimateButtonDisabled) {
+      return;
+    }
 
     const headers = new HttpHeaders({
       'Content-Type': 'application/x-www-form-urlencoded',
@@ -266,7 +270,7 @@ export class TripPlannerComponent implements OnInit {
 
 // Request to communicate with calculation service via JWT token
   postToCalculationService() {
-    const headers = this.requestHeaders("application/json", "Bearer");
+    const headers = this.requestHeaders('application/json', 'Bearer');
     const resOptions = {
       headers,
       withCredentials: true,
@@ -286,7 +290,7 @@ export class TripPlannerComponent implements OnInit {
   }
 
   requestHeaders(contentType, authorization: string): HttpHeaders {
-    const token = localStorage.getItem("accessToken");
+    const token = localStorage.getItem('accessToken');
     return new HttpHeaders({
       'Content-Type': contentType,
       'Authorization': `${authorization} ${token}`

src/app/passengers/reducers/trip-planner.reducer.ts

@@ -5,7 +5,8 @@ import {
   USER_LOCATION_INPUT_REQUIRED
 } from '../actions/trip-planner.action';
 
-export function tripPlannerStateReducer(state: TripPlannerState = USER_LOCATION_INPUT_REQUIRED, action: TripPlannerAction): TripPlannerState {
+export function tripPlannerStateReducer(
+  state: TripPlannerState = USER_LOCATION_INPUT_REQUIRED, action: TripPlannerAction): TripPlannerState {
   switch (action.type) {
     case USER_LOCATION_INPUT_REQUIRED:
     case PRICE_CALCULATION_REQUIRED:
@@ -15,7 +16,9 @@ export function tripPlannerStateReducer(state: TripPlannerState = USER_LOCATION_
 
     case FINDING_RIDE_REQUIRED: {
       // Workaround for TOOL-7543
-      if (state === USER_LOCATION_INPUT_REQUIRED) return state;
+      if (state === USER_LOCATION_INPUT_REQUIRED) {
+        return state;
+      }
       return action.type as TripPlannerState;
     }