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

fixed regex issue

Browse Source
This commit is contained in:
Patrick O'Carroll 2018-01-05 15:19:25 +01:00
parent 3797054eb4
commit fc6d14127d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/containers/AlertRuleList/AlertRuleList.tsx
View File

@ -52,7 +52,7 @@ export class AlertRuleList extends React.Component<IContainerProps, any> {
render() { render() {
const { nav, alertList } = this.props; const { nav, alertList } = this.props;
let regex = new RegExp(this.state.search, 'ig'); let regex = new RegExp(this.state.search, 'i');
return ( return (
<div> <div>

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

@ -10,6 +10,13 @@ export const AlertListStore = types
rules: types.array(AlertRule), rules: types.array(AlertRule),
stateFilter: types.optional(types.string, 'all'), stateFilter: types.optional(types.string, 'all'),
}) })
.views(self => ({
searchFilter(regex) {
return self.rules.filter(alert => {
return regex.test(alert.name) || regex.test(alert.stateText);
});
},
}))
.actions(self => ({ .actions(self => ({
loadRules: flow(function* load(filters) { loadRules: flow(function* load(filters) {
const backendSrv = getEnv(self).backendSrv; const backendSrv = getEnv(self).backendSrv;
@ -31,11 +38,4 @@ export const AlertListStore = types
self.rules.push(AlertRule.create(rule)); self.rules.push(AlertRule.create(rule));
} }
}), }),
}))
.views(self => ({
searchFilter(regex) {
return self.rules.filter(alert => {
return regex.test(alert.name) || regex.test(alert.stateText);
});
},
})); }));