From c11dd8cea92c681c90dbe4758b376d2d8ab18d17 Mon Sep 17 00:00:00 2001 From: VargBurz Date: Sat, 4 Aug 2018 01:55:13 +0300 Subject: [PATCH] fix npm run build --- package.json | 2 ++ src/controllers/analytic_controller.ts | 2 +- src/graph_renderer.ts | 4 ++-- src/module.ts | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 8bcb382..0fe4f76 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "@types/md5": "^2.1.32", "@types/moment": "^2.13.0", "@types/perfect-scrollbar": "^1.3.0", + "@types/tinycolor": "^1.1.27", "@types/tinycolor2": "^1.4.0", "babel-core": "^6.26.0", "babel-loader": "^7.1.2", @@ -32,6 +33,7 @@ "jquery": "^3.3.1", "loader-utils": "^1.1.0", "md5": "^2.2.1", + "tinycolor": "0.0.1", "ts-jest": "^22.4.6", "ts-loader": "^4.2.0", "typescript": "^2.8.3", diff --git a/src/controllers/analytic_controller.ts b/src/controllers/analytic_controller.ts index 48136d4..bdb0a3b 100644 --- a/src/controllers/analytic_controller.ts +++ b/src/controllers/analytic_controller.ts @@ -17,7 +17,7 @@ import { ANALYTIC_UNIT_COLORS } from '../colors'; import { Emitter } from 'grafana/app/core/utils/emitter'; import _ from 'lodash'; - +import * as tinycolor from 'tinycolor2'; export const REGION_FILL_ALPHA = 0.7; export const REGION_STROKE_ALPHA = 0.9; diff --git a/src/graph_renderer.ts b/src/graph_renderer.ts index fd576e8..1722b97 100644 --- a/src/graph_renderer.ts +++ b/src/graph_renderer.ts @@ -619,13 +619,13 @@ export class GraphRenderer { } private _addXTableAxis() { - var ticks = _.map(this.data, function(series: any, seriesIndex) { + var ticks = _.map(this.data, function(series: any, seriesIndex: any) { return _.map(series.datapoints, function(point, pointIndex) { var tickIndex = seriesIndex * series.datapoints.length + pointIndex; return [tickIndex + 1, point[1]]; }); }); - ticks = _.flatten(ticks, true); + ticks = _.flatten(ticks); this.flotOptions.xaxis = { timezone: this.dashboard.getTimezone(), diff --git a/src/module.ts b/src/module.ts index 8f1fc1b..ea99f43 100644 --- a/src/module.ts +++ b/src/module.ts @@ -448,7 +448,7 @@ class GraphCtrl extends MetricsPanelCtrl { } toggleAxis(info) { - var override = _.find(this.panel.seriesOverrides, { alias: info.alias }); + var override: any = _.find(this.panel.seriesOverrides, { alias: info.alias }); if (!override) { override = { alias: info.alias }; this.panel.seriesOverrides.push(override);