improved support for activation result and activation logs

Fixes #455

Author: starpit

app/plugins/views/sidecar/mode.js

@@ -42,8 +42,9 @@ module.exports = (commandTree, require) => {
     const wsk = require('/ui/commands/openwhisk-core'),
           sidecarVisibility = require('/views/sidecar/visibility')
 
-    const switchSidecarMode = (entityType, mode) => (block, nextBlock) => {
+    const switchSidecarMode = (entityType, mode) => (block, nextBlock, argv) => {
         const sidecar = document.querySelector('#sidecar')
+
         if (sidecar && sidecar.entity && (!entityType
                                           || sidecar.entity.type === entityType
                                           || util.isArray(entityType) && entityType.find(t => t === sidecar.entity.type))) {
@@ -56,6 +57,10 @@ module.exports = (commandTree, require) => {
                 sidecarVisibility.show()
                 return ui.showEntity(sidecar.entity, { show: mode }, block, nextBlock)
             }
+        } else if (argv.length === 3 || argv.length === 4) { // activation logs xxx or wsk activation logs xxx
+            return repl.qexec(`${entityType} get ${argv[argv.length - 1]}`)
+                .then(_ => ui.showEntity(_, { show: mode }, block, nextBlock))
+                .then(() => true) // make repl happy
         } 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

@@ -236,6 +236,11 @@ exports.sidecar = {
         it('should toggle closed the sidecar', () => exports.sidecar.doClose(ctx.app))
     },
 
+    expectMode: expectedMode => app => app.client.waitUntil(() => {
+        return app.client.waitForVisible(`${selectors.SIDECAR_MODE_BUTTON(expectedMode)}.sidecar-bottom-stripe-button-active`)
+            .then(() => app)
+    }),
+
     expectShowing: (expectedName, expectedActivationId, expectSubstringMatchOnName=false, expectedPackageName, expectType, waitThisLong=timeout) => app => app.client.waitUntil(() => {
 	// check selected name in sidecar
         return app.client.waitForVisible(`${selectors.SIDECAR}${!expectType ? '' : '.entity-is-' + expectType}`)

tests/tests/passes/03/activation-result.js

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2018 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//
+// tests that create an action and test that it shows up in the list UI
+//    this test also covers toggling the sidecar
+//
+const common = require('../../../lib/common'),
+      openwhisk = require('../../../lib/openwhisk'),
+      ui = require('../../../lib/ui'),
+      assert = require('assert'),
+      keys = ui.keys,
+      cli = ui.cli,
+      sidecar = ui.sidecar,
+      actionName1 = `foo1-${new Date().getTime()}`,
+      actionName2 = `foo2-${new Date().getTime()}`
+
+describe('wsk activation result and wsk activation logs', function() {
+    before(common.before(this))
+    after(common.after(this))
+
+    it('should have an active repl', () => cli.waitForRepl(this.app))
+
+    // create an action
+    it(`should create an action ${actionName1}`, () => cli.do(`create ${actionName1} ./data/foo.js`, this.app)
+       .then(cli.expectOK)
+       .then(sidecar.expectOpen)
+       .then(sidecar.expectShowing(actionName1))
+       .catch(common.oops(this)))
+
+    it(`should async that action then show its logs and result`, () => cli.do(`async ${actionName1}`, this.app)
+       .then(cli.expectOKWithCustom(cli.makeCustom('.activationId', '')))
+       .then(selector => this.app.client.getText(selector)
+	     .then(activationId => cli.do(`wsk activation logs ${activationId}`, this.app)
+		   .then(() => sidecar.expectOpen(this.app))
+		   .then(sidecar.expectShowing(actionName1, activationId))
+                   .then(sidecar.expectMode('logs'))
+                   .then(() => this.app.restart())
+                   .then(() => cli.do(`activation logs ${activationId}`, this.app))
+		   .then(() => sidecar.expectOpen(this.app))
+		   .then(sidecar.expectShowing(actionName1, activationId))
+                   .then(sidecar.expectMode('logs'))
+                   .then(() => this.app.restart())
+                   .then(() => cli.do(`activation result ${activationId}`, this.app))
+		   .then(() => sidecar.expectOpen(this.app))
+		   .then(sidecar.expectShowing(actionName1, activationId))
+                   .then(sidecar.expectMode('result'))))
+       .catch(common.oops(this)))
+})