From e7ac33bf435777e02b2807ef365f9d6e68f57943 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 5 Feb 2024 11:59:54 +0000
Subject: [PATCH] Remove legacy concept of currentAsset

---
 .../actions/ChangeFormStep.svelte                |  6 +++---
 .../ButtonActionEditor/actions/ClearForm.svelte  |  4 ++--
 .../actions/DuplicateRow.svelte                  |  9 +++++++--
 .../ButtonActionEditor/actions/ExportData.svelte | 15 ++++++++-------
 .../actions/RefreshDataProvider.svelte           |  4 ++--
 .../ButtonActionEditor/actions/S3Upload.svelte   |  4 ++--
 .../ButtonActionEditor/actions/SaveRow.svelte    |  9 +++++++--
 .../ButtonActionEditor/actions/ScrollTo.svelte   |  6 +++---
 .../actions/UpdateFieldValue.svelte              |  6 +++---
 .../actions/ValidateForm.svelte                  |  6 +++---
 .../controls/ColumnEditor/ColumnEditor.svelte    |  6 +++---
 .../settings/controls/DataProviderSelect.svelte  |  4 ++--
 .../DataSourceSelect/DataSourceSelect.svelte     |  4 ++--
 .../FieldConfiguration/FieldConfiguration.svelte |  6 +++---
 .../design/settings/controls/FieldSelect.svelte  |  6 +++---
 .../controls/FilterEditor/FilterEditor.svelte    |  6 +++---
 .../settings/controls/FormFieldSelect.svelte     |  4 ++--
 .../controls/FormStepConfiguration.svelte        |  4 ++--
 .../GridColumnConfiguration.svelte               |  8 ++++----
 .../settings/controls/MultiFieldSelect.svelte    |  6 +++---
 .../controls/RelationshipFilterEditor.svelte     | 16 ++++++++--------
 .../settings/controls/ResetFieldsButton.svelte   |  4 ++--
 .../settings/controls/SearchFieldSelect.svelte   |  6 +++---
 .../settings/controls/SortableFieldSelect.svelte |  6 +++---
 .../ValidationEditor/ValidationDrawer.svelte     |  9 +++++----
 packages/builder/src/dataBinding.js              |  8 +++-----
 .../[screenId]/_components/AppPreview.svelte     |  5 ++---
 packages/builder/src/stores/builder/index.js     |  8 +-------
 packages/builder/src/stores/builder/screens.js   |  2 --
 packages/builder/vite.config.js                  |  4 ++++
 30 files changed, 98 insertions(+), 93 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte
index 647ee1f9dd..6e7c5874fc 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { currentAsset, componentStore } from "stores/builder"
-  import { getActionProviders } from "../../../../../../dataBinding"
+  import { selectedScreen, componentStore } from "stores/builder"
+  import { getActionProviders } from "dataBinding"
   import { onMount } from "svelte"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
 
@@ -10,7 +10,7 @@
   export let nested
 
   $: actionProviders = getActionProviders(
-    $currentAsset,
+    $selectedScreen,
     $componentStore.selectedComponentId,
     "ChangeFormStep",
     { includeSelf: nested }
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte
index 5838f4d53c..989a8c356f 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte
@@ -1,13 +1,13 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { currentAsset, componentStore } from "stores/builder"
+  import { selectedScreen, componentStore } from "stores/builder"
   import { getActionProviders } from "../../../../../../dataBinding"
 
   export let parameters
   export let nested
 
   $: actionProviders = getActionProviders(
-    $currentAsset,
+    $selectedScreen,
     $componentStore.selectedComponentId,
     "ClearForm",
     { includeSelf: nested }
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
index c6d0cd93c3..65fb16ac3c 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
@@ -1,6 +1,11 @@
 <script>
   import { Select, Label, Body, Checkbox, Input } from "@budibase/bbui"
-  import { currentAsset, componentStore, tables, viewsV2 } from "stores/builder"
+  import {
+    selectedScreen,
+    componentStore,
+    tables,
+    viewsV2,
+  } from "stores/builder"
   import { getSchemaForDatasourcePlus } from "../../../../../../dataBinding"
   import SaveFields from "./SaveFields.svelte"
   import { getDatasourceLikeProviders } from "components/design/settings/controls/ButtonActionEditor/actions/utils"
@@ -10,7 +15,7 @@
   export let nested
 
   $: providerOptions = getDatasourceLikeProviders({
-    asset: $currentAsset,
+    asset: $selectedScreen,
     componentId: $componentStore.selectedComponentId,
     nested,
   })
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte
index f5985a0d29..229cc1e928 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Label, Select, Body, Multiselect } from "@budibase/bbui"
   import { findAllMatchingComponents, findComponent } from "helpers/components"
-  import { currentAsset } from "stores/builder"
+  import { selectedScreen } from "stores/builder"
   import { onMount } from "svelte"
   import {
     getDatasourceForProvider,
@@ -21,14 +21,15 @@
     },
   ]
 
