Merge pull request #1540 from Budibase/fix/0.9.1-bugfixes

Fix/0.9.1 bugfixes

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",

packages/bbui/src/Table/AttachmentRenderer.svelte

@@ -1,4 +1,7 @@
 <script>
+  import Tooltip from "../Tooltip/Tooltip.svelte"
+  import Link from "../Link/Link.svelte"
+
   export let value
 
   const displayLimit = 5
@@ -13,9 +16,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}

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>

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"

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"

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 &&
+    $tables.selected?._id === TableNames.USERS &&
-      UNEDITABLE_USER_FIELDS.includes(field.name)) ||
+    UNEDITABLE_USER_FIELDS.includes(field.name)
-    (originalName && field.type === LINK_TYPE)
   $: 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}

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

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

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]

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) {

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,

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: [] }))
     })