Consolidated all stores into stores/builder. Store refactoring and added store console debug flag

packages/builder/src/api.js

@@ -3,9 +3,9 @@ import {
   CookieUtils,
   Constants,
 } from "@budibase/frontend-core"
-import { appStore } from "./stores/frontend"
+import { appStore } from "stores/builder"
 import { get } from "svelte/store"
-import { auth } from "./stores/portal"
+import { auth } from "stores/portal"
 
 export const API = createAPIClient({
   attachHeaders: headers => {

packages/builder/src/builder/dataBinding.js

@@ -5,19 +5,17 @@ import {
   findComponent,
   findComponentPath,
   getComponentSettings,
-} from "stores/frontend/components/utils"
+} from "stores/builder/components/utils"
 import {
   currentAsset,
   componentStore,
   screenStore,
   appStore,
   layoutStore,
-} from "stores/frontend"
-import {
   queries as queriesStores,
   tables as tablesStore,
   roles as rolesStore,
-} from "stores/backend"
+} from "stores/builder"
 import {
   makePropSafe,
   isJSBinding,

packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte

@@ -1,5 +1,5 @@
 <script>
-  import { selectedAutomation } from "stores/frontend"
+  import { selectedAutomation } from "stores/builder"
   import Flowchart from "./FlowChart/FlowChart.svelte"
 </script>
 

packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte

@@ -9,7 +9,7 @@
     Tags,
     Tag,
   } from "@budibase/bbui"
-  import { automationStore, selectedAutomation } from "stores/frontend"
+  import { automationStore, selectedAutomation } from "stores/builder"
   import { admin, licensing } from "stores/portal"
   import { externalActions } from "./ExternalActions"
   import { TriggerStepID, ActionStepID } from "constants/backend/automations"

packages/builder/src/components/automation/AutomationBuilder/FlowChart/AutomationBlockTagline.svelte

@@ -1,7 +1,7 @@
 <script>
   import { processStringSync } from "@budibase/string-templates"
   import { get } from "lodash/fp"
-  import { tables } from "stores/backend"
+  import { tables } from "stores/builder"
 
   export let block
 

packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte

@@ -3,7 +3,7 @@
     automationStore,
     selectedAutomation,
     automationHistoryStore,
-  } from "stores/frontend"
+  } from "stores/builder"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import FlowItem from "./FlowItem.svelte"
   import TestDataModal from "./TestDataModal.svelte"

packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte

@@ -1,5 +1,5 @@
 <script>
-  import { automationStore, selectedAutomation } from "stores/frontend"
+  import { automationStore, selectedAutomation } from "stores/builder"
   import {
     Icon,
     Divider,
@@ -21,7 +21,7 @@
     TriggerStepID,
     Features,
   } from "constants/backend/automations"
-  import { permissions } from "stores/backend"
+  import { permissions } from "stores/builder"
 
   export let block
   export let testDataModal

packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte

@@ -1,5 +1,5 @@
 <script>
-  import { automationStore } from "stores/frontend"
+  import { automationStore } from "stores/builder"
   import { Icon, Body, Detail, StatusLight } from "@budibase/bbui"
   import { externalActions } from "./ExternalActions"
   import { createEventDispatcher } from "svelte"

packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte

@@ -7,7 +7,7 @@
     Label,
     notifications,
   } from "@budibase/bbui"
-  import { automationStore, selectedAutomation } from "stores/frontend"
+  import { automationStore, selectedAutomation } from "stores/builder"
   import AutomationBlockSetup from "../../SetupPanel/AutomationBlockSetup.svelte"
   import { cloneDeep } from "lodash/fp"
 

packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte

@@ -1,7 +1,7 @@
 <script>
   import { Icon, Divider } from "@budibase/bbui"
   import TestDisplay from "./TestDisplay.svelte"
-  import { automationStore } from "stores/frontend"
+  import { automationStore } from "stores/builder"
 
   export let automation
 </script>

packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte

@@ -4,7 +4,7 @@
     automationStore,
     selectedAutomation,
     userSelectedResourceMap,
-  } from "stores/frontend"
+  } from "stores/builder"
   import NavItem from "components/common/NavItem.svelte"
   import EditAutomationPopover from "./EditAutomationPopover.svelte"
   import { notifications } from "@budibase/bbui"

packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte

@@ -1,5 +1,5 @@
 <script>
