Fix tests and task/cycle menu

Author: datamel

src/components/cylc/cylcObject/Menu.vue

@@ -136,7 +136,7 @@ import Mutation from '@/components/cylc/Mutation'
 import {
   mdiPencil
 } from '@mdi/js'
-import { mapState } from 'vuex'
+import { mapGetters, mapState } from 'vuex'
 
 export default {
   name: 'CylcObjectMenu',
@@ -160,6 +160,7 @@ export default {
       dialogKey: false,
       expanded: false,
       node: null,
+      workflowStatus: null,
       mutations: [],
       isLoadingMutations: true,
       showMenu: false,
@@ -181,6 +182,7 @@ export default {
   },
 
   computed: {
+    ...mapGetters('workflows', ['getNodes']),
     primaryMutations () {
       return this.$workflowService.primaryMutations[this.node.type] || []
     },
@@ -239,7 +241,15 @@ export default {
       }
     },
     isDisabled (mutation, authorised) {
-      if (((!mutation._validStates.includes(this.node.node.status))) || !authorised) {
+      if (this.node.type !== 'workflow') {
+        this.workflowStatus = this.getNodes(
+          'workflow', [this.node.tokens.workflow_id])[0].node.status
+      } else {
+        this.workflowStatus = this.node.node.status
+      }
+      if (
+        (!mutation._validStates.includes(this.workflowStatus)) ||
+          !authorised) {
         return true
       }
       return false

src/services/mock/json/IntrospectionQuery.json

@@ -1427,7 +1427,7 @@
         "fields": [
           {
             "name": "broadcast",
-            "description": "Override `[runtime]` configurations in a running workflow.\n\nUses for broadcast include making temporary changes to task\nbehaviour, and task-to-downstream-task communication via\nenvironment variables.\n\nA broadcast can set/override any `[runtime]` configuration for all\ncycles or for a specific cycle. If a task is affected by\nspecific-cycle and all-cycle broadcasts at the same time, the\nspecific takes precedence.\n\nBroadcasts can also target all tasks, specific tasks or families of\ntasks. If a task is affected by broadcasts to multiple ancestor\nnamespaces (tasks it inherits from), the result is determined by\nnormal `[runtime]` inheritance.\n\nBroadcasts are applied at the time of job submission.\n\nBroadcasts persist, even across restarts. Broadcasts made to\nspecific cycle points will expire when the cycle point is older\nthan the oldest active cycle point in the workflow.\n\nActive broadcasts can be revoked using the \"clear\" mode.\nAny broadcasts matching the specified cycle points and\nnamespaces will be revoked.\n\nNote: a \"clear\" broadcast for a specific cycle or namespace does\n*not* clear all-cycle or all-namespace broadcasts.",
+            "description": "Override `[runtime]` configurations in a running workflow.\n\nUses for broadcast include making temporary changes to task\nbehaviour, and task-to-downstream-task communication via\nenvironment variables.\n\nA broadcast can set/override any `[runtime]` configuration for all\ncycles or for a specific cycle. If a task is affected by\nspecific-cycle and all-cycle broadcasts at the same time, the\nspecific takes precedence.\n\nBroadcasts can also target all tasks, specific tasks or families of\ntasks. If a task is affected by broadcasts to multiple ancestor\nnamespaces (tasks it inherits from), the result is determined by\nnormal `[runtime]` inheritance.\n\nBroadcasts are applied at the time of job submission.\n\nBroadcasts persist, even across restarts. Broadcasts made to\nspecific cycle points will expire when the cycle point is older\nthan the oldest active cycle point in the workflow.\n\nActive broadcasts can be revoked using the \"clear\" mode.\nAny broadcasts matching the specified cycle points and\nnamespaces will be revoked.\n\nNote: a \"clear\" broadcast for a specific cycle or namespace does\n*not* clear all-cycle or all-namespace broadcasts.\n Valid for: paused, running workflows.",
             "args": [
               {
                 "name": "cutoff",

src/utils/aotf.js

@@ -50,6 +50,7 @@ import {
 import Alert from '@/model/Alert.model'
 import store from '@/store/index'
 import { Tokens } from '@/utils/uid'
+import { WorkflowState } from '@/model/WorkflowState.model'
 
 // Typedef imports
 /* eslint-disable no-unused-vars, no-duplicate-imports */
@@ -444,15 +445,20 @@ export function processMutations (mutations, types) {
  * @return {Array<String>}
  */
 export function getStates (text) {
-  const defaultStates = ['running', 'paused', 'stopping', 'stopped']
+  const defaultStates = [
+    WorkflowState.RUNNING.name,
+    WorkflowState.PAUSED.name,
+    WorkflowState.STOPPING.name,
+    WorkflowState.STOPPED.name
+  ]
   if (!text) {
     return defaultStates
   }
   const re = /Valid\sfor:\s(.*)\sworkflows./
   // default to all workflow states
   const validStates = text.match(re)
   if (validStates) {
-    return validStates[1]
+    return validStates[1].replace(/\s/g, '').split(',')
   }
   return defaultStates
 }

tests/e2e/support/graphql.js

@@ -27,6 +27,7 @@ const MUTATIONS = [
       in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
       Excepteur sint occaecat cupidatat non proident, sunt in culpa qui
       officia deserunt mollit anim id est laborum.
+      Valid for: running workflows.
     `,
     args: [
       {
@@ -43,6 +44,7 @@ const MUTATIONS = [
     _title: 'Unauthorised Mutation',
     description: `
       A mutation user will not be authorised for.
+      Valid for: running workflows.
     `,
     args: [
       {

tests/unit/components/cylc/tree/tree.data.js

@@ -26,7 +26,10 @@ const simpleWorkflowTree4Nodes = [
     type: 'workflow',
     node: {
       __typename: 'Workflow',
-      state: 'running'
+      state: 'running',
+      node: {
+        status: 'running'
+      }
     },
     children: [
       {

tests/unit/utils/aotf.spec.js

@@ -59,20 +59,26 @@ describe('aotf (Api On The Fly)', () => {
     })
   })
 
+  describe('getStates', () => {
+    it('gets valid states', () => {
+      expect(aotf.getStates('Valid for: running, stopped workflows.')).to.deep.equal(['running', 'stopped'])
+    })
+  })
+
   describe('processMutations', () => {
     it('should add computed fields', () => {
       const input = {
         name: 'fooBar',
-        description: 'Short description.\n\nLong\ndescription.\nValid for: stopped workflows.',
+        description: 'Short description.\n\nLong\ndescription.\nValid for: stopped, paused workflows.',
         args: []
       }
       const output = {
         ...input,
         _title: 'Foo Bar',
         _icon: aotf.mutationIcons[''],
         _shortDescription: 'Short description.',
-        _help: 'Long\ndescription.\nValid for: stopped workflows.',
-        _validStates: 'stopped'
+        _help: 'Long\ndescription.\nValid for: stopped, paused workflows.',
+        _validStates: ['stopped', 'paused']
       }
       aotf.processMutations([input], null)
       expect(input).to.deep.equal(output)