gh-313 Resolve ng lint failures

ghillert · cppwfs · commit 7f9311680726 · 2017-08-02T10:00:31.000-04:00
Need to use Object.keys when using map in a for loop.
diff --git a/ui/src/app/about/about-details.component.ts b/ui/src/app/about/about-details.component.ts
@@ -41,7 +41,7 @@ export class AboutDetailsComponent implements OnInit {
   goBack() {
     console.log('Back to about page ...');
     this.router.navigate(['about']);
-  };
+  }
 
   onCopyToClipboardSuccess(e) {
     this.toastyService.success('Copied About Details to Clipboard (As JSON).');
@@ -55,5 +55,5 @@ export class AboutDetailsComponent implements OnInit {
       }
     }
     return true;
-  };
+  }
 }
diff --git a/ui/src/app/about/about.component.ts b/ui/src/app/about/about.component.ts
@@ -37,5 +37,5 @@ export class AboutComponent implements OnInit {
   goToDetails() {
     console.log('Go to details ...');
     this.router.navigate(['about/details']);
-  };
+  }
 }
diff --git a/ui/src/app/about/about.service.spec.ts b/ui/src/app/about/about.service.spec.ts
@@ -1,5 +1,5 @@
 import { AboutService } from './about.service';
-import { Observable } from 'rxjs/Rx'
+import { Observable } from 'rxjs/Rx';
 import { ErrorHandler } from '../shared/model/error-handler';
 import { Response, ResponseOptions } from '@angular/http';
 
diff --git a/ui/src/app/apps/app-details/app-details.component.ts b/ui/src/app/apps/app-details/app-details.component.ts
@@ -53,7 +53,5 @@ export class AppDetailsComponent implements OnInit {
   goBack() {
     console.log('Back to apps page ...');
     this.router.navigate(['apps']);
-  };
-
-
+  }
 }
diff --git a/ui/src/app/apps/apps-bulk-import.component.ts b/ui/src/app/apps/apps-bulk-import.component.ts
@@ -38,17 +38,17 @@ export class AppsBulkImportComponent implements OnInit, OnChanges {
   goBack() {
     console.log('Back to apps page ...');
     this.router.navigate(['apps']);
-  };
+  }
 
   displayFileContents(contents) {
     console.log(contents);
     const reader = new FileReader();
     reader.onloadend = (e) => {
       this.parseTextArea(reader.result);
-    }
+    };
     console.log(contents.target.files[0]);
     reader.readAsText(contents.target.files[0]);
