add WHERE with REGEXP

Author: Daniel Arrizza

README.md

@@ -16,11 +16,12 @@ Create AppD dashboards at lightning speed with a query language
 - [x] headers
 - [x] default metric format strings
 - [x] AS
+- [x] WHERE on a name/label with = or REGEX
+- [] add tier to bts
 - [] add a title
 - [] more than just bts
-- [] WHERE on a name/label
-- [] WHERE operators (>, <, REGEX, etc.)
 - [] WHERE on metric values (current art > x)
+- [] WHERE OR operator and nesting
 - [] SORT BY
 - [] LIMIT
 - [] query autocomplete
@@ -29,11 +30,13 @@ Create AppD dashboards at lightning speed with a query language
 - [] specify dashboard name
 - [] create multiple dashboards at once
 - [] save queries
-- [] more metric types: browser, mobile, DB, SIM
+- [] more metric types: browser, mobile, DB, SIM, IoT
 - [] styling/theming
 - [] add logo
 - [] table grid lines
 - [] electron app
+- [] help docs
+- [] prebuilt dashboards
 - [] preview dashboard before deploying
 - [] share dashboard formulas
 

src/getAppModel.js

@@ -1,8 +1,9 @@
-import { options, baseURL } from './requestOptions'
+import _ from 'lodash'
 import rp from 'request-promise'
+import { options, baseURL } from './requestOptions'
 
 export const getApps = async () => {
-  return await rp({
+  return rp({
     ...options,
     url: `${baseURL}/rest/applications?output=json`,
   })
@@ -18,7 +19,7 @@ export const getApps = async () => {
 }
 
 export const getTiers = async ({ applicationName }) => {
-  return await rp({
+  return rp({
     ...options,
     url: `${baseURL}/rest/applications/${applicationName}/tiers?output=json`,
   })
@@ -33,16 +34,40 @@ export const getTiers = async ({ applicationName }) => {
     })
 }
 
-export const getBTs = async ({ applicationName }) => {
-  return await rp({
+export const getBTs = async ({ applicationName, wheres }) => {
+  return rp({
     ...options,
     url: `${baseURL}/rest/applications/${applicationName}/business-transactions?output=json`,
   })
     .promise()
     .then(data => {
-      const parsedData = JSON.parse(data)
-      console.log(parsedData)
-      return parsedData
+      const parsedData = JSON.parse(data).map(bt => ({
+        ...bt,
+        tier: bt.tierName,
+      }))
+
+      let filteredData = parsedData
+      const filters = _.intersection(wheres.map(({ field }) => field), [
+        'bt',
+        'tier',
+      ])
+
+      filters.forEach(filter => {
+        const { field, operator, value } = wheres.find(
+          where => where.field === filter,
+        )
+        const contextField = field === 'bt' ? 'name' : field
+        filteredData = filteredData.filter(bt => {
+          if (operator === '=') {
+            return bt[contextField] === value
+          } else if (operator === 'REGEXP') {
+            return new RegExp(value, 'i').test(bt[contextField])
+          } else {
+            return true
+          }
+        })
+      })
+      return filteredData
     })
     .catch(err => {
       console.log(err)

src/getColumnFromSelect.js

@@ -36,10 +36,10 @@ export default ({
     const applicationName = getApplicationFromWheres({ wheres })
     const { metric } = getMetricFromShortcut(select)
     if (selects[0].value === 'bt') {
-      const metricWidgetData = data.bt.map(({ internalName, tierName }) => ({
+      const metricWidgetData = data.bt.map(({ internalName, tier }) => ({
         applicationName,
-        metricPath: `Business Transaction Performance|Business Transactions|${tierName}|${internalName}|${metric}`,
-        entityName: tierName,
+        metricPath: `Business Transaction Performance|Business Transactions|${tier}|${internalName}|${metric}`,
+        entityName: tier,
       }))
 
       return [

src/main.js

@@ -7,16 +7,16 @@ import createDashboard from './createDashboard'
 
 const main = async () => {
   const DASHBOARD_NAME = 'z_dan_2'
-  const query = 'SELECT bt, art AS "Response Time", cpm, epm FROM applications WHERE application = "2075ICE.PREPROD"'
+  const query = 'SELECT bt, art AS "Response Time", cpm, epm FROM applications WHERE application = "2075ICE.PREPROD" AND bt REGEXP "AdaptiveAuthentication"'
 
-  const { selects, from, wheres } = queryParser({ query })
+  const { selects, wheres } = queryParser({ query })
 
   // TODO: maybe this should be a gather data method
   // TODO: only get bt info if in select
   const applicationName = getApplicationFromWheres({ wheres })
-  const bt = await getBTs({ applicationName })
-  const data = { bt }
+  const bt = await getBTs({ applicationName, wheres })
 
+  const data = { bt }
   const widgets = selects.map((s, index) => getColumnFromSelect({
     selects,
     selectIndex: index,

src/queryParser.js

@@ -29,9 +29,9 @@ const getFrom = ({ query }) => {
 const getWhere = ({ query }) => {
   const whereRegex = /where(.*)/i
   const allWhere = whereRegex.exec(query)
-  const wheres = allWhere[1].split(',').map(s => s.trim())
+  const wheres = allWhere[1].split('AND').map(s => s.trim())
   const tokenizedWheres = wheres.map(where => {
-    const delimeterRegex = /(.*?) ?(=) ?\"(.*)\"/
+    const delimeterRegex = /(.*?) ?(=|REGEXP) ?"(.*)"$/
     const [, field, operator, value] = delimeterRegex.exec(where)
     return { field, operator, value }
   })
@@ -52,6 +52,6 @@ export default ({ query }) => {
   const selects = getSelects({ query })
   const { from } = getFrom({ query })
   const wheres = getWhere({ query })
-  console.log(selects, from, wheres)
+  console.log({ selects, from, wheres })
   return { selects, from, wheres }
 }