IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

ux: minor change to alert list page

Browse Source
This commit is contained in:
Torkel Ödegaard
2018-01-10 14:18:58 +01:00
parent 32df74ffec
commit b76958f07b
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/core/components/UserPicker/UserPickerOption.tsx
View File

@@ -1,4 +1,5 @@
import React, { Component } from 'react';
import React, { Component } from 'react';
export interface IProps {
onSelect: any;
onFocus: any;
@@ -6,6 +7,7 @@ export interface IProps {
isFocused: any;
className: any;
}
class UserPickerOption extends Component<IProps, any> {
constructor(props) {
super(props);

13
public/app/stores/AlertListStore/AlertListStore.ts
View File

@@ -29,12 +29,13 @@ export const AlertListStore = types
for (let rule of apiRules) {
setStateFields(rule, rule.state);
if (rule.executionError) {
rule.info = 'Execution Error: ' + rule.executionError;
}
if (rule.evalData && rule.evalData.noData) {
rule.info = 'Query returned no data';
if (rule.state !== 'paused') {
if (rule.executionError) {
rule.info = 'Execution Error: ' + rule.executionError;
}
if (rule.evalData && rule.evalData.noData) {
rule.info = 'Query returned no data';
}
}
self.rules.push(AlertRule.create(rule));