From 15de3c8f837f511af7900da375845b081fcf7970 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 11 Jan 2021 20:17:56 +0000
Subject: [PATCH] styling, async data fetching

---
 .../DatasourceNavigator.svelte                |  1 -
 .../integration/QueryParameterBuilder.svelte  | 25 ++++++----
 .../components/integration/QueryViewer.svelte | 18 +++----
 .../src/components/integration/index.svelte   |  5 +-
 .../EventsEditor/EventEditor.svelte           |  5 +-
 .../userInterface/TableViewSelect.svelte      | 48 ++++++++++++-------
 packages/client/src/api/datasources.js        | 13 +++--
 packages/standard-components/src/List.svelte  |  8 +++-
 8 files changed, 79 insertions(+), 44 deletions(-)

diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
index 408e1edd3c..3955e34041 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
@@ -13,7 +13,6 @@
     $backendUiStore.selectedView && $backendUiStore.selectedView.name
 
   function selectDatasource(datasource) {
-    // You can't actually select a datasource, just edit it
     backendUiStore.actions.datasources.select(datasource._id)
     $goto(`./datasource/${datasource._id}`)
   }
diff --git a/packages/builder/src/components/integration/QueryParameterBuilder.svelte b/packages/builder/src/components/integration/QueryParameterBuilder.svelte
index 440dd5ea5e..91f0eb023c 100644
--- a/packages/builder/src/components/integration/QueryParameterBuilder.svelte
+++ b/packages/builder/src/components/integration/QueryParameterBuilder.svelte
@@ -2,6 +2,7 @@
   import { Button, TextArea, Label, Input, Heading } from "@budibase/bbui"
   import BindableInput from "components/userInterface/BindableInput.svelte"
 
+  export let bindable = true
   export let parameters = []
   export let bindings = []
   export let customParams = {}
@@ -18,19 +19,23 @@
 
 <section>
   <Heading extraSmall black>Parameters</Heading>
-  <div class="parameters">
+  <div class="parameters" class:bindable>
     <Label extraSmall grey>Parameter Name</Label>
     <Label extraSmall grey>Default</Label>
