From 666b54e1594d15e308db308691dc32f083079547 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Thu, 17 Jan 2019 09:33:49 +0300 Subject: [PATCH] fix linter errors --- src/panel-triggers/specs/panel_ctrl.spec.js | 4 ++-- src/panel-triggers/triggers_panel_ctrl.js | 5 ++--- src/test-setup/mocks.js | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/panel-triggers/specs/panel_ctrl.spec.js b/src/panel-triggers/specs/panel_ctrl.spec.js index 101f2cd..638eb2e 100644 --- a/src/panel-triggers/specs/panel_ctrl.spec.js +++ b/src/panel-triggers/specs/panel_ctrl.spec.js @@ -78,8 +78,8 @@ describe('TriggerPanelCtrl', () => { it('should rewrite default empty target', () => { ctx.scope.panel = { targets: [{ - "target": "", - "refId": "A" + "target": "", + "refId": "A" }], }; let panelCtrl = createPanelCtrl(); diff --git a/src/panel-triggers/triggers_panel_ctrl.js b/src/panel-triggers/triggers_panel_ctrl.js index 38f4a74..b319e60 100644 --- a/src/panel-triggers/triggers_panel_ctrl.js +++ b/src/panel-triggers/triggers_panel_ctrl.js @@ -1,7 +1,6 @@ import React from 'react'; import ReactDOM from 'react-dom'; import _ from 'lodash'; -import $ from 'jquery'; import moment from 'moment'; import * as dateMath from 'grafana/app/core/utils/datemath'; import * as utils from '../datasource-zabbix/utils'; @@ -193,7 +192,7 @@ export class TriggerPanelCtrl extends PanelCtrl { // Notify panel that request is finished this.loading = false; this.setTimeQueryEnd(); - return this.renderTriggers(triggers) + return this.renderTriggers(triggers); }) .then(() => { this.$timeout(() => { @@ -626,7 +625,7 @@ export class TriggerPanelCtrl extends PanelCtrl { const fontSizeProp = fontSize && fontSize !== 100 ? fontSize : null; const pageSize = panel.pageSize || 10; - const loading = ctrl.loading && (!ctrl.triggerList || !ctrl.triggerList.length) + const loading = ctrl.loading && (!ctrl.triggerList || !ctrl.triggerList.length); let panelOptions = {}; for (let prop in PANEL_DEFAULTS) { diff --git a/src/test-setup/mocks.js b/src/test-setup/mocks.js index c7a3aec..e5f910e 100644 --- a/src/test-setup/mocks.js +++ b/src/test-setup/mocks.js @@ -13,7 +13,7 @@ export let datasourceSrvMock = { export let timeSrvMock = { timeRange: jest.fn().mockReturnValue({ from: '', to: '' }) -} +}; export let zabbixAlertingSrvMock = { setPanelAlertState: jest.fn(),