improve error handling when user requests params for activation

Fixes #538

Author: starpit

app/plugins/views/sidecar/mode.js

@@ -47,8 +47,15 @@ module.exports = (commandTree, require) => {
         if (sidecar && sidecar.entity && (!entityType
                                           || sidecar.entity.type === entityType
                                           || util.isArray(entityType) && entityType.find(t => t === sidecar.entity.type))) {
-            sidecarVisibility.show()
-            return ui.showEntity(sidecar.entity, { show: mode }, block, nextBlock)
+            if (mode !== 'raw' &&
+                !(sidecar.entity[mode]
+                  || (sidecar.entity.exec && sidecar.entity.exec[mode])
+                  || (sidecar.entity.response && sidecar.entity.response[mode]))) {
+                throw new Error(`The current entity does not support viewing ${mode}`)
+            } else {
+                sidecarVisibility.show()
+                return ui.showEntity(sidecar.entity, { show: mode }, block, nextBlock)
+            }
         } else {
             throw new Error(!entityType ? 'You have not selected an entity'
                             : `You have not yet selected ${ui.startsWithVowel(entityType) ? 'an' : 'a'} ${entityType.replace(/s$/, '')}`)

tests/lib/ui.js

@@ -279,18 +279,24 @@ exports.sidecar.expectRule = A => app => app.client.waitUntil(() => {
 })
 
 /** is the given struct2 the same as the given struct2 (given as a string) */
-exports.expectStruct = (struct1, noParse=false) => string => {
+exports.expectStruct = (struct1, noParse=false, failFast=true) => string => {
     try {
-        assert.ok(sameStruct(struct1, noParse ? string : JSON.parse(string)))
-        return true
+        const ok = sameStruct(struct1, noParse ? string : JSON.parse(string))
+        if (failFast) {
+            assert.ok(ok)
+        }
+        return ok
     } catch (err) {
         console.error('Error comparing structs for actual value= ' + string)
         throw err
     }
 }
-exports.expectSubset = struct1 => string => {
+exports.expectSubset = (struct1, failFast=true) => string => {
     try {
-        assert.ok(sameStruct(struct1, JSON.parse(string), true))
+        const ok = sameStruct(struct1, JSON.parse(string), true)
+        if (failFast) {
+            assert.ok(ok)
+        }
         return true
     } catch (err) {
         console.error('Error comparing subset for actual value= ' + string)

tests/tests/passes/03/bottom-stripe-activation.js

@@ -50,22 +50,34 @@ describe('Sidecar bottom stripe interactions for activations', function() {
            })
            .catch(common.oops(this)))
 
+        // this will form a part of the annotations record
+        const subsetOfAnnotations = {path: `${ui.expectedNamespace()}/${name}`}
+
         it(`should show annotations for ${name} by clicking on bottom stripe`, () => this.app.client.click(ui.selectors.SIDECAR_MODE_BUTTON('annotations'))
            .then(() => this.app)
            .then(sidecar.expectOpen)
            .then(sidecar.expectShowing(name))
            .then(app => app.client.getText(`${ui.selectors.SIDECAR_CONTENT} .activation-result`))
-           .then(ui.expectSubset({path: `${ui.expectedNamespace()}/${name}`}))
+           .then(ui.expectSubset(subsetOfAnnotations))
            .catch(common.oops(this)))
 
-        // click on annotations mode button
+        // click on result mode button
         it(`should show result for ${name} by clicking on bottom stripe`, () => this.app.client.click(ui.selectors.SIDECAR_MODE_BUTTON('result'))
            .then(() => this.app)
            .then(sidecar.expectOpen)
            .then(sidecar.expectShowing(name))
            .then(app => app.client.getText(`${ui.selectors.SIDECAR_CONTENT} .activation-result`))
            .then(ui.expectStruct(expectedResult))
            .catch(common.oops(this)))
+
+        // click on raw mode button
+        it(`should show raw for ${name} by clicking on bottom stripe`, () => this.app.client.click(ui.selectors.SIDECAR_MODE_BUTTON('raw'))
+           .then(() => this.app)
+           .then(sidecar.expectOpen)
+           .then(sidecar.expectShowing(name))
+           .then(app => app.client.getText(`${ui.selectors.SIDECAR_CONTENT} .activation-result`))
+           .then(ui.expectSubset({ name, namespace: ui.expectedNamespace() })) // parts of the raw annotation record
+           .catch(common.oops(this)))
     }
 
     it('should have an active repl', () => cli.waitForRepl(this.app))

tests/tests/passes/03/invoke-implicit.js

@@ -45,4 +45,8 @@ describe('wsk action invoke with implicit entity', function() {
            .then(ui.expectStruct({ x:3, name:'grumble' }))
            .catch(common.oops(this)))
     }
+
+    it(`should fail when requesting parameters of an activation`, () => cli.do('params', this.app)
+       .then(cli.expectError(0, 'The current entity does not support viewing parameters'))
+       .catch(common.oops(this)))
 })