-  $: tables = findAllMatchingComponents($currentAsset?.props, component =>
+  $: tables = findAllMatchingComponents($selectedScreen?.props, component =>
     component._component.endsWith("table")
   ).map(table => ({
     label: table._instanceName,
     value: table._id,
   }))
-  $: tableBlocks = findAllMatchingComponents($currentAsset?.props, component =>
-    component._component.endsWith("tableblock")
+  $: tableBlocks = findAllMatchingComponents(
+    $selectedScreen?.props,
+    component => component._component.endsWith("tableblock")
   ).map(block => ({
     label: block._instanceName,
     value: `${block._id}-table`,
@@ -41,9 +42,9 @@
     if (tableId?.includes("-")) {
       tableId = tableId.split("-")[0]
     }
-    const selectedTable = findComponent($currentAsset?.props, tableId)
-    const datasource = getDatasourceForProvider($currentAsset, selectedTable)
-    const { schema } = getSchemaForDatasource($currentAsset, datasource)
+    const selectedTable = findComponent($selectedScreen?.props, tableId)
+    const datasource = getDatasourceForProvider($selectedScreen, selectedTable)
+    const { schema } = getSchemaForDatasource($selectedScreen, datasource)
     return Object.keys(schema || {})
   }
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte
index 848324ad4a..3838f17c4d 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte
@@ -1,13 +1,13 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { currentAsset, componentStore } from "stores/builder"
+  import { selectedScreen, componentStore } from "stores/builder"
   import { getActionProviders } from "../../../../../../dataBinding"
 
   export let parameters
   export let nested
 
   $: actionProviders = getActionProviders(
-    $currentAsset,
+    $selectedScreen,
     $componentStore.selectedComponentId,
     "RefreshDatasource",
     { includeSelf: nested }
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte
index 4a406b8dca..11bd58a860 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte
@@ -1,11 +1,11 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { currentAsset } from "stores/builder"
+  import { selectedScreen } from "stores/builder"
   import { findAllMatchingComponents } from "helpers/components"
 
   export let parameters
 
-  $: components = findAllMatchingComponents($currentAsset?.props, component =>
+  $: components = findAllMatchingComponents($selectedScreen?.props, component =>
     component._component.endsWith("s3upload")
   )
 </script>
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
index 7a09e11b52..7513072034 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
@@ -1,6 +1,11 @@
 <script>
   import { Select, Label, Body, Checkbox, Input } from "@budibase/bbui"
-  import { currentAsset, componentStore, tables, viewsV2 } from "stores/builder"
+  import {
+    selectedScreen,
+    componentStore,
+    tables,
+    viewsV2,
+  } from "stores/builder"
   import { getSchemaForDatasourcePlus } from "../../../../../../dataBinding"
   import SaveFields from "./SaveFields.svelte"
   import { getDatasourceLikeProviders } from "components/design/settings/controls/ButtonActionEditor/actions/utils"
@@ -10,7 +15,7 @@
   export let nested
 
   $: providerOptions = getDatasourceLikeProviders({
-    asset: $currentAsset,
+    asset: $selectedScreen,
     componentId: $componentStore.selectedComponentId,
     nested,
   })
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte
index dfd6c6f0b9..6b14086758 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { currentAsset, componentStore } from "stores/builder"
+  import { selectedScreen, componentStore } from "stores/builder"
   import { Label, Combobox, Select } from "@budibase/bbui"
   import {
     getActionProviders,
@@ -11,13 +11,13 @@
   export let nested
 
   $: formComponent = getFormComponent(
-    $currentAsset.props,
+    $selectedScreen.props,
     parameters.componentId
   )
   $: formSchema = buildFormSchema(formComponent)
   $: fieldOptions = Object.keys(formSchema || {})
   $: actionProviders = getActionProviders(
-    $currentAsset,
+    $selectedScreen,
     $componentStore.selectedComponentId,
     "ScrollTo",
     { includeSelf: nested }
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateFieldValue.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateFieldValue.svelte
index 8c30189fcd..fcb4d59176 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateFieldValue.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateFieldValue.svelte
@@ -2,7 +2,7 @@
   import { Select, Label, Combobox } from "@budibase/bbui"
   import { onMount } from "svelte"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import { currentAsset, componentStore } from "stores/builder"
+  import { selectedScreen, componentStore } from "stores/builder"
   import {
     getActionProviders,
     buildFormSchema,
@@ -25,13 +25,13 @@
   ]
 
   $: formComponent = getFormComponent(
-    $currentAsset.props,
+    $selectedScreen.props,
     parameters.componentId
   )
   $: formSchema = buildFormSchema(formComponent)
   $: fieldOptions = Object.keys(formSchema || {})
   $: actionProviders = getActionProviders(
-    $currentAsset,
+    $selectedScreen,
     $componentStore.selectedComponentId,
     "ValidateForm",
     { includeSelf: nested }
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ValidateForm.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ValidateForm.svelte
index 88dacf4f96..f44b68d4c6 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ValidateForm.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ValidateForm.svelte
@@ -1,13 +1,13 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { currentAsset, componentStore } from "stores/builder"
-  import { getActionProviders } from "../../../../../../dataBinding"
+  import { selectedScreen, componentStore } from "stores/builder"
+  import { getActionProviders } from "dataBinding"
 
   export let parameters
   export let nested
 
   $: actionProviders = getActionProviders(
-    $currentAsset,
+    $selectedScreen,
     $componentStore.selectedComponentId,
     "ValidateForm",
     { includeSelf: nested }
diff --git a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
index 6cf558798f..0eb21623cd 100644
--- a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
@@ -7,7 +7,7 @@
     getDatasourceForProvider,
     getSchemaForDatasource,
   } from "../../../../../dataBinding"
-  import { currentAsset } from "stores/builder"
+  import { selectedScreen } from "stores/builder"
   import { getFields } from "helpers/searchFields"
 
   export let componentInstance
@@ -21,8 +21,8 @@
   let boundValue
 
   $: text = getText(value)
-  $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
-  $: schema = getSchema($currentAsset, datasource)
+  $: datasource = getDatasourceForProvider($selectedScreen, componentInstance)
+  $: schema = getSchema($selectedScreen, datasource)
   $: options = allowCellEditing
     ? Object.keys(schema || {})
     : enrichedSchemaFields?.map(field => field.name)
diff --git a/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte b/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
index 163ebfcd53..2e74cac0f4 100644
--- a/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
@@ -1,14 +1,14 @@
 <script>
   import { Select } from "@budibase/bbui"
   import { makePropSafe } from "@budibase/string-templates"
-  import { currentAsset } from "stores/builder"
+  import { selectedScreen } from "stores/builder"
   import { findAllMatchingComponents } from "helpers/components"
 
   export let value
 
   const getValue = component => `{{ literal ${makePropSafe(component._id)} }}`
 
-  $: providers = findAllMatchingComponents($currentAsset?.props, c =>
+  $: providers = findAllMatchingComponents($selectedScreen?.props, c =>
     c._component?.endsWith("/dataprovider")
   )
 </script>
diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
index a366feb03b..1de5ae6cc6 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
@@ -22,7 +22,7 @@
     queries as queriesStore,
     viewsV2 as viewsV2Store,
     views as viewsStore,
-    currentAsset,
+    selectedScreen,
     componentStore,
     datasources,
     integrations,
@@ -76,7 +76,7 @@
       ...query,
       type: "query",
     }))
-  $: dataProviders = findAllComponents($currentAsset.props)
+  $: dataProviders = findAllComponents($selectedScreen.props)
     .filter(component => {
       return (
         component._component?.endsWith("/dataprovider") &&
diff --git a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
index 9e55e30e46..c6b62543cb 100644
--- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
@@ -7,7 +7,7 @@
     getBindableProperties,
     getComponentBindableProperties,
   } from "../../../../../dataBinding"
-  import { selectedScreen, currentAsset, componentStore } from "stores/builder"
+  import { selectedScreen, componentStore } from "stores/builder"
   import DraggableList from "../DraggableList/DraggableList.svelte"
   import { createEventDispatcher } from "svelte"
   import FieldSetting from "./FieldSetting.svelte"
@@ -44,7 +44,7 @@
 
   $: datasource =
     componentInstance.dataSource ||
-    getDatasourceForProvider($currentAsset, componentInstance)
+    getDatasourceForProvider($selectedScreen, componentInstance)
 
   $: resourceId = datasource?.resourceId || datasource?.tableId
 
@@ -53,7 +53,7 @@
   }
 
   const updateState = value => {
-    schema = getSchema($currentAsset, datasource)
+    schema = getSchema($selectedScreen, datasource)
     options = Object.keys(schema || {})
     sanitisedValue = getValidColumns(convertOldFieldFormat(value), options)
     updateSanitsedFields(sanitisedValue)
diff --git a/packages/builder/src/components/design/settings/controls/FieldSelect.svelte b/packages/builder/src/components/design/settings/controls/FieldSelect.svelte
index e1f63af1af..4921eb74fa 100644
--- a/packages/builder/src/components/design/settings/controls/FieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldSelect.svelte
@@ -4,7 +4,7 @@
     getDatasourceForProvider,
     getSchemaForDatasource,
   } from "../../../../dataBinding"
-  import { currentAsset } from "stores/builder"
+  import { selectedScreen } from "stores/builder"
   import { createEventDispatcher } from "svelte"
 
   export let componentInstance = {}
@@ -12,8 +12,8 @@
   export let placeholder
 
   const dispatch = createEventDispatcher()
-  $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
-  $: schema = getSchemaForDatasource($currentAsset, datasource).schema
+  $: datasource = getDatasourceForProvider($selectedScreen, componentInstance)
+  $: schema = getSchemaForDatasource($selectedScreen, datasource).schema
   $: options = Object.keys(schema || {})
   $: boundValue = getValidValue(value, options)
 
diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
index cdcb488834..b8adbd5276 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
@@ -6,7 +6,7 @@
     getSchemaForDatasource,
   } from "../../../../../dataBinding"
   import FilterDrawer from "./FilterDrawer.svelte"
-  import { currentAsset } from "stores/builder"
+  import { selectedScreen } from "stores/builder"
 
   const dispatch = createEventDispatcher()
 
@@ -18,8 +18,8 @@
   let drawer
 
   $: tempValue = value
-  $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
-  $: dsSchema = getSchemaForDatasource($currentAsset, datasource)?.schema
+  $: datasource = getDatasourceForProvider($selectedScreen, componentInstance)
+  $: dsSchema = getSchemaForDatasource($selectedScreen, datasource)?.schema
   $: schemaFields = Object.values(schema || dsSchema || {})
   $: text = getText(value?.filter(filter => filter.field))
 
diff --git a/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
index 3a7f1d73e4..b418cb3111 100644
--- a/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Combobox } from "@budibase/bbui"
-  import { currentAsset } from "stores/builder"
+  import { selectedScreen } from "stores/builder"
   import { getComponentFieldOptions } from "helpers/formFields"
 
   export let componentInstance
@@ -8,7 +8,7 @@
   export let type
 
   $: options = getComponentFieldOptions(
-    $currentAsset?.props,
+    $selectedScreen?.props,
     componentInstance?._id,
     type
   )
diff --git a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
index db9c91d91a..90417725d4 100644
--- a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
@@ -2,7 +2,7 @@
   import { createEventDispatcher, setContext } from "svelte"
   import ComponentSettingsSection from "../../../../pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte"
   import { getDatasourceForProvider } from "../../../../dataBinding"
-  import { currentAsset, componentStore, previewStore } from "stores/builder"
+  import { selectedScreen, componentStore, previewStore } from "stores/builder"
   import { Helpers } from "@budibase/bbui"
   import { derived, writable } from "svelte/store"
   import { Utils } from "@budibase/frontend-core"
@@ -36,7 +36,7 @@
 
   $: stepCount = cachedValue?.length || 0
   $: updateStore(stepCount)
-  $: dataSource = getDatasourceForProvider($currentAsset, cachedInstance)
+  $: dataSource = getDatasourceForProvider($selectedScreen, cachedInstance)
   $: emitCurrentStep($currentStep)
   $: stepLabel = getStepLabel($multiStepStore)
   $: stepDef = getDefinition(stepLabel)
diff --git a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte
index 06b51e05d5..8aaa6412b7 100644
--- a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte
@@ -3,7 +3,7 @@
     getDatasourceForProvider,
     getSchemaForDatasource,
   } from "../../../../../dataBinding"
-  import { currentAsset, componentStore } from "stores/builder"
+  import { selectedScreen, componentStore } from "stores/builder"
   import DraggableList from "../DraggableList/DraggableList.svelte"
   import { createEventDispatcher } from "svelte"
   import FieldSetting from "./FieldSetting.svelte"
@@ -32,12 +32,12 @@
     return schema
   }
 
-  $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
+  $: datasource = getDatasourceForProvider($selectedScreen, componentInstance)
   $: primaryDisplayColumnName = getSchemaForDatasource(
-    $currentAsset,
+    $selectedScreen,
     datasource
   )?.table?.primaryDisplay
-  $: schema = getSchema(currentAsset, datasource)
+  $: schema = getSchema(selectedScreen, datasource)
   $: columns = getColumns({
     columns: value,
     schema,
diff --git a/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
index b322e629a7..90ce1283c4 100644
--- a/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
@@ -4,7 +4,7 @@
     getDatasourceForProvider,
     getSchemaForDatasource,
   } from "../../../../dataBinding"
-  import { currentAsset } from "stores/builder"
+  import { selectedScreen } from "stores/builder"
   import { createEventDispatcher } from "svelte"
 
   export let componentInstance = {}
@@ -12,8 +12,8 @@
   export let placeholder
 
   const dispatch = createEventDispatcher()
-  $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
-  $: schema = getSchemaForDatasource($currentAsset, datasource).schema
+  $: datasource = getDatasourceForProvider($selectedScreen, componentInstance)
+  $: schema = getSchemaForDatasource($selectedScreen, datasource).schema
   $: options = Object.keys(schema || {})
   $: boundValue = getValidOptions(value, options)
 
diff --git a/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte b/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte
index f37f9c4844..69b4d0c366 100644
--- a/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte
@@ -7,7 +7,7 @@
     getDatasourceForProvider,
     getSchemaForDatasource,
   } from "../../../../dataBinding"
-  import { tables, currentAsset, componentStore } from "stores/builder"
+  import { tables, selectedScreen, componentStore } from "stores/builder"
   import FilterEditor from "./FilterEditor/FilterEditor.svelte"
 
   export let componentInstance
@@ -17,29 +17,29 @@
 
   // Find the closest parent form
   $: form = findClosestMatchingComponent(
-    $currentAsset.props,
+    $selectedScreen.props,
     componentInstance._id,
     component => component._component.endsWith("/form")
   )
 
-  const resolveDatasource = (currentAsset, componentInstance, form) => {
+  const resolveDatasource = (selectedScreen, componentInstance, form) => {
     if (!form && componentInstance._id != $componentStore.selectedComponentId) {
       const block = findComponent(
-        currentAsset.props,
+        selectedScreen.props,
         $componentStore.selectedComponentId
       )
       const def = componentStore.getDefinition(block._component)
       return def?.block === true
-        ? getDatasourceForProvider(currentAsset, block)
+        ? getDatasourceForProvider(selectedScreen, block)
         : {}
     } else {
-      return getDatasourceForProvider(currentAsset, form)
+      return getDatasourceForProvider(selectedScreen, form)
     }
   }
 
   // Get that form's schema
-  $: datasource = resolveDatasource($currentAsset, componentInstance, form)
-  $: formSchema = getSchemaForDatasource($currentAsset, datasource)?.schema
+  $: datasource = resolveDatasource($selectedScreen, componentInstance, form)
+  $: formSchema = getSchemaForDatasource($selectedScreen, datasource)?.schema
 
   // Get the schema for the relationship field that this picker is using
   $: columnSchema = formSchema?.[column]
diff --git a/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte b/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte
index d077dfd1ed..4a452accc0 100644
--- a/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte
+++ b/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ActionButton, notifications } from "@budibase/bbui"
-  import { currentAsset, componentStore } from "stores/builder"
+  import { selectedScreen, componentStore } from "stores/builder"
   import { findClosestMatchingComponent } from "helpers/components"
   import { makeDatasourceFormComponents } from "../../../../templates/commonComponents"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
@@ -11,7 +11,7 @@
 
   const resetFormFields = async () => {
     const form = findClosestMatchingComponent(
-      $currentAsset?.props,
+      $selectedScreen?.props,
       componentInstance._id,
       component => component._component.endsWith("/form")
     )
diff --git a/packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte
index 89f059ea78..1678bd73e7 100644
--- a/packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte
@@ -4,7 +4,7 @@
     getDatasourceForProvider,
     getSchemaForDatasource,
   } from "../../../../dataBinding"
-  import { currentAsset, tables } from "stores/builder"
+  import { selectedScreen, tables } from "stores/builder"
   import { createEventDispatcher } from "svelte"
   import { getFields } from "helpers/searchFields"
 
@@ -13,8 +13,8 @@
   export let placeholder
 
   const dispatch = createEventDispatcher()
-  $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
-  $: schema = getSchemaForDatasource($currentAsset, datasource).schema
+  $: datasource = getDatasourceForProvider($selectedScreen, componentInstance)
+  $: schema = getSchemaForDatasource($selectedScreen, datasource).schema
   $: options = getOptions(datasource, schema || {})
   $: boundValue = getSelectedOption(value, options)
 
diff --git a/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
index f31c2f3260..3fe157fea9 100644
--- a/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
@@ -4,7 +4,7 @@
     getDatasourceForProvider,
     getSchemaForDatasource,
   } from "../../../../dataBinding"
-  import { currentAsset } from "stores/builder"
+  import { selectedScreen } from "stores/builder"
   import { createEventDispatcher } from "svelte"
   import { canBeSortColumn } from "@budibase/shared-core"
 
@@ -13,8 +13,8 @@
   export let placeholder
 
   const dispatch = createEventDispatcher()
-  $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
-  $: schema = getSchemaForDatasource($currentAsset, datasource).schema
+  $: datasource = getDatasourceForProvider($selectedScreen, componentInstance)
+  $: schema = getSchemaForDatasource($selectedScreen, datasource).schema
   $: options = getSortableFields(schema)
   $: boundValue = getValidValue(value, options)
 
diff --git a/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
index bd6184e2ea..157ab35e3f 100644
--- a/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
@@ -10,7 +10,7 @@
     Input,
     DatePicker,
   } from "@budibase/bbui"
-  import { currentAsset, selectedComponent } from "stores/builder"
+  import { selectedScreen, selectedComponent } from "stores/builder"
   import { findClosestMatchingComponent } from "helpers/components"
   import {
     getSchemaForDatasource,
@@ -127,13 +127,14 @@
     ],
   }
 
-  const resolveDatasource = (currentAsset, componentInstance, parent) => {
+  const resolveDatasource = (selectedScreen, componentInstance, parent) => {
     return (
-      getDatasourceForProvider(currentAsset, parent || componentInstance) || {}
+      getDatasourceForProvider(selectedScreen, parent || componentInstance) ||
+      {}
     )
   }
 
-  $: dataSourceSchema = getDataSourceSchema($currentAsset, $selectedComponent)
+  $: dataSourceSchema = getDataSourceSchema($selectedScreen, $selectedComponent)
   $: field = fieldName || $selectedComponent?.field
   $: schemaRules = parseRulesFromSchema(field, dataSourceSchema || {})
   $: fieldType = type?.split("/")[1] || "string"
diff --git a/packages/builder/src/dataBinding.js b/packages/builder/src/dataBinding.js
index e426e47dde..589d3b3170 100644
--- a/packages/builder/src/dataBinding.js
+++ b/packages/builder/src/dataBinding.js
@@ -7,7 +7,6 @@ import {
   findComponentPath,
 } from "helpers/components"
 import {
-  currentAsset,
   componentStore,
   screenStore,
   appStore,
@@ -15,6 +14,7 @@ import {
   queries as queriesStores,
   tables as tablesStore,
   roles as rolesStore,
+  selectedScreen,
 } from "stores/builder"
 import {
   makePropSafe,
@@ -731,13 +731,11 @@ export const getEventContextBindings = ({
   asset,
 }) => {
   let bindings = []
-
-  const selectedAsset = asset ?? get(currentAsset)
+  asset = asset ?? get(selectedScreen)
 
   // Check if any context bindings are provided by the component for this
   // setting
-  const component =
-    componentInstance ?? findComponent(selectedAsset.props, componentId)
+  const component = componentInstance ?? findComponent(asset.props, componentId)
 
   if (!component) {
     return bindings
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
index 8e27d08d25..07dc470df1 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
@@ -9,7 +9,6 @@
     appStore,
     navigationStore,
     selectedScreen,
-    currentAsset,
     hoverStore,
   } from "stores/builder"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
@@ -144,7 +143,7 @@
       const { key, ctrlKey } = data
       document.dispatchEvent(new KeyboardEvent("keydown", { key, ctrlKey }))
     } else if (type === "duplicate-component" && data.id) {
-      const rootComponent = get(currentAsset).props
+      const rootComponent = get(selectedScreen).props
       const component = findComponent(rootComponent, data.id)
       componentStore.copy(component)
       await componentStore.paste(component)
@@ -154,7 +153,7 @@
       loading = false
     } else if (type === "move-component") {
       const { componentId, destinationComponentId } = data
-      const rootComponent = get(currentAsset).props
+      const rootComponent = get(selectedScreen).props
 
       // Get source and destination components
       const source = findComponent(rootComponent, componentId)
diff --git a/packages/builder/src/stores/builder/index.js b/packages/builder/src/stores/builder/index.js
index 6cb3743ba6..a14cf63772 100644
--- a/packages/builder/src/stores/builder/index.js
+++ b/packages/builder/src/stores/builder/index.js
@@ -7,12 +7,7 @@ import {
 } from "./components"
 import { navigationStore } from "./navigation.js"
 import { themeStore } from "./theme.js"
-import {
-  screenStore,
-  selectedScreen,
-  currentAsset,
-  sortedScreens,
-} from "./screens.js"
+import { screenStore, selectedScreen, sortedScreens } from "./screens.js"
 import { builderStore } from "./builder.js"
 import { hoverStore } from "./hover.js"
 import { previewStore } from "./preview.js"
@@ -52,7 +47,6 @@ export {
   automationStore,
   selectedAutomation,
   automationHistoryStore,
-  currentAsset,
   sortedScreens,
   userStore,
   isOnlyUser,
diff --git a/packages/builder/src/stores/builder/screens.js b/packages/builder/src/stores/builder/screens.js
index b1aaa26b45..a646dee2f8 100644
--- a/packages/builder/src/stores/builder/screens.js
+++ b/packages/builder/src/stores/builder/screens.js
@@ -483,8 +483,6 @@ export const selectedScreen = derived(screenStore, $store => {
   return $store.screens.find(screen => screen._id === $store.selectedScreenId)
 })
 
-export const currentAsset = selectedScreen
-
 export const sortedScreens = derived(screenStore, $screenStore => {
   return $screenStore.screens.slice().sort((a, b) => {
     // Sort by role first
diff --git a/packages/builder/vite.config.js b/packages/builder/vite.config.js
index 9c68d317a5..7429ab35d5 100644
--- a/packages/builder/vite.config.js
+++ b/packages/builder/vite.config.js
@@ -106,6 +106,10 @@ export default defineConfig(({ mode }) => {
           find: "stores",
           replacement: path.resolve("./src/stores"),
         },
+        {
+          find: "dataBinding",
+          replacement: path.resolve("./src/dataBinding.js"),
+        },
         {
           find: "api",
           replacement: path.resolve("./src/api.js"),