public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Variables: Ensure variables in query params are correctly recognised (#47049)

Browse Source 
* user essentials mob! 🔱

* user essentials mob! 🔱

* update comment

Co-authored-by: kay delaney <kay@grafana.com>
Co-authored-by: Alexandra Vargas <alexa1866@gmail.com>

Co-authored-by: joshhunt <josh@trtr.co>
Co-authored-by: kay delaney <kay@grafana.com>
Co-authored-by: Alexandra Vargas <alexa1866@gmail.com>
This commit is contained in:
Ashley Harrison
2022-03-31 15:59:14 +01:00
committed by GitHub
co-authored by kay delaney Alexandra Vargas joshhunt
parent bea392eabf
commit eddefdc274
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/variables/utils.test.ts
+11 -6
View File
@@ -184,12 +184,17 @@ describe('ensureStringValues', () => {
describe('containsVariable', () => { describe('containsVariable', () => {
it.each` it.each`
value | expected value | expected
${''} | ${false} ${''} | ${false}
${'$var'} | ${true} ${'$var'} | ${true}
${{ thing1: '${var}' }} | ${true} ${{ thing1: '${var}' }} | ${true}
${{ thing1: ['1', '${var}'] }} | ${true} ${{ thing1: '${var:fmt}' }} | ${true}
${{ thing1: { thing2: '${var}' } }} | ${true} ${{ thing1: ['1', '${var}'] }} | ${true}
${{ thing1: ['1', '[[var]]'] }} | ${true}
${{ thing1: ['1', '[[var:fmt]]'] }} | ${true}
${{ thing1: { thing2: '${var}' } }} | ${true}
${{ params: [['param', '$var']] }} | ${true}
${{ params: [['param', '${var}']] }} | ${true}
`('when called with value:$value then result should be:$expected', ({ value, expected }) => { `('when called with value:$value then result should be:$expected', ({ value, expected }) => {
expect(containsVariable(value, 'var')).toEqual(expected); expect(containsVariable(value, 'var')).toEqual(expected);
}); });
public/app/features/variables/utils.ts
+2 -2
View File
@@ -15,10 +15,10 @@ import { KeyedVariableIdentifier, VariableIdentifier, VariablePayload } from './
/* /*
* This regex matches 3 types of variable reference with an optional format specifier * This regex matches 3 types of variable reference with an optional format specifier
* \$(\w+) $var1 * \$(\w+) $var1
* \[\[([\s\S]+?)(?::(\w+))?\]\] [[var2]] or [[var2:fmt2]] * \[\[(\w+?)(?::(\w+))?\]\] [[var2]] or [[var2:fmt2]]
* \${(\w+)(?::(\w+))?} ${var3} or ${var3:fmt3} * \${(\w+)(?::(\w+))?} ${var3} or ${var3:fmt3}
*/ */
export const variableRegex = /\$(\w+)|\[\[([\s\S]+?)(?::(\w+))?\]\]|\${(\w+)(?:\.([^:^\}]+))?(?::([^\}]+))?}/g; export const variableRegex = /\$(\w+)|\[\[(\w+?)(?::(\w+))?\]\]|\${(\w+)(?:\.([^:^\}]+))?(?::([^\}]+))?}/g;
// Helper function since lastIndex is not reset // Helper function since lastIndex is not reset
export const variableRegexExec = (variableString: string) => { export const variableRegexExec = (variableString: string) => {