-  import { automationStore } from "stores/frontend"
+  import { automationStore } from "stores/builder"
   import { notifications } from "@budibase/bbui"
   import {
     Input,

packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte

@@ -1,5 +1,5 @@
 <script>
-  import { automationStore } from "stores/frontend"
+  import { automationStore } from "stores/builder"
   import { ActionMenu, MenuItem, notifications, Icon } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import UpdateAutomationModal from "components/automation/AutomationPanel/UpdateAutomationModal.svelte"

packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte

@@ -1,5 +1,5 @@
 <script>
-  import { automationStore } from "stores/frontend"
+  import { automationStore } from "stores/builder"
   import { notifications } from "@budibase/bbui"
   import { Icon, Input, ModalContent, Modal } from "@budibase/bbui"
 

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

@@ -18,8 +18,7 @@
     Detail,
   } from "@budibase/bbui"
   import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
-  import { automationStore, selectedAutomation } from "stores/frontend"
+  import { automationStore, selectedAutomation, tables } from "stores/builder"
-  import { tables } from "stores/backend"
   import { environment, licensing } from "stores/portal"
   import WebhookDisplay from "../Shared/WebhookDisplay.svelte"
   import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"

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

@@ -1,7 +1,7 @@
 <script>
   import { Button, Select, Input, Label } from "@budibase/bbui"
   import { onMount, createEventDispatcher } from "svelte"
-  import { flags } from "stores/backend"
+  import { flags } from "stores/builder"
   const dispatch = createEventDispatcher()
 
   export let value

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

@@ -1,6 +1,6 @@
 <script>
   import { createEventDispatcher } from "svelte"
-  import { queries } from "stores/backend"
+  import { queries } from "stores/builder"
   import { Select } from "@budibase/bbui"
   import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
   import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte"

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

@@ -1,5 +1,5 @@
 <script>
-  import { queries } from "stores/backend"
+  import { queries } from "stores/builder"
   import { Select } from "@budibase/bbui"
 
   export let value

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

@@ -1,5 +1,5 @@
 <script>
-  import { tables } from "stores/backend"
+  import { tables } from "stores/builder"
   import { Select, Checkbox } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
   import RowSelectorTypes from "./RowSelectorTypes.svelte"

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

@@ -1,5 +1,5 @@
 <script>
-  import { tables } from "stores/backend"
+  import { tables } from "stores/builder"
   import { Select } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
   import { TableNames } from "constants"

packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte

@@ -1,6 +1,6 @@
 <script>
   import { Icon, notifications } from "@budibase/bbui"
-  import { automationStore, selectedAutomation } from "stores/frontend"
+  import { automationStore, selectedAutomation } from "stores/builder"
   import WebhookDisplay from "./WebhookDisplay.svelte"
   import { ModalContent } from "@budibase/bbui"
   import { onMount, onDestroy } from "svelte"

packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte

@@ -1,7 +1,7 @@
 <script>
   import { API } from "api"
   import Table from "./Table.svelte"
-  import { tables } from "stores/backend"
+  import { tables } from "stores/builder"
   import { notifications } from "@budibase/bbui"
 
   export let tableId

packages/builder/src/components/backend/DataTable/TableDataTable.svelte

@@ -1,10 +1,10 @@
 <script>
-  import { datasources, tables, integrations } from "stores/backend"
+  import { datasources, tables, integrations } from "stores/builder"
   import EditRolesButton from "./buttons/EditRolesButton.svelte"
   import { TableNames } from "constants"
   import { Grid } from "@budibase/frontend-core"
   import { API } from "api"
-  import { appStore } from "stores/frontend"
+  import { appStore } from "stores/builder"
   import GridAddColumnModal from "components/backend/DataTable/modals/grid/GridCreateColumnModal.svelte"
   import GridCreateEditRowModal from "components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte"
   import GridEditUserModal from "components/backend/DataTable/modals/grid/GridEditUserModal.svelte"

packages/builder/src/components/backend/DataTable/ViewDataTable.svelte

@@ -1,6 +1,6 @@
 <script>
   import { API } from "api"
-  import { tables } from "stores/backend"
+  import { tables } from "stores/builder"
 
   import Table from "./Table.svelte"
   import CalculateButton from "./buttons/CalculateButton.svelte"

packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte

@@ -1,5 +1,5 @@
 <script>
-  import { viewsV2 } from "stores/backend"
+  import { viewsV2 } from "stores/builder"
   import { Grid } from "@budibase/frontend-core"
   import { API } from "api"
   import GridCreateEditRowModal from "components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte"

packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte

@@ -1,7 +1,7 @@
 <script>
   import { ActionButton, notifications } from "@budibase/bbui"
   import CreateEditRelationshipModal from "../../Datasources/CreateEditRelationshipModal.svelte"
