Remove legacy concept of database store

This commit is contained in:
Andrew Kingston 2024-02-06 15:40:51 +00:00
parent 1efd5725c7
commit 94544c4008
9 changed files with 100 additions and 130 deletions

View File

@ -9,7 +9,6 @@
views, views,
viewsV2, viewsV2,
userSelectedResourceMap, userSelectedResourceMap,
database,
} from "stores/builder" } from "stores/builder"
import EditDatasourcePopover from "./popovers/EditDatasourcePopover.svelte" import EditDatasourcePopover from "./popovers/EditDatasourcePopover.svelte"
import EditQueryPopover from "./popovers/EditQueryPopover.svelte" import EditQueryPopover from "./popovers/EditQueryPopover.svelte"
@ -75,8 +74,7 @@
searchTerm && !showAppUsersTable && !enrichedDataSources.find(ds => ds.show) searchTerm && !showAppUsersTable && !enrichedDataSources.find(ds => ds.show)
</script> </script>
{#if $database?._id} <div class="hierarchy-items-container">
<div class="hierarchy-items-container">
{#if showAppUsersTable} {#if showAppUsersTable}
<NavItem <NavItem
icon="UserGroup" icon="UserGroup"
@ -136,8 +134,7 @@
</div> </div>
</Layout> </Layout>
{/if} {/if}
</div> </div>
{/if}
<style> <style>
.hierarchy-items-container { .hierarchy-items-container {

View File

@ -4,7 +4,6 @@
views, views,
viewsV2, viewsV2,
userSelectedResourceMap, userSelectedResourceMap,
database,
} from "stores/builder" } from "stores/builder"
import { TableNames } from "constants" import { TableNames } from "constants"
import EditTablePopover from "./popovers/EditTablePopover.svelte" import EditTablePopover from "./popovers/EditTablePopover.svelte"
@ -29,8 +28,7 @@
} }
</script> </script>
{#if $database?._id} <div class="hierarchy-items-container">
<div class="hierarchy-items-container">
{#each sortedTables as table, idx} {#each sortedTables as table, idx}
<NavItem <NavItem
indentLevel={1} indentLevel={1}
@ -66,5 +64,4 @@
</NavItem> </NavItem>
{/each} {/each}
{/each} {/each}
</div> </div>
{/if}

View File

@ -1,5 +1,5 @@
<script> <script>
import { queries, datasources, database } from "stores/builder" import { queries, datasources } from "stores/builder"
import QueryViewer from "components/integration/QueryViewer.svelte" import QueryViewer from "components/integration/QueryViewer.svelte"
import RestQueryViewer from "components/integration/RestQueryViewer.svelte" import RestQueryViewer from "components/integration/RestQueryViewer.svelte"
import { IntegrationTypes } from "constants/backend" import { IntegrationTypes } from "constants/backend"
@ -11,7 +11,7 @@
$: isRestQuery = datasource?.source === IntegrationTypes.REST $: isRestQuery = datasource?.source === IntegrationTypes.REST
</script> </script>
{#if $database._id && query} {#if query}
{#if isRestQuery} {#if isRestQuery}
<RestQueryViewer queryId={$queries.selectedQueryId} /> <RestQueryViewer queryId={$queries.selectedQueryId} />
{:else} {:else}

View File

@ -3,7 +3,7 @@
import QueryViewer from "components/integration/QueryViewer.svelte" import QueryViewer from "components/integration/QueryViewer.svelte"
import RestQueryViewer from "components/integration/RestQueryViewer.svelte" import RestQueryViewer from "components/integration/RestQueryViewer.svelte"
import { IntegrationTypes } from "constants/backend" import { IntegrationTypes } from "constants/backend"
import { database, datasources } from "stores/builder" import { datasources } from "stores/builder"
$: datasource = $datasources.list.find(ds => ds._id === $params.datasourceId) $: datasource = $datasources.list.find(ds => ds._id === $params.datasourceId)
$: { $: {
@ -32,7 +32,7 @@
} }
</script> </script>
{#if $database._id && datasource && query} {#if datasource && query}
{#if isRestQuery} {#if isRestQuery}
<RestQueryViewer /> <RestQueryViewer />
{:else} {:else}

View File

@ -1,6 +1,6 @@
<script> <script>
import TableDataTable from "components/backend/DataTable/TableDataTable.svelte" import TableDataTable from "components/backend/DataTable/TableDataTable.svelte"
import { tables, database } from "stores/builder" import { tables } from "stores/builder"
import { Banner } from "@budibase/bbui" import { Banner } from "@budibase/bbui"
const verifyAutocolumns = table => { const verifyAutocolumns = table => {
@ -30,7 +30,7 @@
}) })
</script> </script>
{#if $database?._id && $tables?.selected?.name} {#if $tables?.selected?.name}
{#if duplicates?.length} {#if duplicates?.length}
<div class="alert-wrap"> <div class="alert-wrap">
<Banner type="warning" showCloseButton={false}> <Banner type="warning" showCloseButton={false}>

View File

@ -1,11 +1,11 @@
<script> <script>
import ViewDataTable from "components/backend/DataTable/ViewDataTable.svelte" import ViewDataTable from "components/backend/DataTable/ViewDataTable.svelte"
import { views, database } from "stores/builder" import { views } from "stores/builder"
$: selectedView = $views.selected $: selectedView = $views.selected
</script> </script>
{#if $database._id && selectedView} {#if selectedView}
<ViewDataTable view={selectedView} /> <ViewDataTable view={selectedView} />
{:else}<i>Create your first table to start building</i>{/if} {:else}<i>Create your first table to start building</i>{/if}

View File

@ -5,7 +5,6 @@
import { notifications } from "@budibase/bbui" import { notifications } from "@budibase/bbui"
import { SplitPage } from "@budibase/frontend-core" import { SplitPage } from "@budibase/frontend-core"
import { API } from "api" import { API } from "api"
import { database } from "stores/builder"
import { auth, admin } from "stores/portal" import { auth, admin } from "stores/portal"
let name = "My first app" let name = "My first app"
@ -26,9 +25,6 @@
const createdApp = await API.createApp(data) const createdApp = await API.createApp(data)
// Select Correct Application/DB in prep for creating user
database.syncAppDatabase(createdApp)
// Update checklist - in case first app // Update checklist - in case first app
await admin.init() await admin.init()

View File

@ -1,16 +0,0 @@
import { writable } from "svelte/store"
export const createDatabaseStore = () => {
const store = writable({})
const syncAppDatabase = application => {
store.set({ ...application.instance })
}
return {
subscribe: store.subscribe,
syncAppDatabase,
}
}
export const database = createDatabaseStore()

View File

@ -18,7 +18,6 @@ import {
} from "./automations.js" } from "./automations.js"
import { userStore, userSelectedResourceMap, isOnlyUser } from "./users.js" import { userStore, userSelectedResourceMap, isOnlyUser } from "./users.js"
import { deploymentStore } from "./deployments.js" import { deploymentStore } from "./deployments.js"
import { database } from "./database.js"
// Backend // Backend
import { tables } from "./tables" import { tables } from "./tables"
@ -34,7 +33,6 @@ import { flags } from "./flags"
export { export {
layoutStore, layoutStore,
database,
appStore, appStore,
componentStore, componentStore,
navigationStore, navigationStore,
@ -104,8 +102,6 @@ export const initialise = async pkg => {
themeStore.syncAppTheme(application) themeStore.syncAppTheme(application)
screenStore.syncAppScreens(pkg) screenStore.syncAppScreens(pkg)
layoutStore.syncAppLayouts(pkg) layoutStore.syncAppLayouts(pkg)
// required for api comms
database.syncAppDatabase(application)
resetBuilderHistory() resetBuilderHistory()
await refreshBuilderData() await refreshBuilderData()
} }