make sure have code to run before trying to parse and run it

hchiam · Dec 3, 2018 · 0d1fc71 · 0d1fc71
1 parent c8ef6ef
commit 0d1fc71
Showing 1 changed file with 25 additions and 13 deletions.
diff --git a/index.js b/index.js
@@ -467,11 +467,11 @@ exports.dialogflowFirebaseFulfillment = functions.https.onRequest((request, resp
     function sandboxIf(app) {
         let code = inputContexts.code;
         codeVariables = getVariables(code); // need to make sure variables array is up-to-date
-
+        
         let variable = wrapIfString(removeSomePunctuation(inputContexts.variable));
         let value = wrapIfString(removeSomePunctuation(inputContexts.value));
         code += `if (${variable} == ${value})\n  `;
-
+        
         app.add(`Here's your code:\n${code}`);
         app.add(`What's next?`);
         app.add(new Suggestion('run code'));
@@ -486,19 +486,31 @@ exports.dialogflowFirebaseFulfillment = functions.https.onRequest((request, resp
 
     function sandboxRunCode(app) {
         let code = inputContexts.code;
-        codeVariables = getVariables(code); // need to make sure variables array is up-to-date
-
-        let output = getOutput(code);
-
+        let output = '(none)';
+        let haveCodeToRun = (code !== '') && (code !== undefined) && (code !== null);
+        if (haveCodeToRun) {
+            codeVariables = getVariables(code); // need to make sure variables array is up-to-date
+            output = getOutput(code);
+        }
         app.add(`${output}`);
         app.add(`What's next?`);
-        app.setContext({
-            name: 'sandbox',
-            lifespan: 1,
-            parameters: {
-                code: code
-            }
-        });
+        if (haveCodeToRun) {
+            app.setContext({
+                name: 'sandbox',
+                lifespan: 1,
+                parameters: {
+                    code: code
+                }
+            });
+        } else {
+            app.setContext({
+                name: 'sandbox',
+                lifespan: 1,
+                parameters: {
+                    code: '' // just in case
+                }
+            });
+        }
     }
 
     function sandboxUndo(app) {