-  import { datasources } from "../../../../stores/backend"
+  import { datasources } from "stores/builder"
   import { createEventDispatcher } from "svelte"
 
   export let table

packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte

@@ -1,6 +1,6 @@
 <script>
   import { ActionButton, Modal } from "@budibase/bbui"
-  import { permissions } from "stores/backend"
+  import { permissions } from "stores/builder"
   import ManageAccessModal from "../modals/ManageAccessModal.svelte"
 
   export let resourceId

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

@@ -1,5 +1,5 @@
 <script>
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
 
   export let value
 

packages/builder/src/components/backend/DataTable/formula.js

@@ -1,5 +1,5 @@
 import { FIELDS } from "constants/backend"
-import { tables } from "stores/backend"
+import { tables } from "stores/builder"
 import { get as svelteGet } from "svelte/store"
 
 // currently supported level of relationship depth (server side)

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

@@ -1,6 +1,6 @@
 <script>
   import { Select, Label, notifications, ModalContent } from "@budibase/bbui"
-  import { tables, views } from "stores/backend"
+  import { tables, views } from "stores/builder"
   import { FIELDS } from "constants/backend"
 
   const CALCULATIONS = [

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

@@ -15,7 +15,7 @@
   } from "@budibase/bbui"
   import { createEventDispatcher, getContext, onMount } from "svelte"
   import { cloneDeep } from "lodash/fp"
-  import { tables, datasources } from "stores/backend"
+  import { tables, datasources } from "stores/builder"
   import { TableNames, UNEDITABLE_USER_FIELDS } from "constants"
   import {
     FIELDS,

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

@@ -1,6 +1,6 @@
 <script>
   import { createEventDispatcher } from "svelte"
-  import { tables } from "stores/backend"
+  import { tables } from "stores/builder"
   import { ModalContent, keepOpen, notifications } from "@budibase/bbui"
   import RowFieldControl from "../RowFieldControl.svelte"
   import { API } from "api"

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

@@ -1,7 +1,6 @@
 <script>
   import { createEventDispatcher } from "svelte"
-  import { tables } from "stores/backend"
+  import { tables, roles } from "stores/builder"
-  import { roles } from "stores/backend"
   import { notifications } from "@budibase/bbui"
   import RowFieldControl from "../RowFieldControl.svelte"
   import { API } from "api"

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

@@ -4,7 +4,7 @@
   import { API } from "api"
   import { notifications } from "@budibase/bbui"
   import ErrorsBox from "components/common/ErrorsBox.svelte"
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
 
   const BASE_ROLE = { _id: "", inherits: "BASIC", permissionId: "write" }
 

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

@@ -10,7 +10,7 @@
     notifications,
     Icon,
   } from "@budibase/bbui"
