Bug fixes: wskflow drops user options when refreshes, and incorrectly passed in system options, causing a crash

removed a typo

Author: Kerry Chang

app/plugins/modules/composer/lib/composer.js

@@ -678,7 +678,7 @@ const optionsToString = options => {
 
     return str
 }
-
+exports.optionsToString = optionsToString
 /**
  * Entity view modes
  *

app/plugins/modules/composer/lib/viz.js

@@ -17,7 +17,7 @@
 const debug = require('debug')('app preview')
 debug('loading')
 
-const { isValidFSM, wskflow, zoomToFitButtons, vizAndfsmViewModes, codeViewMode, handleError } = require('./composer'),
+const { isValidFSM, wskflow, zoomToFitButtons, vizAndfsmViewModes, codeViewMode, handleError, optionsToString } = require('./composer'),
       badges = require('./badges'),
       { readFSMFromDisk, compileToFSM } = require('./create-from-source'),
       messages = require('./messages'),
@@ -111,14 +111,19 @@ module.exports = (commandTree, prequire) => {
                  entity.type = 'actions'
              }
 
-             if(options.alreadyWatching && entity.type === 'custom'){  
+             if(execOptions.alreadyWatching){
                 // in filewatch mode (alreadyWatching), command echo is set to false
-                // calling ui.showCustom as the main repl does not do anything for custom type entity when echo is false 
-                ui.showCustom(entity);
-             }
+                // calling ui.showCustom as the main repl does not do anything for custom type entity when echo is false                 
+                if(entity.type === 'custom'){  
+                    ui.showCustom(entity);
+                }
+                else{                
+                    ui.showEntity(entity, { show: 'fsm' })
+                } 
+             }            
              else{
-                resolve(entity);
-             }             
+                resolve(entity)
+             }
 
          }
          fsmPromise.then(formatForUser(defaultMode))
@@ -127,14 +132,13 @@ module.exports = (commandTree, prequire) => {
                      // start rendering an empty JSON
                      formatForUser(defaultMode)({})
 
-                 } else if (options.alreadyWatching) {
+                 } else if (execOptions.alreadyWatching) {
                      // we already have the sidecar open to this file,
                      // so we can report the error in the sidecar
 
                      // createFromSource returns error as either an object that's {fsm:errMsg, code:originalCode}, or just the errMsg string
                      // here we check the error format and send the correct input to formatForUser/handleError
                      // in sidecar, error message shows in the fsm (JSON) tab. code tab shows the user's js code (if existed). 
-                     
                      if(err.fsm)
                       formatForUser('fsm')(err);
                      else
@@ -176,18 +180,14 @@ module.exports = (commandTree, prequire) => {
                  delete options.e
 
                  debug('environment', environment)
-             }
-
-             if(execOptions.alreadyWatching){
-                options.alreadyWatching = execOptions.alreadyWatching;
-             }             
+             }          
 
              render(input, options, execOptions).then(resolve, reject)
 
              // and set up a file watcher to re-render upon change of the file
              if (!execOptions || !execOptions.alreadyWatching) {
                  chokidar.watch(expandHomeDir(input)).on('change', path => {
-                     repl.pexec(`preview ${path}`, { echo: false, alreadyWatching: true })                     
+                     repl.pexec(`preview ${path} ${optionsToString(options)}`, { echo: false, alreadyWatching: true, noHistory: true })                     
                  })
              }
          })

tests/tests/passes/07/wskflow-tests.js

@@ -118,6 +118,28 @@ describe('app preview should actively watching an external file', function() {
       .then(verifyNodeExists('c'))
       .catch(common.oops(this)))
 
+    // should be able to switch JSON tab and switch back
+    it('should switch to the JSON tab', () => this.app.client.click(ui.selectors.SIDECAR_MODE_BUTTON('fsm'))
+      .then(() => this.app.client.click(ui.selectors.SIDECAR_MODE_BUTTON('visualization')))
+      .then(() => verifyNodeExists('a')(this.app))
+      .then(verifyNodeExists('c'))
+      .catch(common.oops(this)))
+    // update file again, and verify that preview updates too 
+    it('should update the temp file to composer.sequence("a", "b")', () => {
+      return new Promise((resolve, reject) => {
+        fs.writeFile(tempFileName, `composer.sequence("a", "b")`, (err) => {
+          if(err)
+            reject(err);
+          else
+            resolve(true);
+        });
+      });
+    });
+    it('should update preview', () => this.app.client.waitForVisible(ui.selectors.SIDECAR_CUSTOM_CONTENT)
+      .then(() => verifyNodeExists('a')(this.app))
+      .then(verifyNodeExists('b'))
+      .catch(common.oops(this)))
+
     it('should delete the temp file', () => {
       return new Promise((resolve, reject) => {
         fs.unlink(tempFileName, (err) => {