add AS

Author: Daniel Arrizza

README.md

@@ -12,14 +12,15 @@ Create AppD dashboards at lightning speed with a query language
 ## Development
 
 ### Features
+- [x] shortforms: (art = Average Response Time (ms), etc.)
 - [x] headers
 - [x] default metric format strings
+- [x] AS
 - [] add a title
 - [] more than just bts
 - [] WHERE on a name/label
 - [] WHERE operators (>, <, REGEX, etc.)
 - [] WHERE on metric values (current art > x)
-- [] AS
 - [] SORT BY
 - [] LIMIT
 - [] query autocomplete
@@ -29,7 +30,6 @@ Create AppD dashboards at lightning speed with a query language
 - [] create multiple dashboards at once
 - [] save queries
 - [] more metric types: browser, mobile, DB, SIM
-- [] shortforms: (art = Average Response Time (ms), etc.)
 - [] styling/theming
 - [] add logo
 - [] table grid lines

src/getColumnFromSelect.js

@@ -12,9 +12,9 @@ const LABEL_ENTITIES = ['bt', 'tier', 'backend']
 export default ({
   selects, selectIndex, data, wheres,
 }) => {
-  const select = selects[selectIndex]
+  const select = selects[selectIndex].value
   const header = createHeader({
-    labelText: getMetricFromShortcut(select).metric,
+    labelText: selects[selectIndex].as || getMetricFromShortcut(select).metric,
     x: selectIndex,
   })
 
@@ -35,7 +35,7 @@ export default ({
 
     const applicationName = getApplicationFromWheres({ wheres })
     const { metric } = getMetricFromShortcut(select)
-    if (selects[0] === 'bt') {
+    if (selects[0].value === 'bt') {
       const metricWidgetData = data.bt.map(({ internalName, tierName }) => ({
         applicationName,
         metricPath: `Business Transaction Performance|Business Transactions|${tierName}|${internalName}|${metric}`,

src/main.js

@@ -7,7 +7,7 @@ import createDashboard from './createDashboard'
 
 const main = async () => {
   const DASHBOARD_NAME = 'z_dan_2'
-  const query = 'SELECT bt, art, cpm, epm FROM applications WHERE application = "2075ICE.PREPROD"'
+  const query = 'SELECT bt, art AS "Response Time", cpm, epm FROM applications WHERE application = "2075ICE.PREPROD"'
 
   const { selects, from, wheres } = queryParser({ query })
 

src/queryParser.js

@@ -4,7 +4,19 @@ const getSelects = ({ query }) => {
   const selectRegex = /select(.*)from/i
   const allSelect = selectRegex.exec(query)
   const selects = allSelect[1].split(',').map(s => s.trim())
-  return selects
+  const selectsWithAs = selects.map(select => {
+    const asRegex = /(.*) as (.*)/i
+    const asResults = asRegex.exec(select)
+    if (asResults) {
+      return {
+        value: asResults[1],
+        as: asResults[2].substr(1, asResults[2].length - 2),
+      }
+    } else {
+      return { value: select }
+    }
+  })
+  return selectsWithAs
 }
 
 const getFrom = ({ query }) => {