diff --git a/public/app/core/components/UserPicker/UserPickerOption.tsx b/public/app/core/components/UserPicker/UserPickerOption.tsx index 42a079802a8..1b32adac572 100644 --- a/public/app/core/components/UserPicker/UserPickerOption.tsx +++ b/public/app/core/components/UserPicker/UserPickerOption.tsx @@ -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 { constructor(props) { super(props); diff --git a/public/app/stores/AlertListStore/AlertListStore.ts b/public/app/stores/AlertListStore/AlertListStore.ts index 05dd181f41e..7d60ce04180 100644 --- a/public/app/stores/AlertListStore/AlertListStore.ts +++ b/public/app/stores/AlertListStore/AlertListStore.ts @@ -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));