fix: Tweak sources to ensure compatibility with Angular 6

Signed-off-by: Gordon Smith <gordonjsmith@gmail.com>
hpcc-systems · Jun 20, 2019 · 6b21f2e · 6b21f2e
1 parent b13a6f5
commit 6b21f2e
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 37 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/chart/src/Column.ts b/packages/chart/src/Column.ts
@@ -306,7 +306,6 @@ export class Column extends XYAxis {
     _palette;
     fillColor: (row, column, value) => string;
     textColor: (row, column, value) => string;
-    click: (row, column, selected) => void;
     dblclick: (row, column, selected) => void;
 
     //  ITooltip  ---

diff --git a/packages/chart/src/Scatter.ts b/packages/chart/src/Scatter.ts
@@ -335,7 +335,6 @@ export class Scatter extends XYAxis {
     fillColor: (row, column, value) => string;
     strokeColor: (row, column, value) => string;
     textColor: (row, column, value) => string;
-    click: (row, column, selected) => void;
     dblclick: (row, column, selected) => void;
 
     //  ITooltip

diff --git a/packages/chart/src/XYAxis.ts b/packages/chart/src/XYAxis.ts
@@ -636,7 +636,7 @@ export class XYAxis extends SVGWidget {
     }
 
     //  Events  ---
-    click(row: object[], column, selected) {
+    click(row, column, selected) {
         console.log("Click:  " + JSON.stringify(row) + ", " + column + ", " + selected);
     }
 

diff --git a/packages/comms/src/espConnection.ts b/packages/comms/src/espConnection.ts
@@ -18,7 +18,7 @@ export interface Exceptions {
 }
 
 export class ESPExceptions extends Error implements Exceptions {
-    readonly isESPExceptions = true;
+    isESPExceptions = true;
     action: string;
     request: string;
     Source: string;

diff --git a/packages/map/src/CanvasPins.ts b/packages/map/src/CanvasPins.ts
@@ -101,7 +101,7 @@ export class CanvasPins extends CanvasWidget {
         this.draw(this._drawData);
     }
 
-    applyClustering(_data: Readonly<CanvasPinRow[]>) {
+    applyClustering(_data: Readonly<CanvasPinRow[]>): Readonly<CanvasPinRow[]> {
         const context = this;
         this._overlap_count = 0;
         const arrow_height = 8;

diff --git a/packages/util/src/debounce.ts b/packages/util/src/debounce.ts
@@ -32,7 +32,7 @@ export function debounce<TParam, R extends Promise<any>>(fn: (...params: TParam[
     };
 }
 
-export function promiseTimeout<T>(ms: number, promise: Promise<T>) {
+export function promiseTimeout<T>(ms: number, promise: Promise<T>): Promise<T> {
     let id: number;
     const timeout = new Promise((resolve, reject) => {
         id = setTimeout(() => {
@@ -44,7 +44,7 @@ export function promiseTimeout<T>(ms: number, promise: Promise<T>) {
     return Promise.race([
         promise,
         timeout
-    ]).then(response => {
+    ]).then((response: T) => {
         clearTimeout(id);
         return response;
     }).catch(e => {