Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use more consistent naming

pull/10616/head
Christopher Henn 2018-06-19 16:39:28 -07:00
parent 59864a36e6
commit 1b987b883d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/src/tempVars/utils/parsing.ts
View File

@ -6,7 +6,7 @@ import parseShowMeasurements from 'src/shared/parsing/showMeasurements'
import parseShowSeries from 'src/shared/parsing/showSeries'
export const parseMetaQuery = (metaQuery: string, response): string[] => {
const metaQueryStart = getMetaQueryStart(metaQuery)
const metaQueryStart = getMetaQueryPrefix(metaQuery)
if (!metaQueryStart) {
throw new Error('Could not find parser for meta query')
@ -24,9 +24,9 @@ export const parseMetaQuery = (metaQuery: string, response): string[] => {
}
export const isInvalidMetaQuery = (metaQuery: string): boolean =>
!getMetaQueryStart(metaQuery)
!getMetaQueryPrefix(metaQuery)
const getMetaQueryStart = (metaQuery: string): string | null => {
const getMetaQueryPrefix = (metaQuery: string): string | null => {
const words = metaQuery
.trim()
.toUpperCase()
@ -34,12 +34,12 @@ const getMetaQueryStart = (metaQuery: string): string | null => {
const firstTwoWords = words.slice(0, 2).join(' ')
const firstThreeWords = words.slice(0, 3).join(' ')
return VALID_META_QUERY_STARTS.find(
return VALID_META_QUERY_PREFIXES.find(
q => q === firstTwoWords || q === firstThreeWords
)
}
const VALID_META_QUERY_STARTS = [
const VALID_META_QUERY_PREFIXES = [
'SHOW DATABASES',
'SHOW MEASUREMENTS',
'SHOW SERIES',