-    <Label extraSmall grey>Value</Label>
+    {#if bindable}
+      <Label extraSmall grey>Value</Label>
+    {/if}
     <div />
     {#each parameters as parameter, idx}
       <Input thin bind:value={parameter.name} />
       <Input thin bind:value={parameter.default} />
-      <BindableInput
-        type="string"
-        thin
-        bind:value={customParams[parameter.name]}
-        {bindings} />
+      {#if bindable}
+        <BindableInput
+          type="string"
+          thin
+          bind:value={customParams[parameter.name]}
+          {bindings} />
+      {/if}
       <i
         class="ri-close-circle-line delete"
         on:click={() => deleteQueryParameter(idx)} />
@@ -40,9 +45,13 @@
 </section>
 
 <style>
+  .parameters.bindable {
+    grid-template-columns: 1fr 1fr 1fr 5%;
+  }
+
   .parameters {
     display: grid;
-    grid-template-columns: 1fr 1fr 1fr 5%;
+    grid-template-columns: 1fr 1fr 5%;
     grid-gap: 10px;
     align-items: center;
     margin-bottom: var(--spacing-xl);
diff --git a/packages/builder/src/components/integration/QueryViewer.svelte b/packages/builder/src/components/integration/QueryViewer.svelte
index f8c5ff1853..246bfaf4cc 100644
--- a/packages/builder/src/components/integration/QueryViewer.svelte
+++ b/packages/builder/src/components/integration/QueryViewer.svelte
@@ -117,7 +117,7 @@
   async function saveQuery() {
     try {
       await backendUiStore.actions.queries.save(query.datasourceId, query)
-      notifier.success(`Query created successfully.`)
+      notifier.success(`Query saved successfully.`)
     } catch (err) {
       console.error(err)
       notifier.danger(`Error creating query. ${err.message}`)
@@ -146,12 +146,12 @@
 
     <Spacer medium />
 
-    <section class="viewer">
-      <div class="viewer-controls">
-        <Button wide thin blue on:click={previewQuery}>Run</Button>
-        <Button wide thin primary on:click={saveQuery}>Save</Button>
-      </div>
+    <div class="viewer-controls">
+      <Button wide thin blue disabled={!data} on:click={saveQuery}>Save</Button>
+      <Button wide thin primary on:click={previewQuery}>Run</Button>
+    </div>
 
+    <section class="viewer">
       {#if data}
         <Switcher headings={PREVIEW_HEADINGS} bind:value={tab}>
           {#if tab === 'JSON'}
@@ -208,14 +208,14 @@
   }
 
   .viewer {
-    position: relative;
   }
 
   .viewer-controls {
-    position: absolute;
-    right: 0;
     display: grid;
     grid-gap: var(--spacing-m);
     grid-auto-flow: column;
+    direction: rtl;
+    grid-template-columns: 10% 10% 1fr;
+    margin-bottom: var(--spacing-m);
   }
 </style>
diff --git a/packages/builder/src/components/integration/index.svelte b/packages/builder/src/components/integration/index.svelte
index 9f81442074..9b9b7e5d11 100644
--- a/packages/builder/src/components/integration/index.svelte
+++ b/packages/builder/src/components/integration/index.svelte
@@ -15,7 +15,8 @@
 </script>
 
 {#if query.queryType === QueryTypes.SQL}
-  <ParameterBuilder bind:parameters={query.parameters} />
+  <ParameterBuilder bind:parameters={query.parameters} bindable={false} />
   <Spacer large />
-  <Editor label="Query" on:change={updateQuery} value={query.queryString} />
+  <TextArea bind:value={query.queryString} />
+  <!-- <Editor label="Query" on:change={updateQuery} value={query.queryString} /> -->
 {/if}
diff --git a/packages/builder/src/components/userInterface/EventsEditor/EventEditor.svelte b/packages/builder/src/components/userInterface/EventsEditor/EventEditor.svelte
index 5a94dadc5d..35a053c4aa 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/EventEditor.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/EventEditor.svelte
@@ -132,6 +132,7 @@
     display: flex;
     flex-direction: row;
     align-items: center;
+    margin-top: var(--spacing-m);
   }
 
   .action-header > span {
@@ -146,6 +147,7 @@
 
   .actions-list {
     border: var(--border-light);
+    padding: var(--spacing-s);
   }
 
   .available-action {
@@ -159,14 +161,13 @@
   }
 
   .actions-container {
+    height: 40vh;
     display: grid;
     grid-gap: var(--spacing-m);
     grid-template-columns: 15% 1fr;
     grid-auto-flow: column;
     min-height: 0;
     padding-top: 0;
-    border: var(--border-light);
-    border-width: 0 0 1px 0;
     overflow-y: auto;
   }
 
diff --git a/packages/builder/src/components/userInterface/TableViewSelect.svelte b/packages/builder/src/components/userInterface/TableViewSelect.svelte
index a395497cc4..715a2f200e 100644
--- a/packages/builder/src/components/userInterface/TableViewSelect.svelte
+++ b/packages/builder/src/components/userInterface/TableViewSelect.svelte
@@ -89,6 +89,23 @@
   <span>{value.label ? value.label : 'Table / View / Query'}</span>
   <Icon name="arrowdown" />
 </div>
+{#if value.type === "query"}
+  <i class="ri-settings-5-line" on:click={openBindingDrawer}/>
+  {#if bindingDrawerOpen}
+    <BottomDrawer title={'Query'} onClose={closeDatabindingDrawer}>
+      <div slot="buttons">
+        <Button blue thin on:click={() => handleSelected(value)}>Save</Button>
+      </div>
+      <div class="drawer-contents" slot="body">
+        <pre>{value.queryString}</pre>
+        <ParameterBuilder
+          bind:customParams={value.queryParams}
+          parameters={value.parameters || []}
+          bindings={queryBindableProperties} />
+      </div>
+    </BottomDrawer>
+  {/if}
+{/if}
 <DropdownMenu bind:this={dropdownRight} anchor={anchorRight}>
   <div class="dropdown">
     <div class="title">
@@ -146,24 +163,6 @@
   </div>
 </DropdownMenu>
 
-{#if value.type === "query"}
-  <Button blue on:click={openBindingDrawer}/>
-  {#if bindingDrawerOpen}
-    <BottomDrawer title={'Query'} onClose={closeDatabindingDrawer}>
-      <div slot="buttons">
-        <Button blue thin on:click={() => handleSelected(value)}>Save</Button>
-      </div>
-      <div class="drawer-contents" slot="body">
-        <pre>{value.queryString}</pre>
-        <ParameterBuilder
-          bind:customParams={value.queryParams}
-          parameters={value.parameters || []}
-          bindings={queryBindableProperties} />
-      </div>
-    </BottomDrawer>
-  {/if}
-{/if}
-
 
 <style>
   .dropdownbutton {
@@ -230,4 +229,17 @@
   .drawer-contents {
     padding: var(--spacing-xl);
   }
+
+  i {
+    margin-left: 5px;
+    display: flex;
+    align-items: center;
+    transition: all 0.2s;
+  }
+
+  i:hover {
+    transform: scale(1.1);
+    font-weight: 500;
+    cursor: pointer;
+  }
 </style>
diff --git a/packages/client/src/api/datasources.js b/packages/client/src/api/datasources.js
index f5adb0fc06..15e3a6fc10 100644
--- a/packages/client/src/api/datasources.js
+++ b/packages/client/src/api/datasources.js
@@ -24,11 +24,18 @@ export const fetchDatasource = async (datasource, dataContext) => {
     rows = await fetchViewData(datasource)
   } else if (type === "query") {
     const bindings = get(bindingStore)
-    const fullContext = {
+
+    // TODO: refactor. Set these defaults up somewhere else
+    let queryParams = datasource.queryParams || {}
+    for (let param of datasource.parameters) {
+      if (!queryParams[param.name]) {
+        queryParams[param.name] = param.default
+      }
+    }
+    const parameters = enrichDataBindings(queryParams, {
       ...bindings,
       ...dataContext,
-    }
-    const parameters = enrichDataBindings(datasource.queryParams, fullContext)
+    })
     return await executeQuery({ queryId: datasource._id, parameters })
   } else if (type === "link") {
     const row = dataContext[datasource.providerId]
diff --git a/packages/standard-components/src/List.svelte b/packages/standard-components/src/List.svelte
index 038269d4bd..1a5638404a 100644
--- a/packages/standard-components/src/List.svelte
+++ b/packages/standard-components/src/List.svelte
@@ -10,9 +10,15 @@
 
   let rows = []
 
+  $: datasource && fetchData()
+
+  async function fetchData() {
+    rows = await API.fetchDatasource(datasource, $dataContext)
+  }
+
   onMount(async () => {
     if (!isEmpty(datasource)) {
-      rows = await API.fetchDatasource(datasource, $dataContext)
+      fetchData()
     }
   })
 </script>