-  import { tables, views } from "stores/backend"
+  import { tables, views } from "stores/builder"
 
   const CONDITIONS = [
     {

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

@@ -1,6 +1,6 @@
 <script>
   import { Select, ModalContent, notifications } from "@budibase/bbui"
-  import { tables, views } from "stores/backend"
+  import { tables, views } from "stores/builder"
   import { FIELDS } from "constants/backend"
 
   export let view = {}

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

@@ -1,6 +1,6 @@
 <script>
   import { PermissionSource } from "@budibase/types"
-  import { roles, permissions as permissionsStore } from "stores/backend"
+  import { roles, permissions as permissionsStore } from "stores/builder"
   import {
     Label,
     Input,

packages/builder/src/components/backend/DataTable/modals/grid/GridCreateViewModal.svelte

@@ -2,7 +2,7 @@
   import { getContext } from "svelte"
   import { Input, notifications, ModalContent } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import { viewsV2 } from "stores/backend"
+  import { viewsV2 } from "stores/builder"
 
   const { filter, sort, definition } = getContext("grid")
 

packages/builder/src/components/backend/DataTable/modals/grid/GridUsersTableButton.svelte

@@ -1,6 +1,6 @@
 <script>
   import { ActionButton, Popover, Heading, Body, Button } from "@budibase/bbui"
-  import { builderStore } from "stores/frontend"
+  import { builderStore } from "stores/builder"
 
   let anchor
   let open = false

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

@@ -1,7 +1,7 @@
 <script>
   import { goto, isActive, params } from "@roxi/routify"
   import { BUDIBASE_INTERNAL_DB_ID } from "constants/backend"
-  import { datasources, queries, tables, views, viewsV2 } from "stores/backend"
+  import { datasources, queries, tables, views, viewsV2 } from "stores/builder"
   import EditDatasourcePopover from "./popovers/EditDatasourcePopover.svelte"
   import EditQueryPopover from "./popovers/EditQueryPopover.svelte"
   import NavItem from "components/common/NavItem.svelte"
@@ -13,7 +13,7 @@
   } from "helpers/data/utils"
   import IntegrationIcon from "./IntegrationIcon.svelte"
   import { TableNames } from "constants"
-  import { userSelectedResourceMap, database } from "stores/frontend"
+  import { userSelectedResourceMap, database } from "stores/builder"
 
   let openDataSources = []
 

packages/builder/src/components/backend/DatasourceNavigator/icons/index.js

@@ -16,7 +16,7 @@ import Firebase from "./Firebase.svelte"
 import Redis from "./Redis.svelte"
 import Snowflake from "./Snowflake.svelte"
 import Custom from "./Custom.svelte"
-import { integrations } from "stores/backend"
+import { integrations } from "stores/builder"
 import { get } from "svelte/store"
 
 const ICONS = {

packages/builder/src/components/backend/DatasourceNavigator/modals/ImportRestQueriesModal.svelte

@@ -12,7 +12,7 @@
     TextArea,
     Dropzone,
   } from "@budibase/bbui"
-  import { datasources, queries } from "stores/backend"
+  import { datasources, queries } from "stores/builder"
   import { writable } from "svelte/store"
 
   export let navigateDatasource = false

packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte

@@ -1,6 +1,6 @@
 <script>
   import { get } from "svelte/store"
-  import { datasources, integrations } from "stores/backend"
+  import { datasources, integrations } from "stores/builder"
   import { notifications } from "@budibase/bbui"
   import { Input, ModalContent, Modal } from "@budibase/bbui"
   import { integrationForDatasource } from "stores/selectors"

packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte

@@ -1,6 +1,6 @@
 <script>
   import { goto } from "@roxi/routify"
-  import { datasources } from "stores/backend"
+  import { datasources } from "stores/builder"
   import { notifications } from "@budibase/bbui"
   import { ActionMenu, MenuItem, Icon } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"

packages/builder/src/components/backend/DatasourceNavigator/popovers/EditQueryPopover.svelte

@@ -2,7 +2,7 @@
   import { goto } from "@roxi/routify"
   import { ActionMenu, MenuItem, Icon, notifications } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
-  import { datasources, queries } from "stores/backend"
+  import { datasources, queries } from "stores/builder"
 
   export let query
 

packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte

@@ -9,7 +9,7 @@
     Detail,
     Body,
   } from "@budibase/bbui"
-  import { tables } from "stores/backend"
+  import { tables } from "stores/builder"
   import { Helpers } from "@budibase/bbui"
   import { RelationshipErrorChecker } from "./relationshipErrors"
   import { onMount } from "svelte"

packages/builder/src/components/backend/Datasources/CreateEditRelationshipModal.svelte

@@ -2,7 +2,7 @@
   import { Modal } from "@budibase/bbui"
   import { get } from "svelte/store"
   import CreateEditRelationship from "./CreateEditRelationship.svelte"
-  import { integrations, datasources } from "stores/backend"
+  import { integrations, datasources } from "stores/builder"
   import { integrationForDatasource } from "stores/selectors"
 
   export let datasource

packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js

@@ -1,6 +1,6 @@
 import { derived, writable, get } from "svelte/store"
 import { keepOpen, notifications } from "@budibase/bbui"
-import { datasources, tables } from "stores/backend"
+import { datasources, tables } from "stores/builder"
 
 export const createTableSelectionStore = (integration, datasource) => {
   const tableNamesStore = writable([])

packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte

@@ -1,12 +1,16 @@
 <script>
-  import { tables, views, viewsV2 } from "stores/backend"
+  import {
+    tables,
+    views,
+    viewsV2,
+    userSelectedResourceMap,
+    database,
+  } from "stores/builder"
   import { TableNames } from "constants"
   import EditTablePopover from "./popovers/EditTablePopover.svelte"
   import EditViewPopover from "./popovers/EditViewPopover.svelte"
   import NavItem from "components/common/NavItem.svelte"
   import { goto, isActive } from "@roxi/routify"
-  import { userSelectedResourceMap } from "stores/frontend"
-  import { database } from "stores/frontend/database"
 
   export let sourceId
   export let selectTable

packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte

@@ -1,9 +1,8 @@
 <script>
   import { goto, url } from "@roxi/routify"
-  import { tables } from "stores/backend"
+  import { tables, datasources } from "stores/builder"
   import { notifications } from "@budibase/bbui"
   import { Input, Label, ModalContent, Layout } from "@budibase/bbui"
-  import { datasources } from "stores/backend"
   import TableDataImport from "../TableDataImport.svelte"
   import {
     BUDIBASE_INTERNAL_DB_ID,

packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte

@@ -1,8 +1,7 @@
 <script>
   import { goto, params } from "@roxi/routify"
   import { cloneDeep } from "lodash/fp"
-  import { tables, datasources } from "stores/backend"
+  import { tables, datasources, screenStore } from "stores/builder"
-  import { screenStore } from "stores/frontend"
   import {
     ActionMenu,
     Icon,

packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte

@@ -1,5 +1,5 @@
 <script>
-  import { views, viewsV2 } from "stores/backend"
+  import { views, viewsV2 } from "stores/builder"
   import { cloneDeep } from "lodash/fp"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import {

packages/builder/src/components/commandPalette/CommandPalette.svelte

@@ -15,9 +15,12 @@
     builderStore,
     sortedScreens,
     appStore,
-  } from "stores/frontend"
+    datasources,
+    queries,
+    tables,
+    views,
+  } from "stores/builder"
   import { themeStore } from "stores/portal"
-  import { datasources, queries, tables, views } from "stores/backend"
   import { getContext } from "svelte"
   import { Constants } from "@budibase/frontend-core"
 

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

@@ -1,5 +1,5 @@
 <script>
-  import { tables } from "stores/backend"
+  import { tables } from "stores/builder"
   import { API } from "api"
   import { Select, Label, Multiselect } from "@budibase/bbui"
   import { capitalise } from "../../helpers"

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

@@ -1,6 +1,6 @@
 <script>
   import { Select, FancySelect } from "@budibase/bbui"
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
   import { licensing } from "stores/portal"
 
   import { Constants, RoleUtils } from "@budibase/frontend-core"

packages/builder/src/components/common/bindings/DrawerBindableInput.svelte

@@ -8,7 +8,7 @@
   import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
   import { createEventDispatcher, setContext } from "svelte"
   import { isJSBinding } from "@budibase/string-templates"
-  import { builderStore } from "stores/frontend"
+  import { builderStore } from "stores/builder"
 
   export let panel = ClientBindingPanel
   export let value = ""

packages/builder/src/components/deploy/AppActions.svelte

@@ -27,7 +27,7 @@
     appStore,
     deploymentStore,
     initialise,
-  } from "stores/frontend"
+  } from "stores/builder"
   import TourWrap from "components/portal/onboarding/TourWrap.svelte"
   import { TOUR_STEP_KEYS } from "components/portal/onboarding/tours.js"
   import { goto } from "@roxi/routify"

packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte

@@ -1,5 +1,5 @@
 <script>
-  import { automationStore } from "stores/frontend"
+  import { automationStore } from "stores/builder"
   import { ModalContent } from "@budibase/bbui"
   import { onMount } from "svelte"
   import WebhookDisplay from "../automation/Shared/WebhookDisplay.svelte"

packages/builder/src/components/deploy/DeleteModal.svelte

@@ -3,7 +3,7 @@
   import { goto } from "@roxi/routify"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import { apps } from "stores/portal"
-  import { appStore } from "stores/frontend"
+  import { appStore } from "stores/builder"
   import { API } from "api"
 
   export const show = () => {

packages/builder/src/components/deploy/RevertModal.svelte

@@ -1,6 +1,6 @@
 <script>
   import { Input, Modal, notifications, ModalContent } from "@budibase/bbui"
-  import { appStore, initialise } from "stores/frontend"
+  import { appStore, initialise } from "stores/builder"
   import { API } from "api"
 
   export let onComplete = () => {}

packages/builder/src/components/deploy/VersionModal.svelte

@@ -7,7 +7,7 @@
     Button,
     StatusLight,
   } from "@budibase/bbui"
-  import { appStore, initialise } from "stores/frontend"
+  import { appStore, initialise } from "stores/builder"
   import { API } from "api"
 
   export function show() {

packages/builder/src/components/design/ScreenDetailsModal.svelte

@@ -2,7 +2,7 @@
   import { ModalContent, Input } from "@budibase/bbui"
   import sanitizeUrl from "builder/store/screenTemplates/utils/sanitizeUrl"
   import { get } from "svelte/store"
-  import { screenStore } from "stores/frontend"
+  import { screenStore } from "stores/builder"
 
   export let onConfirm
   export let onCancel

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte

@@ -1,6 +1,6 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { currentAsset, componentStore } from "stores/frontend"
+  import { currentAsset, componentStore } from "stores/builder"
   import { getActionProviderComponents } from "builder/dataBinding"
   import { onMount } from "svelte"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte

@@ -1,6 +1,6 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { currentAsset, componentStore } from "stores/frontend"
+  import { currentAsset, componentStore } from "stores/builder"
   import { getActionProviderComponents } from "builder/dataBinding"
 
   export let parameters

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte

@@ -1,6 +1,6 @@
 <script>
   import { Select, Label, Checkbox, Input, Body } from "@budibase/bbui"
-  import { tables, viewsV2 } from "stores/backend"
+  import { tables, viewsV2 } from "stores/builder"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte

@@ -1,7 +1,6 @@
 <script>
   import { Select, Label, Body, Checkbox, Input } from "@budibase/bbui"
-  import { currentAsset, componentStore } from "stores/frontend"
+  import { currentAsset, componentStore, tables, viewsV2 } from "stores/builder"
-  import { tables, viewsV2 } from "stores/backend"
   import {
     getContextProviderComponents,
     getSchemaForDatasourcePlus,

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte

@@ -1,6 +1,6 @@
 <script>
   import { Select, Layout, Input, Checkbox } from "@budibase/bbui"
-  import { datasources, integrations, queries } from "stores/backend"
+  import { datasources, integrations, queries } from "stores/builder"
   import BindingBuilder from "components/integration/QueryBindingBuilder.svelte"
   import IntegrationQueryEditor from "components/integration/index.svelte"
   import {

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte

@@ -3,8 +3,8 @@
   import {
     findAllMatchingComponents,
     findComponent,
-  } from "stores/frontend/components/utils"
+  } from "stores/builder/components/utils"
-  import { currentAsset } from "stores/frontend"
+  import { currentAsset } from "stores/builder"
   import { onMount } from "svelte"
   import {
     getDatasourceForProvider,

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/FetchRow.svelte

@@ -1,6 +1,6 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { tables, viewsV2 } from "stores/backend"
+  import { tables, viewsV2 } from "stores/builder"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte

@@ -1,5 +1,5 @@
 <script>
-  import { screenStore } from "stores/frontend"
+  import { screenStore } from "stores/builder"
   import { onMount } from "svelte"
   import { Label, Checkbox, Select } from "@budibase/bbui"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenSidePanel.svelte

@@ -1,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { selectedScreen } from "stores/frontend"
+  import { selectedScreen } from "stores/builder"
-  import { findAllMatchingComponents } from "stores/frontend/components/utils"
+  import { findAllMatchingComponents } from "stores/builder/components/utils"
 
   export let parameters
 

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte

@@ -1,6 +1,6 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { currentAsset, componentStore } from "stores/frontend"
+  import { currentAsset, componentStore } from "stores/builder"
   import { getActionProviderComponents } from "builder/dataBinding"
 
   export let parameters

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte

@@ -1,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { currentAsset } from "stores/frontend"
+  import { currentAsset } from "stores/builder"
-  import { findAllMatchingComponents } from "stores/frontend/components/utils"
+  import { findAllMatchingComponents } from "stores/builder/components/utils"
 
   export let parameters
 

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte

@@ -1,7 +1,6 @@
 <script>
   import { Select, Label, Body, Checkbox, Input } from "@budibase/bbui"
-  import { currentAsset, componentStore } from "stores/frontend"
+  import { currentAsset, componentStore, tables, viewsV2 } from "stores/builder"
-  import { tables, viewsV2 } from "stores/backend"
   import {
     getContextProviderComponents,
     getSchemaForDatasourcePlus,

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte

@@ -1,11 +1,11 @@
 <script>
-  import { currentAsset, componentStore } from "stores/frontend"
+  import { currentAsset, componentStore } from "stores/builder"
   import { Label, Combobox, Select } from "@budibase/bbui"
   import {
     getActionProviderComponents,
     buildFormSchema,
   } from "builder/dataBinding"
-  import { findComponent } from "stores/frontend/components/utils"
+  import { findComponent } from "stores/builder/components/utils"
 
   export let parameters
 

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte

@@ -1,6 +1,6 @@
 <script>
   import { Select, Label, Input, Checkbox, Icon, Body } from "@budibase/bbui"
-  import { automationStore } from "stores/frontend"
+  import { automationStore } from "stores/builder"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import { TriggerStepID, ActionStepID } from "constants/backend/automations"
 

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateFieldValue.svelte

@@ -2,12 +2,12 @@
   import { Select, Label, Combobox } from "@budibase/bbui"
   import { onMount } from "svelte"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import { currentAsset, componentStore } from "stores/frontend"
+  import { currentAsset, componentStore } from "stores/builder"
   import {
     getActionProviderComponents,
     buildFormSchema,
   } from "builder/dataBinding"
-  import { findComponent } from "stores/frontend/components/utils"
+  import { findComponent } from "stores/builder/components/utils"
 
   export let parameters
   export let bindings = []

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ValidateForm.svelte

@@ -1,6 +1,6 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { currentAsset, componentStore } from "stores/frontend"
+  import { currentAsset, componentStore } from "stores/builder"
   import { getActionProviderComponents } from "builder/dataBinding"
 
   export let parameters

packages/builder/src/components/design/settings/controls/ButtonActionEditor/index.js

@@ -1,6 +1,6 @@
 import * as ActionComponents from "./actions"
 import { get } from "svelte/store"
-import { appStore } from "stores/frontend"
+import { appStore } from "stores/builder"
 // @ts-ignore
 import ActionDefinitions from "./manifest.json"
 

packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte

@@ -3,7 +3,7 @@
   import ButtonSetting from "./ButtonSetting.svelte"
   import { createEventDispatcher } from "svelte"
   import { Helpers } from "@budibase/bbui"
-  import { componentStore } from "stores/frontend"
+  import { componentStore } from "stores/builder"
 
   export let componentBindings
   export let bindings

packages/builder/src/components/design/settings/controls/ColorPicker.svelte

@@ -1,6 +1,6 @@
 <script>
   import { ColorPicker } from "@budibase/bbui"
-  import { themeStore } from "stores/frontend"
+  import { themeStore } from "stores/builder"
 
   export let value
 </script>

packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte

@@ -7,7 +7,7 @@
     Layout,
     Label,
   } from "@budibase/bbui"
-  import { themeStore } from "stores/frontend"
+  import { themeStore } from "stores/builder"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
 
   export let column

packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte

@@ -7,7 +7,7 @@
     getDatasourceForProvider,
     getSchemaForDatasource,
   } from "builder/dataBinding"
-  import { currentAsset } from "stores/frontend"
+  import { currentAsset } from "stores/builder"
   import { getFields } from "helpers/searchFields"
 
   export let componentInstance

packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte

@@ -1,8 +1,8 @@
 <script>
   import { Select } from "@budibase/bbui"
   import { makePropSafe } from "@budibase/string-templates"
-  import { currentAsset, componentStore } from "stores/frontend"
+  import { currentAsset, componentStore } from "stores/builder"
-  import { findComponentPath } from "stores/frontend/components/utils"
+  import { findComponentPath } from "stores/builder/components/utils"
 
   export let value
 

packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte

@@ -18,14 +18,16 @@
     notifications,
   } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
-  import { currentAsset, componentStore } from "stores/frontend"
   import {
     tables as tablesStore,
     queries as queriesStore,
     viewsV2 as viewsV2Store,
     views as viewsStore,
-  } from "stores/backend"
+    currentAsset,
-  import { datasources, integrations } from "stores/backend"
+    componentStore,
+    datasources,
+    integrations,
+  } from "stores/builder"
   import BindingBuilder from "components/integration/QueryBindingBuilder.svelte"
   import IntegrationQueryEditor from "components/integration/index.svelte"
   import { makePropSafe as safe } from "@budibase/string-templates"

packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte

@@ -1,6 +1,6 @@
 <script>
   import { Icon, Popover, Layout } from "@budibase/bbui"
-  import { componentStore } from "stores/frontend"
+  import { componentStore } from "stores/builder"
   import { cloneDeep } from "lodash/fp"
   import { createEventDispatcher } from "svelte"
   import ComponentSettingsSection from "../../../../pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte"

packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte

@@ -8,7 +8,7 @@
   } from "builder/dataBinding"
   import DraggableList from "../DraggableList/DraggableList.svelte"
   import { createEventDispatcher } from "svelte"
