From bce557f727d4cfa604f8f6bef683730b1d7c1caf Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Fri, 18 Sep 2020 12:01:57 +0100
Subject: [PATCH 1/3] Improve workflow block tagline rendering and support
 pretty printing enum bindings

---
 .../WorkflowBuilder/flowchart/FlowItem.svelte | 25 ++-----
 .../flowchart/WorkflowBlockTagline.svelte     | 67 ++++++++++++++++---
 2 files changed, 61 insertions(+), 31 deletions(-)

diff --git a/packages/builder/src/components/workflow/WorkflowBuilder/flowchart/FlowItem.svelte b/packages/builder/src/components/workflow/WorkflowBuilder/flowchart/FlowItem.svelte
index a67b15cd8a..38085cac89 100644
--- a/packages/builder/src/components/workflow/WorkflowBuilder/flowchart/FlowItem.svelte
+++ b/packages/builder/src/components/workflow/WorkflowBuilder/flowchart/FlowItem.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { workflowStore, backendUiStore } from "builderStore"
+  import { workflowStore } from "builderStore"
   import WorkflowBlockTagline from "./WorkflowBlockTagline.svelte"
 
   export let onSelect
@@ -9,29 +9,12 @@
   $: selected = $workflowStore.selectedBlock?.id === block.id
   $: steps = $workflowStore.selectedWorkflow?.workflow?.definition?.steps ?? []
   $: blockIdx = steps.findIndex(step => step.id === block.id)
-
-  function selectBlock() {
-    onSelect(block)
-  }
-
-  function enrichInputs(inputs) {
-    let enrichedInputs = { ...inputs, enriched: {} }
-    const modelId = inputs.modelId || inputs.record?.modelId
-    if (modelId) {
-      enrichedInputs.enriched.model = $backendUiStore.models.find(
-        model => model._id === modelId
-      )
-    }
-    return enrichedInputs
-  }
-
-  $: inputs = enrichInputs(block.inputs)
 </script>
 
 <div
   class={`block ${block.type} hoverable`}
   class:selected
