From f520d9f8430901c1c3540ea46723466718932316 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 1 Dec 2021 13:31:40 +0000
Subject: [PATCH] Updating key value in queries to be a bit more clear.

---
 .../src/components/integration/KeyValueBuilder.svelte       | 4 +++-
 .../src/components/integration/QueryFieldsBuilder.svelte    | 6 +++++-
 packages/builder/src/helpers/helpers.js                     | 2 ++
 packages/builder/src/helpers/index.js                       | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/integration/KeyValueBuilder.svelte b/packages/builder/src/components/integration/KeyValueBuilder.svelte
index 5b5e84a1d0..3261ef3559 100644
--- a/packages/builder/src/components/integration/KeyValueBuilder.svelte
+++ b/packages/builder/src/components/integration/KeyValueBuilder.svelte
@@ -1,6 +1,7 @@
 <script>
   import { Icon, ActionButton, Input } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
+  import { lowercase } from "helpers"
 
   let dispatch = createEventDispatcher()
 
@@ -8,6 +9,7 @@
   export let object = defaults || {}
   export let readOnly
   export let noAddButton
+  export let name
 
   let fields = Object.entries(object).map(([name, value]) => ({ name, value }))
 
@@ -47,7 +49,7 @@
 {#if !readOnly && !noAddButton}
   <div>
     <ActionButton icon="Add" secondary thin outline on:click={addEntry}
-      >Add</ActionButton
+      >Add{name ? ` ${lowercase(name)}` : ""}</ActionButton
     >
   </div>
 {/if}
diff --git a/packages/builder/src/components/integration/QueryFieldsBuilder.svelte b/packages/builder/src/components/integration/QueryFieldsBuilder.svelte
index 3059111f9d..340dc7839c 100644
--- a/packages/builder/src/components/integration/QueryFieldsBuilder.svelte
+++ b/packages/builder/src/components/integration/QueryFieldsBuilder.svelte
@@ -30,7 +30,11 @@
     {#each schemaKeys as field}
       {#if schema.fields[field]?.type === "object"}
         <Label small>{getDisplayName(field)}</Label>
-        <KeyValueBuilder readOnly={!editable} bind:object={fields[field]} />
+        <KeyValueBuilder
+          name={getDisplayName(field)}
+          readOnly={!editable}
+          bind:object={fields[field]}
+        />
       {:else if schema.fields[field]?.type === "json"}
         <div>
           <Label extraSmall grey>{getDisplayName(field)}</Label>
diff --git a/packages/builder/src/helpers/helpers.js b/packages/builder/src/helpers/helpers.js
index 89c7a0a6aa..9b0fa51a52 100644
--- a/packages/builder/src/helpers/helpers.js
+++ b/packages/builder/src/helpers/helpers.js
@@ -19,6 +19,8 @@ export const pipe = (arg, funcs) => flow(funcs)(arg)
 
 export const capitalise = s => s.substring(0, 1).toUpperCase() + s.substring(1)
 
+export const lowercase = s => s.substring(0, 1).toLowerCase() + s.substring(1)
+
 export const get_name = s => (!s ? "" : last(s.split("/")))
 
 export const get_capitalised_name = name => pipe(name, [get_name, capitalise])
diff --git a/packages/builder/src/helpers/index.js b/packages/builder/src/helpers/index.js
index 2c09cc19ca..2b272998c1 100644
--- a/packages/builder/src/helpers/index.js
+++ b/packages/builder/src/helpers/index.js
@@ -6,4 +6,5 @@ export {
   capitalise,
   get_name,
   get_capitalised_name,
+  lowercase,
 } from "./helpers"