fix(add-search-doc): Ask for state machine then label

Makes more sense that way around

Author: jezhiggins

lib/actions/add-search-doc/index.js

@@ -121,19 +121,21 @@ async function * gatherLaunch (stateMachines) {
   console.log(c.bold('Launches'))
 
   while (true) {
-    const title = await ask({
-      message: 'Launch label (hit Enter to quit)'
-    })
-    if (!title) {
-      return
-    }
-
     const stateMachine = await ask({
       type: 'autocomplete',
+      allowNone: true,
       message: 'State machine to launch',
       choices: stateMachines
     })
 
+    if (!stateMachine) {
+      return
+    }
+
+    const title = await ask({
+      message: 'Launch label'
+    })
+
     yield {
       title,
       stateMachine

lib/actions/util/ask.js

@@ -1,6 +1,8 @@
 const { prompt } = require('enquirer')
 
 async function ask (question) {
+  const None = '--NONE--'
+
   if (!question.type) {
     question.type = 'input'
   }
@@ -10,8 +12,19 @@ async function ask (question) {
   if (question.multiple && !question.hint) {
     question.hint = '(Use <space> to select, <return> to submit)'
   }
-  const selection = await prompt(question)
-  return selection[question.name]
+  if (question.type === 'autocomplete' && question.allowNone) {
+    question.choices = [
+      {
+        name: 'None',
+        hint: `(select to exit)`,
+        value: None
+      },
+      ...question.choices
+    ]
+  }
+
+  const selection = (await prompt(question))[question.name]
+  return (selection !== None) ? selection : null
 } // ask
 
 module.exports = ask

test/add-search-doc-test.js

@@ -34,8 +34,8 @@ describe('tymly add-search-doc', () => {
       // '', // addition fields -> select none of them
       helpers.down, // categories - select pizza
       helpers.down + helpers.down + ' ' + helpers.down + ' ', // roles - select chef and customer
+      helpers.down + helpers.down, // select view state machine
       'View',
-      helpers.down, // select view state machine
       '',
       'yes-boys' // accept default filename
     ],

test/fixtures/add-search-doc/expected/multiple-everything/search-docs/yes-boys.json

@@ -6,7 +6,7 @@
     "domain": "'search'::text",
     "docType": "'wmfs_pizza'::text",
     "title": "label::text",
-    "description": "code::text || ' ' || label::text",
+    "description": "concat(code::text, ' ', label::text)",
     "additionalTerms": "NULL::text[]",
     "category": "'pizza'::text",
     "eventTimestamp": "NULL::timestamp with time zone",

test/fixtures/add-search-doc/expected/path-to-external-model/search-docs/drinks.json

@@ -6,7 +6,7 @@
     "domain": "'search'::text",
     "docType": "'wmfs_drinks'::text",
     "title": "label::text",
-    "description": "code::text || ' ' || label::text",
+    "description": "concat(code::text, ' ', label::text)",
     "additionalTerms": "NULL::text[]",
     "category": "'pizza'::text",
     "eventTimestamp": "NULL::timestamp with time zone",