From f992c650d2649dbb1919d4e1c5441797e820ce82 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Sun, 23 May 2021 15:06:33 +0100
Subject: [PATCH 1/4] allow deletion of relationships

---
 .../DataTable/modals/CreateEditColumn.svelte      | 15 ++++++++++-----
 .../src/components/integration/index.svelte       |  4 +++-
 packages/server/src/api/controllers/query.js      |  9 ++++++++-
 .../server/src/integrations/microsoftSqlServer.js |  9 +++++++--
 packages/server/src/integrations/rest.js          |  8 ++++----
 5 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index 88ee57e176..f5f6da7d86 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -33,6 +33,7 @@
   let fieldDefinitions = cloneDeep(FIELDS)
   const { hide } = getContext(Context.Modal)
 
+  export let onClosed = () => {}
   export let field = {
     type: "string",
     constraints: fieldDefinitions.STRING.constraints,
@@ -56,9 +57,8 @@
   )
   $: required = !!field?.constraints?.presence || primaryDisplay
   $: uneditable =
-    ($tables.selected?._id === TableNames.USERS &&
-      UNEDITABLE_USER_FIELDS.includes(field.name)) ||
-    (originalName && field.type === LINK_TYPE)
+    $tables.selected?._id === TableNames.USERS &&
+    UNEDITABLE_USER_FIELDS.includes(field.name)
   $: invalid =
     !field.name ||
     (field.type === LINK_TYPE && !field.tableId) ||
@@ -98,7 +98,8 @@
     } else {
       tables.deleteField(field)
       notifications.success(`Column ${field.name} deleted.`)
-      hide()
+      confirmDeleteDialog.hide()
+      deletion = false
     }
   }
 
@@ -193,7 +194,11 @@
   onConfirm={saveColumn}
   disabled={invalid}
 >
-  <Input label="Name" bind:value={field.name} disabled={uneditable} />
+  <Input
+    label="Name"
+    bind:value={field.name}
+    disabled={uneditable || field.type === LINK_TYPE}
+  />
 
   <Select
     disabled={originalName}
diff --git a/packages/builder/src/components/integration/index.svelte b/packages/builder/src/components/integration/index.svelte
index a6477370c8..5c821d3a53 100644
--- a/packages/builder/src/components/integration/index.svelte
+++ b/packages/builder/src/components/integration/index.svelte
@@ -17,7 +17,9 @@
 
   $: urlDisplay =
     schema.urlDisplay &&