-  };
+  }
 
   getAppsPropertiesAsString(): string {
     return this.model.appsProperties.join('\n');
@@ -72,7 +72,7 @@ export class AppsBulkImportComponent implements OnInit, OnChanges {
   /**
    * Bulk Import Apps.
    */
-  bulkImportApps = function() {
+  bulkImportApps() {
 
       if (this.model.uri && this.model.appsProperties.length > 0) {
           this.toastyService.error('Please provide only a URI or Properties not both.');
@@ -92,15 +92,13 @@ export class AppsBulkImportComponent implements OnInit, OnChanges {
         this.toastyService.success('Apps Imported.');
         const reloadAppsObservable = this.appsService.getApps(true).subscribe(
           appRegistrations => {
-            console.log('Back to about page ...')
-            this.router.navigate(['apps'])
+            console.log('Back to about page ...');
+            this.router.navigate(['apps']);
           }
         );
         this.busy.push(reloadAppsObservable);
       }
       );
       this.busy.push(observable);
-
-  };
-
+  }
 }
diff --git a/ui/src/app/apps/apps-register/apps-register.component.ts b/ui/src/app/apps/apps-register/apps-register.component.ts
@@ -48,7 +48,7 @@ export class AppsRegisterComponent implements OnInit, OnChanges {
   goBack() {
     console.log('Back to apps page ...');
     this.router.navigate(['apps']);
-  };
+  }
 
   ngOnChanges(changes) {
       console.log(changes);
@@ -71,8 +71,8 @@ export class AppsRegisterComponent implements OnInit, OnChanges {
         this.toastyService.success(`${data.length} App(s) registered.`);
         const reloadAppsObservable = this.appsService.getApps(true).subscribe(
           appRegistrations => {
-            console.log('Back to apps page ...')
-            this.router.navigate(['apps'])
+            console.log('Back to apps page ...');
+            this.router.navigate(['apps']);
           }
         );
         this.busy.push(reloadAppsObservable);
@@ -81,23 +81,23 @@ export class AppsRegisterComponent implements OnInit, OnChanges {
         this.toastyService.error(error);
       }
     ));
-  };
+  }
 
   /**
    * Removes app comntroller entry
    * @param index Index of the entry
    */
   removeApp(index) {
     this.model.splice(index, 1);
-  };
+  }
 
   /**
    * Adds app entry at the specified index
    * @param index Insertion index
    */
   addApp(index) {
     this.model.splice(index + 1, 0, new AppRegistration());
-  };
+  }
 
   trackModel(index, appRegistration) {
     return index;
diff --git a/ui/src/app/apps/apps.component.ts b/ui/src/app/apps/apps.component.ts
@@ -73,7 +73,7 @@ export class AppsComponent implements OnInit {
   bulkImportApps() {
     console.log('Go to Bulk Import page ...');
     this.router.navigate(['apps/bulk-import-apps']);
-  };
+  }
 
   public proceedToUnregisterSingleAppRegistration(appRegistration: AppRegistration): void {
     console.log('Proceeding to unregister application...', appRegistration);
@@ -105,11 +105,11 @@ export class AppsComponent implements OnInit {
 
   public cancelUnregisterSingleApp() {
     this.unregisterSingleAppModal.hide();
-  };
+  }
 
   public cancelUnregisterMultipleApps() {
     this.unregisterMultipleAppsModal.hide();
-  };
+  }
 
   public viewDetails(appRegistration: AppRegistration) {
     this.router.navigate(['apps/' + appRegistration.type + '/' +  appRegistration.name]);
@@ -123,7 +123,7 @@ export class AppsComponent implements OnInit {
    * @param page 1-index-based
    */
   getPage(page: number) {
-    console.log(`Getting page ${page}.`)
+    console.log(`Getting page ${page}.`);
     this.appsService.appRegistrations.pageNumber = page - 1;
     this.loadAppRegistrations(true);
   }
diff --git a/ui/src/app/apps/apps.service.spec.ts b/ui/src/app/apps/apps.service.spec.ts
@@ -1,8 +1,8 @@
 import { URLSearchParams } from '@angular/http';
-import { Observable } from 'rxjs/Rx'
+import { Observable } from 'rxjs/Rx';
 
 import { AppsService } from './apps.service';
-import { HttpUtils } from '../shared/support/http.utils'
+import { HttpUtils } from '../shared/support/http.utils';
 import { ApplicationType, AppRegistration, ErrorHandler } from '../shared/model';
 import { SharedAppsService } from '../shared/services/shared-apps.service';
 import { AppRegistrationImport } from './model/app-registration-import';
@@ -58,7 +58,7 @@ describe('AppsService', () => {
 
     it('should call the apps service with the right url to get all apps', () => {
 
-      const requestOptions = HttpUtils.getDefaultRequestOptions()
+      const requestOptions = HttpUtils.getDefaultRequestOptions();
       const params = new URLSearchParams();
 
       params.append('uri', 'http://blubba');
@@ -78,7 +78,7 @@ describe('AppsService', () => {
   describe('unregisterApp', () => {
 
     it('should call the apps service with the right url to unregister a single app', () => {
-      const requestOptions = HttpUtils.getDefaultRequestOptions()
+      const requestOptions = HttpUtils.getDefaultRequestOptions();
       const appRegistration = new AppRegistration('blubba', ApplicationType.source, 'http://somewhere');
       this.mockHttp.delete.and.returnValue(Observable.of(this.jsonData));
       this.appsService.unregisterApp(appRegistration);
@@ -90,7 +90,7 @@ describe('AppsService', () => {
   describe('registerApp', () => {
 
     it('should call the apps service with the right url to register a single app', () => {
-      const requestOptions = HttpUtils.getDefaultRequestOptions()
+      const requestOptions = HttpUtils.getDefaultRequestOptions();
       const params = new URLSearchParams();
 
       params.append('uri', 'http://blubba');
@@ -110,15 +110,15 @@ describe('AppsService', () => {
 
   describe('registerMultipleApps', () => {
     it('should call the apps service with the right url to register multiple apps', () => {
-      const requestOptions1 = HttpUtils.getDefaultRequestOptions()
+      const requestOptions1 = HttpUtils.getDefaultRequestOptions();
       const params1 = new URLSearchParams();
 
       params1.append('uri', 'http://somewhere');
       params1.append('force', 'false');
 
       requestOptions1.params = params1;
 
-      const requestOptions2 = HttpUtils.getDefaultRequestOptions()
+      const requestOptions2 = HttpUtils.getDefaultRequestOptions();
       const params2 = new URLSearchParams();
 
       params2.append('uri', 'http://somewhere-else');
diff --git a/ui/src/app/apps/apps.service.ts b/ui/src/app/apps/apps.service.ts
@@ -14,7 +14,7 @@ import { ApplicationType } from '../shared/model/application-type';
 import { AppRegistrationImport } from './model/app-registration-import';
 import { PageRequest } from '../shared/model/pagination/page-request.model';
 
-import { HttpUtils } from '../shared/support/http.utils'
+import { HttpUtils } from '../shared/support/http.utils';
 
 /**
  * Service class for the Apps module.
@@ -42,7 +42,7 @@ export class AppsService {
       if (!this.appRegistrations) {
         this.appRegistrations = new Page<AppRegistration>();
       }
-      console.log('Fetching App Registrations remotely.')
+      console.log('Fetching App Registrations remotely.');
       this.remotelyLoaded = true;
 
       return this.sharedAppsService.getApps(
diff --git a/ui/src/app/runtime/model/runtime-app.ts b/ui/src/app/runtime/model/runtime-app.ts
@@ -10,7 +10,7 @@ export class RuntimeApp {
     public deploymentId: String;
     public state: String;
     public instances: any;
-    public appInstances: RuntimeAppInstance[]
+    public appInstances: RuntimeAppInstance[];
 
     constructor(
         deploymentId: String,
diff --git a/ui/src/app/runtime/runtime-apps.component.ts b/ui/src/app/runtime/runtime-apps.component.ts
@@ -44,27 +44,27 @@ export class RuntimeAppsComponent implements OnInit {
         );
     }
 
-    private getPage(page: number) {
-        console.log(`Getting page ${page}.`)
+    public getPage(page: number) {
+        console.log(`Getting page ${page}.`);
         const pageInfo = new PageInfo();
         pageInfo.pageNumber = page - 1;
         this.loadRuntimeApps(pageInfo);
     }
 
-    private appDetails(item: RuntimeApp) {
+    public appDetails(item: RuntimeApp) {
         this.showChildModal(item);
     }
 
-    private showChildModal(item: RuntimeApp): void {
+    public showChildModal(item: RuntimeApp): void {
         this.runtimeApp = item;
         this.childModal.show();
     }
 
-    private hideChildModal(): void {
+    public hideChildModal(): void {
         this.childModal.hide();
     }
 
-    private cancel = function () {
+    public cancel = function () {
         this.hideChildModal();
     };
 
diff --git a/ui/src/app/runtime/runtime-apps.service.ts b/ui/src/app/runtime/runtime-apps.service.ts
@@ -41,7 +41,7 @@ export class RuntimeAppsService {
         let items: RuntimeApp[];
         if (response._embedded && response._embedded.appStatusResourceList) {
             items = response._embedded.appStatusResourceList as RuntimeApp[];
-          for(const item of items) {
+          for (const item of items) {
             item.appInstances = item.instances._embedded.appInstanceStatusResourceList;
           }
         } else {
diff --git a/ui/src/app/shared/components/property-table/property-table.component.ts b/ui/src/app/shared/components/property-table/property-table.component.ts
@@ -202,7 +202,7 @@ export class PropertyTableComponent {
     const _form = this.bulkForm;
     reader.onloadend = function(e){
       _form.patchValue({bulkProperties: reader.result});
-    }
+    };
     reader.readAsText(file);
   }
 }
diff --git a/ui/src/app/shared/model/page.ts b/ui/src/app/shared/model/page.ts
@@ -1,4 +1,4 @@
-import { PaginationInstance } from 'ngx-pagination'
+import { PaginationInstance } from 'ngx-pagination';
 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/observable/of';
 
diff --git a/ui/src/app/shared/pipes/key-value-filter.pipe.ts b/ui/src/app/shared/pipes/key-value-filter.pipe.ts
@@ -4,7 +4,7 @@ import { PipeTransform, Pipe } from '@angular/core';
 export class KeyValuePipe implements PipeTransform {
     transform(map, args: Object[]): any {
         const keys = [];
-        for (const key in map) {
+        for (const key of Object.keys(map)) {
             keys.push({key: key, value: map[key]});
         }
         return keys;
diff --git a/ui/src/app/shared/services/shared-apps.service.ts b/ui/src/app/shared/services/shared-apps.service.ts
@@ -10,7 +10,7 @@ import 'rxjs/add/observable/of';
 
 import { AppRegistration, ApplicationType, ErrorHandler, Page } from '../model';
 import { PageRequest } from '../model/pagination/page-request.model';
-import { HttpUtils } from '../support/http.utils'
+import { HttpUtils } from '../support/http.utils';
 
 @Injectable()
 export class SharedAppsService {
diff --git a/ui/src/app/shared/shared.module.ts b/ui/src/app/shared/shared.module.ts
@@ -12,7 +12,7 @@ import { ErrorHandler } from './model/error-handler';
 import { CapitalizePipe } from './pipes/capitalize.pipe';
 import { TriStateCheckboxComponent } from './components/tri-state-checkbox.component';
 import { TriStateButtonComponent } from './components/tri-state-button.component';
-import { ClickOutsideDirective } from '../shared/directives/click-outside.directive'
+import { ClickOutsideDirective } from '../shared/directives/click-outside.directive';
 
 import { KeyValuePipe } from './pipes/key-value-filter.pipe';
 
diff --git a/ui/src/app/streams/model/stream-definition.ts b/ui/src/app/streams/model/stream-definition.ts
@@ -1,4 +1,4 @@
-import { Expandable } from './../../shared/model/expandable'
+import { Expandable } from './../../shared/model/expandable';
 
 /**
  * Represents a StreamDefiniton.
@@ -19,7 +19,7 @@ export class StreamDefinition implements Expandable {
       status: String) {
     this.name = name;
     this.dslText = dslText;
-    this.status = status
+    this.status = status;
   }
 
   /**
diff --git a/ui/src/app/streams/stream-definitions/stream-definitions.component.ts b/ui/src/app/streams/stream-definitions/stream-definitions.component.ts
@@ -70,7 +70,7 @@ export class StreamDefinitionsComponent implements OnInit {
    * @param page 1-index-based
    */
   getPage(page: number) {
-    console.log(`Getting page ${page}.`)
+    console.log(`Getting page ${page}.`);
     this.streamsService.streamDefinitions.pageNumber = page - 1;
     this.loadStreamDefinitions();
   }
@@ -137,7 +137,7 @@ export class StreamDefinitionsComponent implements OnInit {
    * @param streamDefinition the stream definition to destroy.
    */
   public proceed(streamDefinition: StreamDefinition): void {
-    console.log('Proceeding to destroy definition...', streamDefinition)
+    console.log('Proceeding to destroy definition...', streamDefinition);
     this.streamsService.destroyDefinition(streamDefinition).subscribe(
       data => {
         this.cancel();
@@ -159,9 +159,9 @@ export class StreamDefinitionsComponent implements OnInit {
    * Expands all definition entries to show flo diagram on list page.
    */
   expandPage() {
-    console.log('Expand all.')
+    console.log('Expand all.');
     this.streamDefinitions.items.map(x => {
-      console.log(x)
+      console.log(x);
       x.isExpanded = true;
     });
   }
@@ -170,7 +170,7 @@ export class StreamDefinitionsComponent implements OnInit {
    * Collapses all definition entries to hid the flow diagrams on list page.
    */
   collapsePage() {
-    console.log('Collapse all.')
+    console.log('Collapse all.');
     this.streamDefinitions.items.map(x => {
       console.log(x);
       x.isExpanded = false;
diff --git a/ui/src/app/streams/stream-deploy/stream-deploy.component.ts b/ui/src/app/streams/stream-deploy/stream-deploy.component.ts
@@ -107,7 +107,7 @@ export class StreamDeployComponent implements OnInit, OnDestroy {
     const _form = this.form;
     reader.onloadend = function(e){
       _form.patchValue({deploymentProperties: reader.result});
-    }
+    };
     reader.readAsText(file);
   }
 }
diff --git a/ui/src/app/streams/streams.service.ts b/ui/src/app/streams/streams.service.ts
diff --git a/ui/src/app/tasks/task-apps/task-apps.component.ts b/ui/src/app/tasks/task-apps/task-apps.component.ts
diff --git a/ui/src/app/tasks/task-bulk-define/task-bulk-define.component.ts b/ui/src/app/tasks/task-bulk-define/task-bulk-define.component.ts
diff --git a/ui/src/app/tasks/task-definitions/task-definitions.component.ts b/ui/src/app/tasks/task-definitions/task-definitions.component.ts
diff --git a/ui/src/app/tasks/task-executions/task-executions.component.ts b/ui/src/app/tasks/task-executions/task-executions.component.ts
diff --git a/ui/src/app/tasks/tasks.service.ts b/ui/src/app/tasks/tasks.service.ts

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ export class AboutDetailsComponent implements OnInit {`
`41`	`41`	`goBack() {`
`42`	`42`	`console.log('Back to about page ...');`
`43`	`43`	`this.router.navigate(['about']);`
`44`		`- };`
	`44`	`+ }`
`45`	`45`
`46`	`46`	`onCopyToClipboardSuccess(e) {`
`47`	`47`	`this.toastyService.success('Copied About Details to Clipboard (As JSON).');`
`@@ -55,5 +55,5 @@ export class AboutDetailsComponent implements OnInit {`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`return true;`
`58`		`- };`
	`58`	`+ }`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,5 +37,5 @@ export class AboutComponent implements OnInit {`
`37`	`37`	`goToDetails() {`
`38`	`38`	`console.log('Go to details ...');`
`39`	`39`	`this.router.navigate(['about/details']);`
`40`		`- };`
	`40`	`+ }`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,5 @@ export class AppDetailsComponent implements OnInit {`
`53`	`53`	`goBack() {`
`54`	`54`	`console.log('Back to apps page ...');`
`55`	`55`	`this.router.navigate(['apps']);`
`56`		`- };`
`57`		`-`
`58`		`-`
	`56`	`+ }`
`59`	`57`	`}`