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

move stringToJsRegex

Browse Source
This commit is contained in:
ryan 2019-03-09 23:50:46 -08:00
parent 0ae9c1c5cc
commit b2a7891b08
8 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/grafana-ui/src/utils/index.ts
View File

@ -2,4 +2,5 @@ export * from './processTimeSeries';
export * from './valueFormats/valueFormats';
export * from './colors';
export * from './namedColorsPalette';
export * from './stringUtils';
export { getMappedValue } from './valueMappings';

15
packages/grafana-ui/src/utils/stringUtils.test.ts Normal file
View File

@ -0,0 +1,15 @@
import { stringToJsRegex } from '@grafana/ui';
describe('stringToJsRegex', () => {
it('should parse the valid regex value', () => {
const output = stringToJsRegex('/validRegexp/');
expect(output).toBeInstanceOf(RegExp);
});
it('should throw error on invalid regex value', () => {
const input = '/etc/hostname';
expect(() => {
stringToJsRegex(input);
}).toThrow();
});
});

13
packages/grafana-ui/src/utils/stringUtils.ts Normal file
View File

@ -0,0 +1,13 @@
export function stringToJsRegex(str: string): RegExp {
if (str[0] !== '/') {
return new RegExp('^' + str + '$');
}
const match = str.match(new RegExp('^/(.*?)/(g?i?m?y?)$'));
if (!match) {
throw new Error(`'${str}' is not a valid regular expression.`);
}
return new RegExp(match[1], match[2]);
}

5
public/app/core/time_series2.ts
View File

@ -1,7 +1,6 @@
import kbn from 'app/core/utils/kbn';
import { getFlotTickDecimals } from 'app/core/utils/ticks';
import _ from 'lodash';
import { getValueFormat } from '@grafana/ui';
import { getValueFormat, stringToJsRegex } from '@grafana/ui';
function matchSeriesOverride(aliasOrRegex, seriesAlias) {
if (!aliasOrRegex) {
@ -9,7 +8,7 @@ function matchSeriesOverride(aliasOrRegex, seriesAlias) {
}
if (aliasOrRegex[0] === '/') {
const regex = kbn.stringToJsRegex(aliasOrRegex);
const regex = stringToJsRegex(aliasOrRegex);
return seriesAlias.match(regex) != null;
}

16
public/app/core/utils/kbn.ts
View File

@ -1,5 +1,5 @@
import _ from 'lodash';
import { getValueFormat, getValueFormatterIndex, getValueFormats } from '@grafana/ui';
import { getValueFormat, getValueFormatterIndex, getValueFormats, stringToJsRegex } from '@grafana/ui';
const kbn: any = {};
@ -228,18 +228,10 @@ kbn.slugifyForUrl = str => {
.replace(/ +/g, '-');
};
/** deprecated since 6.1, use grafana/ui */
kbn.stringToJsRegex = str => {
if (str[0] !== '/') {
return new RegExp('^' + str + '$');
}
const match = str.match(new RegExp('^/(.*?)/(g?i?m?y?)$'));
if (!match) {
throw new Error(`'${str}' is not a valid regular expression.`);
}
return new RegExp(match[1], match[2]);
console.warn('Migrate stringToJsRegex to grafana/ui, ');
return stringToJsRegex(str);
};
kbn.toFixed = (value, decimals) => {

4
public/app/features/templating/datasource_variable.ts
View File

@ -1,5 +1,5 @@
import kbn from 'app/core/utils/kbn';
import { Variable, containsVariable, assignModelProperties, variableTypes } from './variable';
import { stringToJsRegex } from '@grafana/ui';
export class DatasourceVariable implements Variable {
regex: any;
@ -47,7 +47,7 @@ export class DatasourceVariable implements Variable {
if (this.regex) {
regex = this.templateSrv.replace(this.regex, null, 'regex');
regex = kbn.stringToJsRegex(regex);
regex = stringToJsRegex(regex);
}
for (let i = 0; i < sources.length; i++) {

4
public/app/features/templating/query_variable.ts
View File

@ -1,6 +1,6 @@
import _ from 'lodash';
import kbn from 'app/core/utils/kbn';
import { Variable, containsVariable, assignModelProperties, variableTypes } from './variable';
import { stringToJsRegex } from '@grafana/ui';
function getNoneOption() {
return { text: 'None', value: '', isNone: true };
@ -148,7 +148,7 @@ export class QueryVariable implements Variable {
options = [];
if (this.regex) {
regex = kbn.stringToJsRegex(this.templateSrv.replace(this.regex, {}, 'regex'));
regex = stringToJsRegex(this.templateSrv.replace(this.regex, {}, 'regex'));
}
for (i = 0; i < metricNames.length; i++) {
const item = metricNames[i];

5
public/app/plugins/panel/table/renderer.ts
View File

@ -1,7 +1,6 @@
import _ from 'lodash';
import moment from 'moment';
import kbn from 'app/core/utils/kbn';
import { getValueFormat, getColorFromHexRgbOrName, GrafanaThemeType } from '@grafana/ui';
import { getValueFormat, getColorFromHexRgbOrName, GrafanaThemeType, stringToJsRegex } from '@grafana/ui';
export class TableRenderer {
formatters: any[];
@ -35,7 +34,7 @@ export class TableRenderer {
for (let i = 0; i < this.panel.styles.length; i++) {
const style = this.panel.styles[i];
const regex = kbn.stringToJsRegex(style.pattern);
const regex = stringToJsRegex(style.pattern);
if (column.text.match(regex)) {
column.style = style;