fix(yaml format): Fix parsing dropdowns where the variable name is 'c…

…hart'
kantord · Mar 13, 2018 · 14ec305 · 14ec305
1 parent b157192
commit 14ec305
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/yaml-format/parser.js b/src/yaml-format/parser.js
@@ -24,6 +24,11 @@ const rules = [
     'component': 'columns',
     'data': value.map(parser)
   })],
+  [[/dropdown ([^=]+)=(.*)/], (match, value) => ({
+    'component': 'dropdown',
+    'args': {'variable': match[1], 'default': match[2]},
+    'data': value
+  })],
   [[/(stacked)? *([a-z]+) (chart|plot|diagram|graph)/], (match, value) => ({
     'component': 'chart',
     'args': {
@@ -32,11 +37,6 @@ const rules = [
     },
     'data': value
   })],
-  [[/dropdown ([^=]+)=(.*)/], (match, value) => ({
-    'component': 'dropdown',
-    'args': {'variable': match[1], 'default': match[2]},
-    'data': value
-  })]
 ]
 
 const handle_urls = (component) => {

diff --git a/src/yaml-format/parser.test.js b/src/yaml-format/parser.test.js
@@ -625,6 +625,14 @@ describe('yaml format - dropdown component', function() {
         'data': 42
       }
     },
+    {
+      'input': {'dropdown chart=pie': 42},
+      'output': {
+        'component': 'dropdown',
+        'args': {'variable': 'chart', 'default': 'pie'},
+        'data': 42
+      }
+    },
   ]