-  on:click={selectBlock}>
+  on:click={() => onSelect(block)}>
   <header>
     {#if block.type === 'TRIGGER'}
       <i class="ri-lightbulb-fill" />
@@ -49,13 +32,13 @@
   </header>
   <hr />
   <p>
-    <WorkflowBlockTagline tagline={block.tagline} {inputs} />
+    <WorkflowBlockTagline {block} />
   </p>
 </div>
 
 <style>
   .block {
-    width: 320px;
+    width: 360px;
     padding: 20px;
     border-radius: var(--border-radius-m);
     transition: 0.3s all ease;
diff --git a/packages/builder/src/components/workflow/WorkflowBuilder/flowchart/WorkflowBlockTagline.svelte b/packages/builder/src/components/workflow/WorkflowBuilder/flowchart/WorkflowBlockTagline.svelte
index 5603b07fab..7503f2dc35 100644
--- a/packages/builder/src/components/workflow/WorkflowBuilder/flowchart/WorkflowBlockTagline.svelte
+++ b/packages/builder/src/components/workflow/WorkflowBuilder/flowchart/WorkflowBlockTagline.svelte
@@ -1,19 +1,61 @@
 <script>
   import mustache from "mustache"
+  import { get } from "lodash/fp"
+  import { backendUiStore } from "builderStore"
 
-  export let tagline
-  export let inputs
+  export let block
 
-  // Add bolt tags around inputs
-  $: boldTagline = tagline.replace(/{{/g, "<b>{{").replace(/}}/, "}}</b>")
+  $: inputs = enrichInputs(block.inputs)
+  $: tagline = formatTagline(block.tagline, block.schema, inputs)
+  $: html = (tagline || "")
+    .replace(/{{\s*/g, "<span>")
+    .replace(/\s*}}/g, "</span>")
 
-  // Fill in inputs with mustache
-  $: parsedTagline = mustache.render(boldTagline, { inputs })
+  function enrichInputs(inputs) {
+    let enrichedInputs = { ...inputs, enriched: {} }
+    const modelId = inputs.modelId || inputs.record?.modelId
+    if (modelId) {
+      enrichedInputs.enriched.model = $backendUiStore.models.find(
+        model => model._id === modelId
+      )
+    }
+    return enrichedInputs
+  }
 
-  // Wrap bound fields inside spans to highlight them
-  $: html = (parsedTagline || "")
-    .replace(/{{\s/g, "<span>")
-    .replace(/\s}}/g, "</span>")
+  function formatTagline(tagline, schema, inputs) {
+    // Add bold tags around inputs
+    let formattedTagline = tagline
+      .replace(/{{/g, "<b>{{")
+      .replace(/}}/, "}}</b>")
+
+    // Extract schema paths for any input bindings
+    const inputPaths = formattedTagline
+      .match(/{{\s*\S+\s*}}/g)
+      .map(x => x.replace(/[{}]/g, "").trim())
+    const schemaPaths = inputPaths.map(x => x.replace(/\./g, ".properties."))
+
+    // Replace any enum bindings with their pretty equivalents
+    schemaPaths.forEach((path, idx) => {
+      const prettyValues = get(`${path}.pretty`, schema)
+      if (prettyValues) {
+        const enumValues = get(`${path}.enum`, schema)
+        const inputPath = inputPaths[idx]
+        const value = get(inputPath, { inputs })
+        const valueIdx = enumValues.indexOf(value)
+        const prettyValue = prettyValues[valueIdx]
+        if (prettyValue == null) {
+          return
+        }
+        formattedTagline = formattedTagline.replace(
+          new RegExp(`{{\s*${inputPath}\s*}}`),
+          prettyValue
+        )
+      }
+    })
+
+    // Fill in bindings with mustache
+    return mustache.render(formattedTagline, { inputs })
+  }
 </script>
 
 <div>
@@ -21,10 +63,15 @@
 </div>
 
 <style>
+  div {
+    line-height: 1.25;
+  }
   div :global(span) {
     font-size: 0.9em;
     background-color: var(--purple-light);
     padding: var(--spacing-xs);
     border-radius: var(--border-radius-m);
+    display: inline-block;
+    margin: 1px;
   }
 </style>

From f906ce0a83e311e82bfa31836a6e110ee2fdf4cc Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Fri, 18 Sep 2020 16:13:42 +0100
Subject: [PATCH 2/3] Fix part of workflow cypress tests

---
 .../integration/createWorkflow.spec.js        | 25 ++++++++++++-------
 .../SetupPanel/WorkflowBlockSetup.svelte      |  2 +-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/packages/builder/cypress/integration/createWorkflow.spec.js b/packages/builder/cypress/integration/createWorkflow.spec.js
index 833777f106..50fbcb4445 100644
--- a/packages/builder/cypress/integration/createWorkflow.spec.js
+++ b/packages/builder/cypress/integration/createWorkflow.spec.js
@@ -21,17 +21,25 @@ context("Create a workflow", () => {
     // Add trigger
     cy.get("[data-cy=add-workflow-component]").click()
     cy.get("[data-cy=RECORD_SAVED]").click()
-    cy.get(".budibase__input").select("dog")
+    cy.get("[data-cy=workflow-block-setup]").within(() => {
+      cy.get("select")
+        .first()
+        .select("dog")
+    })
 
     // Create action
     cy.get("[data-cy=SAVE_RECORD]").click()
-    cy.get(".budibase__input").select("dog")
-    cy.get(".container input")
-      .first()
-      .type("goodboy")
-    cy.get(".container input")
-      .eq(1)
-      .type("11")
+    cy.get("[data-cy=workflow-block-setup]").within(() => {
+      cy.get("select")
+        .first()
+        .select("dog")
+      cy.get("input")
+        .first()
+        .type("goodboy")
+      cy.get("input")
+        .eq(1)
+        .type("11")
+    })
 
     // Save
     cy.contains("Save Workflow").click()
@@ -44,7 +52,6 @@ context("Create a workflow", () => {
 
   it("should add record when a new record is added", () => {
     cy.contains("backend").click()
-
     cy.addRecord(["Rover", 15])
     cy.reload()
     cy.contains("goodboy").should("have.text", "goodboy")
diff --git a/packages/builder/src/components/workflow/SetupPanel/WorkflowBlockSetup.svelte b/packages/builder/src/components/workflow/SetupPanel/WorkflowBlockSetup.svelte
index f6f12c04f6..7227d0fdde 100644
--- a/packages/builder/src/components/workflow/SetupPanel/WorkflowBlockSetup.svelte
+++ b/packages/builder/src/components/workflow/SetupPanel/WorkflowBlockSetup.svelte
@@ -44,7 +44,7 @@
   }
 </script>
 
-<div class="container">
+<div class="container" data-cy="workflow-block-setup">
   <div class="block-label">{block.name}</div>
   {#each inputs as [key, value]}
     <div class="bb-margin-xl block-field">

From af2bdd2db7a3a65681d94f52e5d18d2dbbf16939 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Fri, 18 Sep 2020 16:14:37 +0100
Subject: [PATCH 3/3] Prevent datetime and boolean fields showing in workflow
 block setup until these are handled properly

---
 .../SetupPanel/ParamInputs/RecordSelector.svelte  | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte b/packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte
index ab65676674..da812e456c 100644
--- a/packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte
+++ b/packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte
@@ -12,17 +12,6 @@
   // Ensure any nullish modelId values get set to empty string so
   // that the select works
   $: if (value?.modelId == null) value = { modelId: "" }
-
-  function setParsedValue(evt, field) {
-    const fieldSchema = model?.schema[field]
-    if (fieldSchema) {
-      if (fieldSchema.type === "number") {
-        value[field] = parseInt(evt.target.value)
-        return
-      }
-    }
-    value[field] = evt.target.value
-  }
 </script>
 
 <div class="block-field">
@@ -49,12 +38,12 @@
               <option value={option}>{option}</option>
             {/each}
           </Select>
-        {:else}
+        {:else if schema.type === "string"}
           <BindableInput
             thin
             bind:value={value[field]}
-            on:change={e => setParsedValue(e, field)}
             label={field}
+            type={schema.type}
             {bindings} />
         {/if}
       </div>