Merge branch 'master' of github.com:Budibase/budibase into budi-day/cli

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.7.8",
+  "version": "0.8.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.7.8",
+  "version": "0.8.2",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -64,9 +64,9 @@
   },
   "dependencies": {
     "@budibase/bbui": "^1.58.13",
-    "@budibase/client": "^0.7.8",
+    "@budibase/client": "^0.8.2",
     "@budibase/colorpicker": "1.0.1",
-    "@budibase/string-templates": "^0.7.8",
+    "@budibase/string-templates": "^0.8.2",
     "@budibase/svelte-ag-grid": "^1.0.4",
     "@sentry/browser": "5.19.1",
     "@svelteschool/svelte-forms": "0.7.0",

packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte

@@ -143,10 +143,18 @@
     margin-top: 0;
   }
   .bindings__wrapper {
-    overflow-y: auto;
+    overflow-y: scroll;
+    overflow-x: hidden;
     position: relative;
     flex: 1 1 auto;
+    -ms-overflow-style: none;
   }
+
+  .bindings__wrapper::-webkit-scrollbar {
+    width: 0;
+    height: 0;
+  }
+
   .bindings__list {
     position: absolute;
     width: 100%;

packages/builder/src/components/backend/DataTable/cells/RelationshipCell.svelte

@@ -11,7 +11,7 @@
   class:link={!!items.length}
   on:click={() => selectRelationship(row, columnName)}>
   {#each items as item}
-    <div class="item">{item}</div>
+    <div class="item">{item?.primaryDisplay ?? ''}</div>
   {/each}
 </div>
 

packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte

@@ -28,7 +28,11 @@
         .flat()
       // Prevent modal closing if there were errors
       return false
+    } else if (rowResponse.status === 400 || rowResponse.status === 500) {
+      errors = [{ message: rowResponse.message }]
+      return false
     }
+
     notifier.success("Row saved successfully.")
     backendUiStore.actions.rows.save(rowResponse)
   }

packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte

@@ -40,9 +40,6 @@
     if (!row.email) {
       errors = [...errors, { message: "Email is required" }]
     }
-    if (!row.password) {
-      errors = [...errors, { message: "Password is required" }]
-    }
     if (!row.roleId) {
       errors = [...errors, { message: "Role is required" }]
     }
@@ -63,7 +60,7 @@
           .flat()
       }
       return false
-    } else if (rowResponse.status === 400 && rowResponse.message) {
+    } else if (rowResponse.status === 400 || rowResponse.status === 500) {
       errors = [{ message: rowResponse.message }]
       return false
     }

packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte

@@ -10,10 +10,12 @@
 
 <form>
   {#each Object.keys(schema) as configKey}
-    {#if typeof schema[configKey].type === 'object'}
+    {#if schema[configKey].type === 'object'}
       <Label small>{configKey}</Label>
       <Spacer small />
-      <KeyValueBuilder bind:object={integration[configKey]} on:change />
+      <KeyValueBuilder
+        defaults={schema[configKey].default}
+        bind:object={integration[configKey]} />
     {:else}
       <div class="form-row">
         <Label small>{configKey}</Label>

packages/builder/src/components/common/BindableInput.svelte

@@ -24,7 +24,7 @@
 <div class="container" bind:this={anchor}>
   <Input {...inputProps} bind:value />
   <div class="icon" on:click={popover.show}>
-    <Icon name="edit" />
+    <Icon name="lightning" />
   </div>
 </div>
 <GenericBindingPopover
@@ -54,6 +54,7 @@
     border-bottom-right-radius: var(--border-radius-m);
     color: var(--grey-7);
     font-size: 16px;
+    margin-top: 20px;
   }
   .icon:hover {
     color: var(--ink);

packages/builder/src/components/common/LinkedRowSelector.svelte

@@ -1,5 +1,4 @@
 <script>
-  import { onMount } from "svelte"
   import { backendUiStore } from "builderStore"
   import api from "builderStore/api"
   import { Select, Label, Multiselect } from "@budibase/bbui"
@@ -9,7 +8,9 @@
   export let linkedRows = []
 
   let rows = []
+  let linkedIds = (linkedRows || [])?.map(row => row?._id || row)
 
+  $: linkedRows = linkedIds
   $: label = capitalise(schema.name)
   $: linkedTableId = schema.tableId
   $: linkedTable = $backendUiStore.tables.find(
@@ -45,12 +46,12 @@
     <Select
       thin
       secondary
-      on:change={e => (linkedRows = [e.target.value])}
+      on:change={e => (linkedIds = e.target.value ? [e.target.value] : [])}
       name={label}
       {label}>
       <option value="">Choose an option</option>
       {#each rows as row}
-        <option selected={row._id === linkedRows[0]} value={row._id}>
+        <option selected={row._id === linkedIds[0]} value={row._id}>
           {getPrettyName(row)}
         </option>
       {/each}
@@ -58,7 +59,7 @@
   {:else}
     <Multiselect
       secondary
-      bind:value={linkedRows}
+      bind:value={linkedIds}
       {label}
       placeholder="Choose some options">
       {#each rows as row}

packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte

@@ -40,13 +40,14 @@
   function addToText(readableBinding) {
     const position = getCaretPosition()
     const toAdd = `{{ ${readableBinding} }}`
+
     if (position.start) {
       value =
         value.substring(0, position.start) +
         toAdd +
         value.substring(position.end, value.length)
     } else {
-      value += toAdd
+      value = toAdd
     }
   }
 
@@ -110,7 +111,8 @@
         bind:getCaretPosition
         thin
         bind:value
-        placeholder="Add text, or click the objects on the left to add them to the textbox." />
+        placeholder="Add text, or click the objects on the left to add them to
+        the textbox." />
       {#if !valid}
         <p class="syntax-error">
           Current Handlebars syntax is invalid, please check the guide

packages/builder/src/components/design/PropertiesPanel/PropertyControls/DatasourceSelect.svelte

@@ -37,8 +37,10 @@
     return [...acc, ...viewsArr]
   }, [])
   $: queries = $backendUiStore.queries
-  .filter(query => showAllQueries || (query.queryVerb === "read" || query.readable))
+    .filter(
-  .map(query => ({
+      query => showAllQueries || query.queryVerb === "read" || query.readable
+    )
+    .map(query => ({
       label: query.name,
       name: query.name,
       tableId: query._id,

packages/builder/src/components/integration/KeyValueBuilder.svelte

@@ -1,7 +1,8 @@
 <script>
   import { Button, Input } from "@budibase/bbui"
 
-  export let object = {}
+  export let defaults
+  export let object = defaults || {}
   export let readOnly
 
   let fields = Object.entries(object).map(([name, value]) => ({ name, value }))

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.7.8",
+  "version": "0.8.2",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.js",
@@ -9,14 +9,14 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/string-templates": "^0.7.8",
+    "@budibase/string-templates": "^0.8.2",
     "deep-equal": "^2.0.1",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.7.8",
+    "@budibase/standard-components": "^0.8.2",
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-node-resolve": "^10.0.0",
     "fs-extra": "^8.1.0",

packages/client/src/api/rows.js

@@ -120,7 +120,11 @@ export const enrichRows = async (rows, tableId) => {
           const type = schema[key].type
           if (type === "link") {
             // Enrich row a string join of relationship fields
-            row[`${key}_text`] = row[key]?.join(", ") || ""
+            row[`${key}_text`] =
+              row[key]
+                ?.map(option => option?.primaryDisplay)
+                .filter(option => !!option)
+                .join(", ") || ""
           } else if (type === "attachment") {
             // Enrich row with the first image URL for any attachment fields
             let url = null

packages/server/Dockerfile

@@ -3,6 +3,7 @@ FROM node:12-alpine
 WORKDIR /app
 
 ENV CLOUD=1
+ENV PORT=4001
 ENV COUCH_DB_URL=https://couchdb.budi.live:5984
 ENV BUDIBASE_ENVIRONMENT=PRODUCTION
 

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.7.8",
+  "version": "0.8.2",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -50,8 +50,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.7.8",
+    "@budibase/client": "^0.8.2",
-    "@budibase/string-templates": "^0.7.8",
+    "@budibase/string-templates": "^0.8.2",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",

packages/server/src/api/controllers/row.js

@@ -7,6 +7,7 @@ const {
   DocumentTypes,
   SEPARATOR,
   ViewNames,
+  generateUserID,
 } = require("../../db/utils")
 const usersController = require("./user")
 const {
@@ -15,6 +16,7 @@ const {
 } = require("../../utilities/rowProcessor")
 const { FieldTypes } = require("../../constants")
 const { isEqual } = require("lodash")
+const { cloneDeep } = require("lodash/fp")
 
 const TABLE_VIEW_BEGINS_WITH = `all${SEPARATOR}${DocumentTypes.TABLE}${SEPARATOR}`
 
@@ -139,7 +141,11 @@ exports.save = async function(ctx) {
   }
 
   if (!inputs._rev && !inputs._id) {
-    inputs._id = generateRowID(inputs.tableId)
+    if (inputs.tableId === ViewNames.USERS) {
+      inputs._id = generateUserID(inputs.email)
+    } else {
+      inputs._id = generateRowID(inputs.tableId)
+    }
   }
 
   // this returns the table and row incase they have been updated
@@ -351,10 +357,15 @@ async function validate({ appId, tableId, row, table }) {
   }
   const errors = {}
   for (let fieldName of Object.keys(table.schema)) {
-    const res = validateJs.single(
+    const constraints = cloneDeep(table.schema[fieldName].constraints)
-      row[fieldName],
+    // special case for options, need to always allow unselected (null)
-      table.schema[fieldName].constraints
+    if (
-    )
+      table.schema[fieldName].type === FieldTypes.OPTIONS &&
+      constraints.inclusion
+    ) {
+      constraints.inclusion.push(null)
+    }
+    const res = validateJs.single(row[fieldName], constraints)
     if (res) errors[fieldName] = res
   }
   return { valid: Object.keys(errors).length === 0, errors }

packages/server/src/api/controllers/table/index.js

@@ -89,16 +89,20 @@ exports.save = async function(ctx) {
   }
 
   // update linked rows
-  const linkResp = await linkRows.updateLinks({
+  try {
-    appId,
+    const linkResp = await linkRows.updateLinks({
-    eventType: oldTable
+      appId,
-      ? linkRows.EventType.TABLE_UPDATED
+      eventType: oldTable
-      : linkRows.EventType.TABLE_SAVE,
+        ? linkRows.EventType.TABLE_UPDATED
-    table: tableToSave,
+        : linkRows.EventType.TABLE_SAVE,
-    oldTable: oldTable,
+      table: tableToSave,
-  })
+      oldTable: oldTable,
-  if (linkResp != null && linkResp._rev) {
+    })
-    tableToSave._rev = linkResp._rev
+    if (linkResp != null && linkResp._rev) {
+      tableToSave._rev = linkResp._rev
+    }
+  } catch (err) {
+    ctx.throw(400, err)
   }
 
   // don't perform any updates until relationships have been

packages/server/src/api/routes/tests/row.spec.js

@@ -282,12 +282,13 @@ describe("/rows", () => {
       const secondRow = (await createRow({
         name: "Test 2",
         description: "og desc",
-        link: [firstRow._id],
+        link: [{_id: firstRow._id}],
         tableId: table._id,
       })).body
       const enriched = await outputProcessing(appId, table, [secondRow])
       expect(enriched[0].link.length).toBe(1)
-      expect(enriched[0].link[0]).toBe("Test Contact")
+      expect(enriched[0].link[0]._id).toBe(firstRow._id)
+      expect(enriched[0].link[0].primaryDisplay).toBe("Test Contact")
     })
   })
 

packages/server/src/constants/index.js

@@ -12,6 +12,11 @@ exports.FieldTypes = {
   AUTO: "auto",
 }
 
+exports.RelationshipTypes = {
+  ONE_TO_MANY: "one-to-many",
+  MANY_TO_MANY: "many-to-many",
+}
+
 exports.AuthTypes = {
   APP: "app",
   BUILDER: "builder",

packages/server/src/constants/layouts.js

@@ -185,8 +185,7 @@ const BASE_LAYOUTS = [
           "margin-right": "auto",
           "margin-left": "auto",
           "min-height": "100%",
-          "background-image":
+          background: "#f5f5f5",
-            "linear-gradient(135deg, rgba(252,215,212,1) 20%, rgba(207,218,255,1) 100%);",
         },
         selected: {},
       },
@@ -240,8 +239,7 @@ const BASE_LAYOUTS = [
           "margin-right": "auto",
           "margin-left": "auto",
           "min-height": "100%",
-          "background-image":
+          background: "#f5f5f5",
-            "linear-gradient(135deg, rgba(252,215,212,1) 20%, rgba(207,218,255,1) 100%);",
         },
         selected: {},
       },

packages/server/src/constants/screens.js

@@ -39,55 +39,6 @@ exports.createHomeScreen = () => ({
         _instanceName: "Heading",
         _children: [],
       },
-      {
-        _id: "cbbf41b27c2b44d1abba38bb694880c6a",
-        _component: "@budibase/standard-components/container",
-        _styles: {
-          normal: {
-            display: "flex",
-            "flex-direction": "column",
-            "justify-content": "center",
-            "align-items": "stretch",
-            flex: "1 1 auto",
-            "border-width": "4px",
-            "border-style": "Dashed",
-            "margin-bottom": "32px",
-          },
-          hover: {},
-          active: {},
-          selected: {},
-        },
-        type: "div",
-        _instanceName: "Video Container",
-        _children: [
-          {
-            _id: "c07d752cb3e544b418088fa9be84ba2e4",
-            _component: "@budibase/standard-components/embed",
-            _styles: {
-              normal: {
-                width: "100%",
-                flex: "1 1 auto",
-                opacity: "0",
-                "transition-property": "Opacity",
-                "transition-duration": "1s",
-                "transition-timing-function:": "ease-in",
-              },
-              hover: {
-                "transition-property": "Opacity",
-                "transition-duration": "1s",
-                "transition-timing-function:": "ease-out",
-                opacity: "1",
-              },
-              active: {},
-              selected: {},
-            },
-            embed:
-              '<iframe width="560" height="315" src="https://www.youtube.com/embed/dQw4w9WgXcQ" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>',
-            _instanceName: "Rick Astley Video",
-            _children: [],
-          },
-        ],
-      },
     ],
     _instanceName: "Home",
   },

packages/server/src/db/linkedRows/LinkController.js

@@ -2,7 +2,7 @@ const CouchDB = require("../index")
 const { IncludeDocs, getLinkDocuments } = require("./linkUtils")
 const { generateLinkID } = require("../utils")
 const Sentry = require("@sentry/node")
-const { FieldTypes } = require("../../constants")
+const { FieldTypes, RelationshipTypes } = require("../../constants")
 
 /**
  * Creates a new link document structure which can be put to the database. It is important to
@@ -113,6 +113,38 @@ class LinkController {
     })
   }
 
+  /**
+   * Makes sure the passed in table schema contains valid relationship structures.
+   */
+  validateTable(table) {
+    const usedAlready = []
+    for (let schema of Object.values(table.schema)) {
+      if (schema.type !== FieldTypes.LINK) {
+        continue
+      }
+      const unique = schema.tableId + schema.fieldName
+      if (usedAlready.indexOf(unique) !== -1) {
+        throw new Error(
+          "Cannot re-use the linked column name for a linked table."
+        )
+      }
+      usedAlready.push(unique)
+    }
+  }
+
+  /**
+   * Returns whether the two schemas are equal (in the important parts, not a pure equality check)
+   */
+  areSchemasEqual(schema1, schema2) {
+    const compareFields = ["name", "type", "tableId", "fieldName", "autocolumn"]
+    for (let field of compareFields) {
+      if (schema1[field] !== schema2[field]) {
+        return false
+      }
+    }
+    return true
+  }
+
   // all operations here will assume that the table
   // this operation is related to has linked rows
   /**
@@ -143,8 +175,32 @@ class LinkController {
             ? linkDoc.doc2.rowId
             : linkDoc.doc1.rowId
         })
+
+        // if 1:N, ensure that this ID is not already attached to another record
+        const linkedTable = await this._db.get(field.tableId)
+        const linkedSchema = linkedTable.schema[field.fieldName]
+
         // iterate through the link IDs in the row field, see if any don't exist already
         for (let linkId of rowField) {
+          if (linkedSchema.relationshipType === RelationshipTypes.ONE_TO_MANY) {
+            const links = (
+              await getLinkDocuments({
+                appId: this._appId,
+                tableId: field.tableId,
+                rowId: linkId,
+                includeDocs: IncludeDocs.EXCLUDE,
+              })
+            ).filter(link => link.id !== row._id)
+
+            // The 1 side of 1:N is already related to something else
+            // You must remove the existing relationship
+            if (links.length > 0) {
+              throw new Error(
+                `1:N Relationship Error: Record already linked to another.`
+              )
+            }
+          }
+
           if (linkId && linkId !== "" && linkDocIds.indexOf(linkId) === -1) {
             // first check the doc we're linking to exists
             try {
@@ -246,6 +302,8 @@ class LinkController {
    */
   async tableSaved() {
     const table = await this.table()
+    // validate the table first
+    this.validateTable(table)
     const schema = table.schema
     for (let fieldName of Object.keys(schema)) {
       const field = schema[fieldName]
@@ -266,9 +324,25 @@ class LinkController {
           tableId: table._id,
           fieldName: fieldName,
         }
+
         if (field.autocolumn) {
           linkConfig.autocolumn = field.autocolumn
         }
+
+        if (field.relationshipType) {
+          // Ensure that the other side of the relationship is locked to one record
+          linkConfig.relationshipType = field.relationshipType
+          delete field.relationshipType
+        }
+
+        // check the linked table to make sure we aren't overwriting an existing column
+        const existingSchema = linkedTable.schema[field.fieldName]
+        if (
+          existingSchema != null &&
+          !this.areSchemasEqual(existingSchema, linkConfig)
+        ) {
+          throw new Error("Cannot overwrite existing column.")
+        }
         // create the link field in the other table
         linkedTable.schema[field.fieldName] = linkConfig
         const response = await this._db.put(linkedTable)

packages/server/src/db/linkedRows/index.js

@@ -175,11 +175,12 @@ exports.attachLinkedPrimaryDisplay = async (appId, table, rows) => {
       if (!linkedRow || !linkedTable) {
         continue
       }
-      // need to handle an edge case where relationship just wasn't found
+      const obj = { _id: linkedRow._id }
-      const value = linkedRow[linkedTable.primaryDisplay] || linkedRow._id
+      // if we know the display column, add it
-      if (value) {
+      if (linkedRow[linkedTable.primaryDisplay] != null) {
-        row[link.fieldName].push(value)
+        obj.primaryDisplay = linkedRow[linkedTable.primaryDisplay]
       }
+      row[link.fieldName].push(obj)
     }
   }
   return rows

packages/server/src/integrations/mysql.js

@@ -14,7 +14,7 @@ const SCHEMA = {
     },
     port: {
       type: FIELD_TYPES.NUMBER,
-      default: 1433,
+      default: 3306,
       required: false,
     },
     user: {
@@ -31,6 +31,10 @@ const SCHEMA = {
       type: FIELD_TYPES.STRING,
       required: true,
     },
+    ssl: {
+      type: FIELD_TYPES.OBJECT,
+      required: false,
+    },
   },
   query: {
     create: {
@@ -51,6 +55,9 @@ const SCHEMA = {
 class MySQLIntegration {
   constructor(config) {
     this.config = config
+    if (Object.keys(config.ssl).length === 0) {
+      delete config.ssl
+    }
     this.client = mysql.createConnection(config)
   }
 

packages/server/src/utilities/rowProcessor.js

@@ -15,6 +15,9 @@ const TYPE_TRANSFORM_MAP = {
     [null]: [],
     [undefined]: undefined,
     parse: link => {
+      if (Array.isArray(link) && typeof link[0] === "object") {
+        return link.map(el => (el && el._id ? el._id : el))
+      }
       if (typeof link === "string") {
         return [link]
       }
@@ -22,8 +25,8 @@ const TYPE_TRANSFORM_MAP = {
     },
   },
   [FieldTypes.OPTIONS]: {
-    "": "",
+    "": null,
-    [null]: "",
+    [null]: null,
     [undefined]: undefined,
   },
   [FieldTypes.STRING]: {
@@ -136,6 +139,8 @@ exports.coerce = (row, type) => {
  */
 exports.inputProcessing = (user, table, row) => {
   let clonedRow = cloneDeep(row)
+  // need to copy the table so it can be differenced on way out
+  const copiedTable = cloneDeep(table)
   for (let [key, value] of Object.entries(clonedRow)) {
     const field = table.schema[key]
     if (!field) {
@@ -144,7 +149,7 @@ exports.inputProcessing = (user, table, row) => {
     clonedRow[key] = exports.coerce(value, field.type)
   }
   // handle auto columns - this returns an object like {table, row}
-  return processAutoColumn(user, table, clonedRow)
+  return processAutoColumn(user, copiedTable, clonedRow)
 }
 
 /**

packages/standard-components/package.json

@@ -35,7 +35,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.7.8",
+  "version": "0.8.2",
   "license": "MIT",
   "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd",
   "dependencies": {

packages/standard-components/src/forms/RelationshipField.svelte

@@ -22,8 +22,8 @@
   const setFieldText = value => {
     if (fieldSchema?.relationshipType === "one-to-many") {
       if (value?.length && options?.length) {
-        const row = options.find(row => row._id === value[0])
+        const row = options.find(row => row._id === value[0]?._id)
-        return row.name
+        return getDisplayName(row)
       } else {
         return placeholder || "Choose an option"
       }
@@ -60,27 +60,30 @@
   }
 
   const getDisplayName = row => {
-    return row[tableDefinition?.primaryDisplay || "_id"]
+    return row?.[tableDefinition?.primaryDisplay || "_id"] || "-"
   }
 
   const getValueLookupMap = value => {
     let map = {}
     if (value?.length) {
       value.forEach(option => {
-        map[option] = true
+        if (option?._id) {
+          map[option._id] = true
+        }
       })
     }
     return map
   }
 
-  const toggleOption = option => {
+  const toggleOption = id => {
-    if (fieldSchema.type === "one-to-many") {
+    if (fieldSchema.relationshipType === "one-to-many") {
-      fieldApi.setValue([option])
+      fieldApi.setValue(id ? [{ _id: id }] : [])
     } else {
-      if ($fieldState.value.includes(option)) {
+      if ($fieldState.value.find(option => option?._id === id)) {
-        fieldApi.setValue($fieldState.value.filter(x => x !== option))
+        const filtered = $fieldState.value.filter(option => option?._id !== id)
+        fieldApi.setValue(filtered)
       } else {
-        fieldApi.setValue([...$fieldState.value, option])
+        fieldApi.setValue([...$fieldState.value, { _id: id }])
       }
     }
   }

packages/standard-components/src/grid/Relationship/RelationshipLabel.svelte

@@ -7,7 +7,7 @@
 
 <div class="container">
   {#each items as item}
-    <div class="item">{item}</div>
+    <div class="item">{item?.primaryDisplay ?? ''}</div>
   {/each}
 </div>
 

packages/standard-components/src/grid/customRenderer.js

@@ -5,7 +5,7 @@ import AttachmentCell from "./AttachmentCell/Button.svelte"
 import ViewDetails from "./ViewDetails/Cell.svelte"
 import Select from "./Select/Wrapper.svelte"
 import DatePicker from "./DateTime/Wrapper.svelte"
-import RelationshipCount from "./Relationship/RelationshipCount.svelte"
+import RelationshipLabel from "./Relationship/RelationshipLabel.svelte"
 
 const renderers = new Map([
   ["boolean", booleanRenderer],
@@ -127,7 +127,7 @@ function linkedRowRenderer(options, constraints, editable, SDK) {
     container.style.placeItems = "center"
     container.style.height = "100%"
 
-    new RelationshipCount({
+    new RelationshipLabel({
       target: container,
       props: {
         row: params.data,

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.7.8",
+  "version": "0.8.2",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.js",
   "module": "src/index.js",

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/deployment",
   "email": "hi@budibase.com",
-  "version": "0.7.8",
+  "version": "0.8.2",
   "description": "Budibase Deployment Server",
   "main": "src/index.js",
   "repository": {