-    `${datasource.config.url}${query.fields.path}${query.fields.queryString}`
+    `${datasource.config.url}${query.fields.path ?? ""}${
+      query.fields.queryString ?? ""
+    }`
 
   function updateQuery({ detail }) {
     query.fields[schema.type] = detail.value
diff --git a/packages/server/src/api/controllers/query.js b/packages/server/src/api/controllers/query.js
index cd3dcbd305..43911f6903 100644
--- a/packages/server/src/api/controllers/query.js
+++ b/packages/server/src/api/controllers/query.js
@@ -19,7 +19,14 @@ function enrichQueries(input) {
 
 function formatResponse(resp) {
   if (typeof resp === "string") {
-    resp = JSON.parse(resp)
+    try {
+      resp = JSON.parse(resp)
+    } catch (err) {
+      console.error(
+        "Error parsing JSON response. Returning string in array instead."
+      )
+      resp = { response: resp }
+    }
   }
   if (!Array.isArray(resp)) {
     resp = [resp]
diff --git a/packages/server/src/integrations/microsoftSqlServer.js b/packages/server/src/integrations/microsoftSqlServer.js
index 641fd9a66f..6f99d1014a 100644
--- a/packages/server/src/integrations/microsoftSqlServer.js
+++ b/packages/server/src/integrations/microsoftSqlServer.js
@@ -1,6 +1,8 @@
 const sqlServer = require("mssql")
 const { FIELD_TYPES } = require("./Integration")
 
+let pool
+
 const SCHEMA = {
   docs: "https://github.com/tediousjs/node-mssql",
   description:
@@ -49,11 +51,14 @@ const SCHEMA = {
 class SqlServerIntegration {
   constructor(config) {
     this.config = config
-    this.client = sqlServer
+    if (!pool) {
+      pool = new sqlServer.ConnectionPool(this.config)
+    }
   }
 
   async connect() {
-    return await this.client.connect(this.config)
+    const client = await pool.connect()
+    this.client = client.request()
   }
 
   async read(query) {
diff --git a/packages/server/src/integrations/rest.js b/packages/server/src/integrations/rest.js
index 151cc22889..378158d73a 100644
--- a/packages/server/src/integrations/rest.js
+++ b/packages/server/src/integrations/rest.js
@@ -111,7 +111,7 @@ class RestIntegration {
     }
   }
 
-  async create({ path, queryString, headers = {}, json }) {
+  async create({ path = "", queryString = "", headers = {}, json }) {
     this.headers = {
       ...this.config.defaultHeaders,
       ...headers,
@@ -126,7 +126,7 @@ class RestIntegration {
     return await this.parseResponse(response)
   }
 
-  async read({ path, queryString, headers = {} }) {
+  async read({ path = "", queryString = "", headers = {} }) {
     this.headers = {
       ...this.config.defaultHeaders,
       ...headers,
@@ -139,7 +139,7 @@ class RestIntegration {
     return await this.parseResponse(response)
   }
 
-  async update({ path, queryString, headers = {}, json }) {
+  async update({ path = "", queryString = "", headers = {}, json }) {
     this.headers = {
       ...this.config.defaultHeaders,
       ...headers,
@@ -154,7 +154,7 @@ class RestIntegration {
     return await this.parseResponse(response)
   }
 
-  async delete({ path, queryString, headers = {} }) {
+  async delete({ path = "", queryString = "", headers = {} }) {
     this.headers = {
       ...this.config.defaultHeaders,
       ...headers,

From b8c18d3d91dc8f6b00bbf9d985025ab1315c9942 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Sun, 23 May 2021 15:40:00 +0100
Subject: [PATCH 2/4] make attachments downloadable and images clickable

---
 packages/bbui/package.json                     |  1 +
 .../bbui/src/Table/AttachmentRenderer.svelte   | 18 ++++++++++++++++--
 packages/bbui/src/Tooltip/Tooltip.svelte       | 14 ++++++++++++++
 packages/bbui/src/index.js                     |  1 +
 packages/bbui/yarn.lock                        |  5 +++++
 .../components/backend/DataTable/Table.svelte  |  6 ++++++
 6 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 packages/bbui/src/Tooltip/Tooltip.svelte

diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 7e57282b2c..1d05abcc19 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -71,6 +71,7 @@
     "@spectrum-css/tags": "^3.0.2",
     "@spectrum-css/textfield": "^3.0.1",
     "@spectrum-css/toast": "^3.0.1",
+    "@spectrum-css/tooltip": "^3.0.3",
     "@spectrum-css/treeview": "^3.0.2",
     "@spectrum-css/typography": "^3.0.1",
     "@spectrum-css/underlay": "^2.0.9",
diff --git a/packages/bbui/src/Table/AttachmentRenderer.svelte b/packages/bbui/src/Table/AttachmentRenderer.svelte
index ab9760a980..6bb53aaa80 100644
--- a/packages/bbui/src/Table/AttachmentRenderer.svelte
+++ b/packages/bbui/src/Table/AttachmentRenderer.svelte
@@ -1,6 +1,12 @@
 <script>
+  import Tooltip from "../Tooltip/Tooltip.svelte"
+  import Link from "../Link/Link.svelte"
+  import { createEventDispatcher } from "svelte"
+
   export let value
 
+  const dispatch = createEventDispatcher()
+
   const displayLimit = 5
   $: attachments = value?.slice(0, displayLimit) ?? []
   $: leftover = (value?.length ?? 0) - attachments.length
@@ -13,9 +19,17 @@
 
 {#each attachments as attachment}
   {#if isImage(attachment.extension)}
-    <img src={attachment.url} alt={attachment.extension} />
+    <Link quiet target="_blank" href={attachment.url}>
+      <img src={attachment.url} alt={attachment.extension} />
+    </Link>
   {:else}
-    <div class="file">{attachment.extension}</div>
+    <Tooltip text={attachment.name} direction="right">
+      <div class="file">
+        <Link quiet target="_blank" href={attachment.url}
+          >{attachment.extension}</Link
+        >
+      </div>
+    </Tooltip>
   {/if}
 {/each}
 {#if leftover}
diff --git a/packages/bbui/src/Tooltip/Tooltip.svelte b/packages/bbui/src/Tooltip/Tooltip.svelte
new file mode 100644
index 0000000000..a4b1d4ff59
--- /dev/null
+++ b/packages/bbui/src/Tooltip/Tooltip.svelte
@@ -0,0 +1,14 @@
+<script>
+  import "@spectrum-css/tooltip/dist/index-vars.css"
+
+  export let direction = "top"
+  export let text = ""
+</script>
+
+<span class="u-tooltip-showOnHover tooltip">
+  <slot />
+  <div class={`spectrum-Tooltip spectrum-Tooltip--${direction}`}>
+    <span class="spectrum-Tooltip-label">{text}</span>
+    <span class="spectrum-Tooltip-tip" />
+  </div>
+</span>
diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js
index 63abfa319b..f6d2c4eb9c 100644
--- a/packages/bbui/src/index.js
+++ b/packages/bbui/src/index.js
@@ -30,6 +30,7 @@ export { default as Label } from "./Label/Label.svelte"
 export { default as Layout } from "./Layout/Layout.svelte"
 export { default as Page } from "./Layout/Page.svelte"
 export { default as Link } from "./Link/Link.svelte"
+export { default as Tooltip } from "./Tooltip/Tooltip.svelte"
 export { default as Menu } from "./Menu/Menu.svelte"
 export { default as MenuSection } from "./Menu/Section.svelte"
 export { default as MenuSeparator } from "./Menu/Separator.svelte"
diff --git a/packages/bbui/yarn.lock b/packages/bbui/yarn.lock
index c6991c4a03..71582be096 100644
--- a/packages/bbui/yarn.lock
+++ b/packages/bbui/yarn.lock
@@ -236,6 +236,11 @@
   resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.2.tgz#8e27cce799b1b1d0054a88b135dddf7fbf1bdc78"
   integrity sha512-sJp8DRsU2iSF67hlOQHFdRkbJHncspoOywHEsqcjh2KFl8gRY12rQL0ORG6J2THUt0LVBWSy48iwph9s4rkwsA==
 
+"@spectrum-css/tooltip@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/tooltip/-/tooltip-3.0.3.tgz#26b8ca3b3d30e29630244d85eb4fc11d0c841281"
+  integrity sha512-ztRF7WW1FzyNavXBRc+80z67UoOrY9wl3cMYsVD3MpDnyxdzP8cjza1pCcolKBaFqRTcQKkxKw3GWtGICRKR5A==
+
 "@spectrum-css/treeview@^3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@spectrum-css/treeview/-/treeview-3.0.2.tgz#d54d8f17290babb1c885f5d9355e225421beb0d2"
diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte
index c23a6e3107..75940a4919 100644
--- a/packages/builder/src/components/backend/DataTable/Table.svelte
+++ b/packages/builder/src/components/backend/DataTable/Table.svelte
@@ -65,6 +65,12 @@
     )
   }
 
+  const selectAttachment = ({ url }) => {
+    $goto(
+      `/builder/app/${$params.application}/data/table/${tableId}/relationship/${rowId}/${fieldName}`
+    )
+  }
+
   const deleteRows = async () => {
     await api.post(`/api/${tableId}/rows`, {
       rows: selectedRows,

From 495a255987b1fa27d57dbfb42a55bd059d0449dc Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Sun, 23 May 2021 15:52:21 +0100
Subject: [PATCH 3/4] tidy up

---
 packages/bbui/src/Table/AttachmentRenderer.svelte           | 3 ---
 .../builder/src/components/backend/DataTable/Table.svelte   | 6 ------
 2 files changed, 9 deletions(-)

diff --git a/packages/bbui/src/Table/AttachmentRenderer.svelte b/packages/bbui/src/Table/AttachmentRenderer.svelte
index 6bb53aaa80..90bb5cce66 100644
--- a/packages/bbui/src/Table/AttachmentRenderer.svelte
+++ b/packages/bbui/src/Table/AttachmentRenderer.svelte
@@ -1,12 +1,9 @@
 <script>
   import Tooltip from "../Tooltip/Tooltip.svelte"
   import Link from "../Link/Link.svelte"
-  import { createEventDispatcher } from "svelte"
 
   export let value
 
-  const dispatch = createEventDispatcher()
-
   const displayLimit = 5
   $: attachments = value?.slice(0, displayLimit) ?? []
   $: leftover = (value?.length ?? 0) - attachments.length
diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte
index 75940a4919..c23a6e3107 100644
--- a/packages/builder/src/components/backend/DataTable/Table.svelte
+++ b/packages/builder/src/components/backend/DataTable/Table.svelte
@@ -65,12 +65,6 @@
     )
   }
 
-  const selectAttachment = ({ url }) => {
-    $goto(
-      `/builder/app/${$params.application}/data/table/${tableId}/relationship/${rowId}/${fieldName}`
-    )
-  }
-
   const deleteRows = async () => {
     await api.post(`/api/${tableId}/rows`, {
       rows: selectedRows,

From be7a8cfb8ccc4d58013bfb03dbdedbcd62c8eaf4 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 24 May 2021 12:14:04 +0100
Subject: [PATCH 4/4] fix tests

---
 packages/server/__mocks__/mssql.js                     | 10 +++++++++-
 .../src/integrations/tests/microsoftSqlServer.spec.js  |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/server/__mocks__/mssql.js b/packages/server/__mocks__/mssql.js
index 6119c014da..3809f0a4c6 100644
--- a/packages/server/__mocks__/mssql.js
+++ b/packages/server/__mocks__/mssql.js
@@ -9,6 +9,14 @@ mssql.query = jest.fn(() => ({
   ],
 }))
 
-mssql.connect = jest.fn(() => ({ recordset: [] }))
+// mssql.connect = jest.fn(() => ({ recordset: [] }))
+
+mssql.ConnectionPool = jest.fn(() => ({
+  connect: jest.fn(() => ({
+    request: jest.fn(() => ({
+      query: jest.fn(() => ({})),
+    })),
+  })),
+}))
 
 module.exports = mssql
diff --git a/packages/server/src/integrations/tests/microsoftSqlServer.spec.js b/packages/server/src/integrations/tests/microsoftSqlServer.spec.js
index 29399b840f..5d7d59a647 100644
--- a/packages/server/src/integrations/tests/microsoftSqlServer.spec.js
+++ b/packages/server/src/integrations/tests/microsoftSqlServer.spec.js
@@ -32,7 +32,8 @@ describe("MS SQL Server Integration", () => {
   })
 
   describe("no rows returned", () => {
-    beforeEach(() => {
+    beforeEach(async () => {
+      await config.integration.connect()
       config.integration.client.query.mockImplementation(() => ({ rows: [] }))
     })