Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix linter errors

Browse Source
This commit is contained in:
Alexander Zobnin
2019-01-17 09:33:49 +03:00
parent d7db242426
commit 666b54e159
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/panel-triggers/specs/panel_ctrl.spec.js
View File

@@ -78,8 +78,8 @@ describe('TriggerPanelCtrl', () => {
it('should rewrite default empty target', () => { it('should rewrite default empty target', () => {
ctx.scope.panel = { ctx.scope.panel = {
targets: [{ targets: [{
"target": "", "target": "",
"refId": "A" "refId": "A"
}], }],
}; };
let panelCtrl = createPanelCtrl(); let panelCtrl = createPanelCtrl();

5
src/panel-triggers/triggers_panel_ctrl.js
View File

@@ -1,7 +1,6 @@
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import _ from 'lodash'; import _ from 'lodash';
import $ from 'jquery';
import moment from 'moment'; import moment from 'moment';
import * as dateMath from 'grafana/app/core/utils/datemath'; import * as dateMath from 'grafana/app/core/utils/datemath';
import * as utils from '../datasource-zabbix/utils'; import * as utils from '../datasource-zabbix/utils';
@@ -193,7 +192,7 @@ export class TriggerPanelCtrl extends PanelCtrl {
// Notify panel that request is finished // Notify panel that request is finished
this.loading = false; this.loading = false;
this.setTimeQueryEnd(); this.setTimeQueryEnd();
return this.renderTriggers(triggers) return this.renderTriggers(triggers);
}) })
.then(() => { .then(() => {
this.$timeout(() => { this.$timeout(() => {
@@ -626,7 +625,7 @@ export class TriggerPanelCtrl extends PanelCtrl {
const fontSizeProp = fontSize && fontSize !== 100 ? fontSize : null; const fontSizeProp = fontSize && fontSize !== 100 ? fontSize : null;
const pageSize = panel.pageSize || 10; 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 = {}; let panelOptions = {};
for (let prop in PANEL_DEFAULTS) { for (let prop in PANEL_DEFAULTS) {

2
src/test-setup/mocks.js
View File

@@ -13,7 +13,7 @@ export let datasourceSrvMock = {
export let timeSrvMock = { export let timeSrvMock = {
timeRange: jest.fn().mockReturnValue({ from: '', to: '' }) timeRange: jest.fn().mockReturnValue({ from: '', to: '' })
} };
export let zabbixAlertingSrvMock = { export let zabbixAlertingSrvMock = {
setPanelAlertState: jest.fn(), setPanelAlertState: jest.fn(),