From 7d9bed3a3fbe138cab723579ec67f53cef9170ef Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 8 Mar 2022 13:31:14 +0000
Subject: [PATCH] account for blocks within export button action

---
 .../actions/ExportData.svelte                 | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ExportData.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ExportData.svelte
index 5a10e1eca8..062b9abd4c 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ExportData.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ExportData.svelte
@@ -5,9 +5,23 @@
   import { onMount } from "svelte"
 
   export let parameters
-  $: components = findAllMatchingComponents($currentAsset?.props, component =>
+
+  $: tables = findAllMatchingComponents($currentAsset?.props, component =>
     component._component.endsWith("table")
-  )
+  ).map(table => ({
+    label: table._instanceName,
+    value: table._id,
+  }))
+
+  $: tableBlocks = findAllMatchingComponents($currentAsset?.props, component =>
+    component._component.endsWith("tableblock")
+  ).map(block => ({
+    label: block._instanceName,
+    value: `${block._id}-table`,
+  }))
+
+  $: componentOptions = tables.concat(tableBlocks)
+
   const FORMATS = [
     {
       label: "CSV",
@@ -38,9 +52,7 @@
     <Label small>Table</Label>
     <Select
       bind:value={parameters.tableComponentId}
-      options={components}
-      getOptionLabel={option => option._instanceName}
-      getOptionValue={option => option._id}
+      options={componentOptions}
     />
 
     <Label small>Export as</Label>