From 41b1920b272de455197a2b74ece0308d67e72f83 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Fri, 12 Feb 2021 11:17:13 +0000
Subject: [PATCH] Avoid relationship picker making rows calls for empty string
 ID

---
 .../src/LinkedRowSelector.svelte              | 59 -------------------
 .../src/forms/RelationshipField.svelte        |  4 +-
 2 files changed, 2 insertions(+), 61 deletions(-)
 delete mode 100644 packages/standard-components/src/LinkedRowSelector.svelte

diff --git a/packages/standard-components/src/LinkedRowSelector.svelte b/packages/standard-components/src/LinkedRowSelector.svelte
deleted file mode 100644
index a2956d6b93..0000000000
--- a/packages/standard-components/src/LinkedRowSelector.svelte
+++ /dev/null
@@ -1,59 +0,0 @@
-<script>
-  import { Label, Multiselect } from "@budibase/bbui"
-  import { capitalise } from "./helpers"
-  import { getContext } from "svelte"
-
-  const { API } = getContext("sdk")
-
-  export let schema = {}
-  export let linkedRows = []
-  export let showLabel = true
-  export let secondary
-
-  let linkedTable
-  let allRows = []
-
-  $: label = capitalise(schema.name)
-  $: linkedTableId = schema.tableId
-  $: fetchRows(linkedTableId)
-  $: fetchTable(linkedTableId)
-
-  async function fetchTable(id) {
-    if (id != null) {
-      linkedTable = await API.fetchTableDefinition(id)
-    }
-  }
-
-  async function fetchRows(id) {
-    if (id != null) {
-      allRows = await API.fetchTableData(id)
-    }
-  }
-
-  function getPrettyName(row) {
-    return row[(linkedTable && linkedTable.primaryDisplay) || "_id"]
-  }
-</script>
-
-{#if linkedTable != null}
-  {#if linkedTable.primaryDisplay == null}
-    {#if showLabel}
-      <Label extraSmall grey>{label}</Label>
-    {/if}
-    <Label small black>
-      Please choose a display column for the
-      <b>{linkedTable.name}</b>
-      table.
-    </Label>
-  {:else}
-    <Multiselect
-      {secondary}
-      bind:value={linkedRows}
-      label={showLabel ? label : null}
-      placeholder="Choose some options">
-      {#each allRows as row}
-        <option value={row._id}>{getPrettyName(row)}</option>
-      {/each}
-    </Multiselect>
-  {/if}
-{/if}
diff --git a/packages/standard-components/src/forms/RelationshipField.svelte b/packages/standard-components/src/forms/RelationshipField.svelte
index f09595606f..8109283f6e 100644
--- a/packages/standard-components/src/forms/RelationshipField.svelte
+++ b/packages/standard-components/src/forms/RelationshipField.svelte
@@ -24,7 +24,7 @@
   $: fetchTable(linkedTableId)
 
   const fetchTable = async id => {
-    if (id != null) {
+    if (id) {
       const result = await API.fetchTableDefinition(id)
       if (!result.error) {
         tableDefinition = result
@@ -33,7 +33,7 @@
   }
 
   const fetchRows = async id => {
-    if (id != null) {
+    if (id) {
       const rows = await API.fetchTableData(id)
       options = rows && !rows.error ? rows : []
     }