-  import { selectedScreen, currentAsset, componentStore } from "stores/frontend"
+  import { selectedScreen, currentAsset, componentStore } from "stores/builder"
   import FieldSetting from "./FieldSetting.svelte"
   import { convertOldFieldFormat, getComponentForField } from "./utils"
 

packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldSetting.svelte

@@ -5,7 +5,7 @@
   import { cloneDeep } from "lodash/fp"
   import { runtimeToReadableBinding } from "builder/dataBinding"
   import { isJSBinding } from "@budibase/string-templates"
-  import { componentStore } from "stores/frontend"
+  import { componentStore } from "stores/builder"
 
   export let item
   export let componentBindings

packages/builder/src/components/design/settings/controls/FieldSelect.svelte

@@ -4,7 +4,7 @@
     getDatasourceForProvider,
     getSchemaForDatasource,
   } from "builder/dataBinding"
-  import { currentAsset } from "stores/frontend"
+  import { currentAsset } from "stores/builder"
   import { createEventDispatcher } from "svelte"
 
   export let componentInstance = {}

packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte

@@ -6,7 +6,7 @@
     getSchemaForDatasource,
   } from "builder/dataBinding"
   import FilterDrawer from "./FilterDrawer.svelte"
-  import { currentAsset } from "stores/frontend"
+  import { currentAsset } from "stores/builder"
 
   const dispatch = createEventDispatcher()
 

packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte

@@ -1,6 +1,6 @@
 <script>
   import { Combobox } from "@budibase/bbui"
-  import { currentAsset } from "stores/frontend"
+  import { currentAsset } from "stores/builder"
   import { getComponentFieldOptions } from "helpers/formFields"
 
   export let componentInstance

packages/builder/src/components/design/settings/controls/LayoutSelect.svelte

@@ -1,5 +1,5 @@
 <script>
-  import { layoutStore } from "stores/frontend"
+  import { layoutStore } from "stores/builder"
   import { Select } from "@budibase/bbui"
 
   export let value

packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte

@@ -4,7 +4,7 @@
     getDatasourceForProvider,
     getSchemaForDatasource,
   } from "builder/dataBinding"
-  import { currentAsset } from "stores/frontend"
+  import { currentAsset } from "stores/builder"
   import { createEventDispatcher } from "svelte"
 
   export let componentInstance = {}

packages/builder/src/components/design/settings/controls/PropertyControl.svelte

@@ -4,7 +4,7 @@
     readableToRuntimeBinding,
     runtimeToReadableBinding,
   } from "builder/dataBinding"
-  import { builderStore } from "stores/frontend"
+  import { builderStore } from "stores/builder"
   import { onDestroy } from "svelte"
 
   export let label = ""

packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte

@@ -1,11 +1,10 @@
 <script>
-  import { currentAsset } from "stores/frontend"
+  import { findClosestMatchingComponent } from "stores/builder/components/utils"
-  import { findClosestMatchingComponent } from "stores/frontend/components/utils"
   import {
     getDatasourceForProvider,
     getSchemaForDatasource,
   } from "builder/dataBinding"
-  import { tables } from "stores/backend"
+  import { tables, currentAsset } from "stores/builder"
   import FilterEditor from "./FilterEditor/FilterEditor.svelte"
 
   export let componentInstance

packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte

@@ -1,7 +1,7 @@
 <script>
   import { ActionButton, notifications } from "@budibase/bbui"
-  import { currentAsset, componentStore } from "stores/frontend"
+  import { currentAsset, componentStore } from "stores/builder"
-  import { findClosestMatchingComponent } from "stores/frontend/components/utils"
+  import { findClosestMatchingComponent } from "stores/builder/components/utils"
   import { makeDatasourceFormComponents } from "builder/store/screenTemplates/utils/commonComponents"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
 

packages/builder/src/components/design/settings/controls/RoleSelect.svelte

@@ -1,6 +1,6 @@
 <script>
   import { Select } from "@budibase/bbui"
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
   import { RoleUtils } from "@budibase/frontend-core"
 
   export let value

packages/builder/src/components/design/settings/controls/S3DataSourceSelect.svelte

@@ -1,6 +1,6 @@
 <script>
   import { Select } from "@budibase/bbui"
-  import { datasources } from "stores/backend"
+  import { datasources } from "stores/builder"
 
   export let value = null
 

packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte

@@ -4,8 +4,7 @@
     getDatasourceForProvider,
     getSchemaForDatasource,
   } from "builder/dataBinding"
-  import { currentAsset } from "stores/frontend"
+  import { currentAsset, tables } from "stores/builder"
-  import { tables } from "stores/backend"
   import { createEventDispatcher } from "svelte"
   import { getFields } from "helpers/searchFields"
 

packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte

@@ -4,7 +4,7 @@
     getDatasourceForProvider,
     getSchemaForDatasource,
   } from "builder/dataBinding"
-  import { currentAsset } from "stores/frontend"
+  import { currentAsset } from "stores/builder"
   import { createEventDispatcher } from "svelte"
   import { canBeSortColumn } from "@budibase/shared-core"