MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feat/automation-store-ts-conversion

This commit is contained in:
Peter Clement 2024-12-19 10:28:51 +00:00
parent 345e4626c3 57cafde54c
commit 2ef0ea3e33
16 changed files with 153 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/nextjs-api-sales/package.json
View File

@ -10,7 +10,7 @@
}, },
"dependencies": { "dependencies": {
"bulma": "^0.9.3", "bulma": "^0.9.3",
"next": "14.2.10", "next": "14.2.15",
"node-fetch": "^3.2.10", "node-fetch": "^3.2.10",
"sass": "^1.52.3", "sass": "^1.52.3",
"react": "17.0.2", "react": "17.0.2",

108
examples/nextjs-api-sales/yarn.lock
View File

@ -46,10 +46,10 @@
resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
"@next/env@14.2.10": "@next/env@14.2.15":
version "14.2.10" version "14.2.15"
resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.10.tgz#1d3178340028ced2d679f84140877db4f420333c" resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.15.tgz#06d984e37e670d93ddd6790af1844aeb935f332f"
integrity sha512-dZIu93Bf5LUtluBXIv4woQw2cZVZ2DJTjax5/5DOs3lzEOeKLy7GxRSr4caK9/SCPdaW6bCgpye6+n4Dh9oJPw== integrity sha512-S1qaj25Wru2dUpcIZMjxeMVSwkt8BK4dmWHHiBuRstcIyOsMapqT4A4jSB6onvqeygkSSmOkyny9VVx8JIGamQ==
"@next/eslint-plugin-next@12.1.0": "@next/eslint-plugin-next@12.1.0":
version "12.1.0" version "12.1.0"
@ -58,50 +58,50 @@
dependencies: dependencies:
glob "7.1.7" glob "7.1.7"
"@next/swc-darwin-arm64@14.2.10": "@next/swc-darwin-arm64@14.2.15":
version "14.2.10" version "14.2.15"
resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.10.tgz#49d10ca4086fbd59ee68e204f75d7136eda2aa80" resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.15.tgz#6386d585f39a1c490c60b72b1f76612ba4434347"
integrity sha512-V3z10NV+cvMAfxQUMhKgfQnPbjw+Ew3cnr64b0lr8MDiBJs3eLnM6RpGC46nhfMZsiXgQngCJKWGTC/yDcgrDQ== integrity sha512-Rvh7KU9hOUBnZ9TJ28n2Oa7dD9cvDBKua9IKx7cfQQ0GoYUwg9ig31O2oMwH3wm+pE3IkAQ67ZobPfEgurPZIA==
"@next/swc-darwin-x64@14.2.10": "@next/swc-darwin-x64@14.2.15":
version "14.2.10" version "14.2.15"
resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.10.tgz#0ebeae3afb8eac433882b79543295ab83624a1a8" resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.15.tgz#b7baeedc6a28f7545ad2bc55adbab25f7b45cb89"
integrity sha512-Y0TC+FXbFUQ2MQgimJ/7Ina2mXIKhE7F+GUe1SgnzRmwFY3hX2z8nyVCxE82I2RicspdkZnSWMn4oTjIKz4uzA== integrity sha512-5TGyjFcf8ampZP3e+FyCax5zFVHi+Oe7sZyaKOngsqyaNEpOgkKB3sqmymkZfowy3ufGA/tUgDPPxpQx931lHg==
"@next/swc-linux-arm64-gnu@14.2.10": "@next/swc-linux-arm64-gnu@14.2.15":
version "14.2.10" version "14.2.15"
resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.10.tgz#7e602916d2fb55a3c532f74bed926a0137c16f20" resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.15.tgz#fa13c59d3222f70fb4cb3544ac750db2c6e34d02"
integrity sha512-ZfQ7yOy5zyskSj9rFpa0Yd7gkrBnJTkYVSya95hX3zeBG9E55Z6OTNPn1j2BTFWvOVVj65C3T+qsjOyVI9DQpA== integrity sha512-3Bwv4oc08ONiQ3FiOLKT72Q+ndEMyLNsc/D3qnLMbtUYTQAmkx9E/JRu0DBpHxNddBmNT5hxz1mYBphJ3mfrrw==
"@next/swc-linux-arm64-musl@14.2.10": "@next/swc-linux-arm64-musl@14.2.15":
version "14.2.10" version "14.2.15"
resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.10.tgz#6b143f628ccee490b527562e934f8de578d4be47" resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.15.tgz#30e45b71831d9a6d6d18d7ac7d611a8d646a17f9"
integrity sha512-n2i5o3y2jpBfXFRxDREr342BGIQCJbdAUi/K4q6Env3aSx8erM9VuKXHw5KNROK9ejFSPf0LhoSkU/ZiNdacpQ== integrity sha512-k5xf/tg1FBv/M4CMd8S+JL3uV9BnnRmoe7F+GWC3DxkTCD9aewFRH1s5rJ1zkzDa+Do4zyN8qD0N8c84Hu96FQ==
"@next/swc-linux-x64-gnu@14.2.10": "@next/swc-linux-x64-gnu@14.2.15":
version "14.2.10" version "14.2.15"
resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.10.tgz#086f2f16a0678890a1eb46518c4dda381b046082" resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.15.tgz#5065db17fc86f935ad117483f21f812dc1b39254"
integrity sha512-GXvajAWh2woTT0GKEDlkVhFNxhJS/XdDmrVHrPOA83pLzlGPQnixqxD8u3bBB9oATBKB//5e4vpACnx5Vaxdqg== integrity sha512-kE6q38hbrRbKEkkVn62reLXhThLRh6/TvgSP56GkFNhU22TbIrQDEMrO7j0IcQHcew2wfykq8lZyHFabz0oBrA==
"@next/swc-linux-x64-musl@14.2.10": "@next/swc-linux-x64-musl@14.2.15":
version "14.2.10" version "14.2.15"
resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.10.tgz#1befef10ed8dbcc5047b5d637a25ae3c30a0bfc3" resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.15.tgz#3c4a4568d8be7373a820f7576cf33388b5dab47e"
integrity sha512-opFFN5B0SnO+HTz4Wq4HaylXGFV+iHrVxd3YvREUX9K+xfc4ePbRrxqOuPOFjtSuiVouwe6uLeDtabjEIbkmDA== integrity sha512-PZ5YE9ouy/IdO7QVJeIcyLn/Rc4ml9M2G4y3kCM9MNf1YKvFY4heg3pVa/jQbMro+tP6yc4G2o9LjAz1zxD7tQ==
"@next/swc-win32-arm64-msvc@14.2.10": "@next/swc-win32-arm64-msvc@14.2.15":
version "14.2.10" version "14.2.15"
resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.10.tgz#731f52c3ae3c56a26cf21d474b11ae1529531209" resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.15.tgz#fb812cc4ca0042868e32a6a021da91943bb08b98"
integrity sha512-9NUzZuR8WiXTvv+EiU/MXdcQ1XUvFixbLIMNQiVHuzs7ZIFrJDLJDaOF1KaqttoTujpcxljM/RNAOmw1GhPPQQ== integrity sha512-2raR16703kBvYEQD9HNLyb0/394yfqzmIeyp2nDzcPV4yPjqNUG3ohX6jX00WryXz6s1FXpVhsCo3i+g4RUX+g==
"@next/swc-win32-ia32-msvc@14.2.10": "@next/swc-win32-ia32-msvc@14.2.15":
version "14.2.10" version "14.2.15"
resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.10.tgz#32723ef7f04e25be12af357cc72ddfdd42fd1041" resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.15.tgz#ec26e6169354f8ced240c1427be7fd485c5df898"
integrity sha512-fr3aEbSd1GeW3YUMBkWAu4hcdjZ6g4NBl1uku4gAn661tcxd1bHs1THWYzdsbTRLcCKLjrDZlNp6j2HTfrw+Bg== integrity sha512-fyTE8cklgkyR1p03kJa5zXEaZ9El+kDNM5A+66+8evQS5e/6v0Gk28LqA0Jet8gKSOyP+OTm/tJHzMlGdQerdQ==
"@next/swc-win32-x64-msvc@14.2.10": "@next/swc-win32-x64-msvc@14.2.15":
version "14.2.10" version "14.2.15"
resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.10.tgz#ee1d036cb5ec871816f96baee7991035bb242455" resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.15.tgz#18d68697002b282006771f8d92d79ade9efd35c4"
integrity sha512-UjeVoRGKNL2zfbcQ6fscmgjBAS/inHBh63mjIlfPg/NG8Yn2ztqylXt5qilYb6hoHIwaU2ogHknHWWmahJjgZQ== integrity sha512-SzqGbsLsP9OwKNUG9nekShTwhj6JSB9ZLMWQ8g1gG6hdE5gQLncbnbymrwy2yVmH9nikSLYRYxYMFu78Ggp7/g==
"@nodelib/fs.scandir@2.1.5": "@nodelib/fs.scandir@2.1.5":
version "2.1.5" version "2.1.5"
@ -1253,12 +1253,12 @@ natural-compare@^1.4.0:
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
next@14.2.10: next@14.2.15:
version "14.2.10" version "14.2.15"
resolved "https://registry.yarnpkg.com/next/-/next-14.2.10.tgz#331981a4fecb1ae8af1817d4db98fc9687ee1cb6" resolved "https://registry.yarnpkg.com/next/-/next-14.2.15.tgz#348e5603e22649775d19c785c09a89c9acb5189a"
integrity sha512-sDDExXnh33cY3RkS9JuFEKaS4HmlWmDKP1VJioucCG6z5KuA008DPsDZOzi8UfqEk3Ii+2NCQSJrfbEWtZZfww== integrity sha512-h9ctmOokpoDphRvMGnwOJAedT6zKhwqyZML9mDtspgf4Rh3Pn7UTYKqePNoDvhsWBAO5GoPNYshnAUGIazVGmw==
dependencies: dependencies:
"@next/env" "14.2.10" "@next/env" "14.2.15"
"@swc/helpers" "0.5.5" "@swc/helpers" "0.5.5"
busboy "1.6.0" busboy "1.6.0"
caniuse-lite "^1.0.30001579" caniuse-lite "^1.0.30001579"
@ -1266,15 +1266,15 @@ next@14.2.10:
postcss "8.4.31" postcss "8.4.31"
styled-jsx "5.1.1" styled-jsx "5.1.1"
optionalDependencies: optionalDependencies:
"@next/swc-darwin-arm64" "14.2.10" "@next/swc-darwin-arm64" "14.2.15"
"@next/swc-darwin-x64" "14.2.10" "@next/swc-darwin-x64" "14.2.15"
"@next/swc-linux-arm64-gnu" "14.2.10" "@next/swc-linux-arm64-gnu" "14.2.15"
"@next/swc-linux-arm64-musl" "14.2.10" "@next/swc-linux-arm64-musl" "14.2.15"
"@next/swc-linux-x64-gnu" "14.2.10" "@next/swc-linux-x64-gnu" "14.2.15"
"@next/swc-linux-x64-musl" "14.2.10" "@next/swc-linux-x64-musl" "14.2.15"
"@next/swc-win32-arm64-msvc" "14.2.10" "@next/swc-win32-arm64-msvc" "14.2.15"
"@next/swc-win32-ia32-msvc" "14.2.10" "@next/swc-win32-ia32-msvc" "14.2.15"
"@next/swc-win32-x64-msvc" "14.2.10" "@next/swc-win32-x64-msvc" "14.2.15"
node-domexception@^1.0.0: node-domexception@^1.0.0:
version "1.0.0" version "1.0.0"

41
packages/builder/src/stores/BudiStore.ts
View File

@ -1,40 +1,22 @@
import { writable, Writable } from "svelte/store" import { writable, Writable, Readable } from "svelte/store"
interface BudiStoreOpts { interface BudiStoreOpts {
debug?: boolean debug?: boolean
} }
export default class BudiStore<T> implements Writable<T> { export class BudiStore<T> {
store: Writable<T> store: Writable<T>
subscribe: Writable<T>["subscribe"] subscribe: Writable<T>["subscribe"]
update: Writable<T>["update"] update: Writable<T>["update"]
set: Writable<T>["set"] set: Writable<T>["set"]
constructor(init: T, opts?: BudiStoreOpts) { constructor(init: T, opts?: BudiStoreOpts) {
const store = writable<T>(init) this.store = writable<T>(init)
/**
* Internal Svelte store
*/
this.store = store
/**
* Exposes the svelte subscribe fn to allow $ notation access
* @example
* $navigation.selectedScreenId
*/
this.subscribe = this.store.subscribe this.subscribe = this.store.subscribe
/**
* Exposes the svelte update fn.
* *Store modification should be kept to a minimum
*/
this.update = this.store.update this.update = this.store.update
this.set = this.store.set this.set = this.store.set
/** // Optional debug mode to output the store updates to console
* Optional debug mode to output the store updates to console
*/
if (opts?.debug) { if (opts?.debug) {
this.subscribe(state => { this.subscribe(state => {
console.warn(`${this.constructor.name}`, state) console.warn(`${this.constructor.name}`, state)
@ -42,3 +24,18 @@ export default class BudiStore<T> implements Writable<T> {
} }
} }
} }
export class DerivedBudiStore<T, DerivedT extends T> extends BudiStore<T> {
derivedStore: Readable<DerivedT>
subscribe: Readable<DerivedT>["subscribe"]
constructor(
init: T,
makeDerivedStore: (store: Writable<T>) => Readable<DerivedT>,
opts?: BudiStoreOpts
) {
super(init, opts)
this.derivedStore = makeDerivedStore(this.store)
this.subscribe = this.derivedStore.subscribe
}
}

2
packages/builder/src/stores/builder/app.js
View File

@ -1,5 +1,5 @@
import { API } from "api" import { API } from "api"
import BudiStore from "../BudiStore" import { BudiStore } from "../BudiStore"
export const INITIAL_APP_META_STATE = { export const INITIAL_APP_META_STATE = {
appId: "", appId: "",

2
packages/builder/src/stores/builder/builder.js
View File

@ -1,7 +1,7 @@
import { get } from "svelte/store" import { get } from "svelte/store"
import { createBuilderWebsocket } from "./websocket.js" import { createBuilderWebsocket } from "./websocket.js"
import { BuilderSocketEvent } from "@budibase/shared-core" import { BuilderSocketEvent } from "@budibase/shared-core"
import BudiStore from "../BudiStore.js" import { BudiStore } from "../BudiStore.js"
import { TOUR_KEYS } from "components/portal/onboarding/tours.js" import { TOUR_KEYS } from "components/portal/onboarding/tours.js"
export const INITIAL_BUILDER_STATE = { export const INITIAL_BUILDER_STATE = {

2
packages/builder/src/stores/builder/components.js
View File

@ -28,7 +28,7 @@ import {
DB_TYPE_INTERNAL, DB_TYPE_INTERNAL,
DB_TYPE_EXTERNAL, DB_TYPE_EXTERNAL,
} from "constants/backend" } from "constants/backend"
import BudiStore from "../BudiStore" import { BudiStore } from "../BudiStore"
import { Utils } from "@budibase/frontend-core" import { Utils } from "@budibase/frontend-core"
import { FieldType } from "@budibase/types" import { FieldType } from "@budibase/types"
import { utils } from "@budibase/shared-core" import { utils } from "@budibase/shared-core"

134
packages/builder/src/stores/builder/datasources.ts
View File

@ -1,4 +1,4 @@
import { derived, get } from "svelte/store" import { derived, get, Writable } from "svelte/store"
import { import {
IntegrationTypes, IntegrationTypes,
DEFAULT_BB_DATASOURCE_ID, DEFAULT_BB_DATASOURCE_ID,
@ -17,12 +17,7 @@ import {
} from "@budibase/types" } from "@budibase/types"
// @ts-ignore // @ts-ignore
import { TableNames } from "constants" import { TableNames } from "constants"
import BudiStore from "stores/BudiStore" import { DerivedBudiStore } from "stores/BudiStore"
// when building the internal DS - seems to represent it slightly differently to the backend typing of a DS
interface InternalDatasource extends Omit<Datasource, "entities"> {
entities: Table[]
}
class TableImportError extends Error { class TableImportError extends Error {
errors: Record<string, string> errors: Record<string, string>
@ -42,68 +37,76 @@ class TableImportError extends Error {
} }
} }
// when building the internal DS - seems to represent it slightly differently to the backend typing of a DS
interface InternalDatasource extends Omit<Datasource, "entities"> {
entities: Table[]
}
interface BuilderDatasourceStore { interface BuilderDatasourceStore {
list: Datasource[] rawList: Datasource[]
selectedDatasourceId: null | string selectedDatasourceId: null | string
} }
interface DerivedDatasourceStore extends Omit<BuilderDatasourceStore, "list"> { interface DerivedDatasourceStore extends BuilderDatasourceStore {
list: (Datasource | InternalDatasource)[] list: (Datasource | InternalDatasource)[]
selected?: Datasource | InternalDatasource selected?: Datasource | InternalDatasource
hasDefaultData: boolean hasDefaultData: boolean
hasData: boolean hasData: boolean
} }
export class DatasourceStore extends BudiStore<DerivedDatasourceStore> { export class DatasourceStore extends DerivedBudiStore<
BuilderDatasourceStore,
DerivedDatasourceStore
> {
constructor() { constructor() {
super({ const makeDerivedStore = (store: Writable<BuilderDatasourceStore>) => {
list: [], return derived([store, tables], ([$store, $tables]) => {
selectedDatasourceId: null, // Set the internal datasource entities from the table list, which we're
hasDefaultData: false, // able to keep updated unlike the egress generated definition of the
hasData: false, // internal datasource
}) let internalDS: Datasource | InternalDatasource | undefined =
$store.rawList?.find(ds => ds._id === BUDIBASE_INTERNAL_DB_ID)
const derivedStore = derived< let otherDS = $store.rawList?.filter(
[DatasourceStore, BudiStore<any>], ds => ds._id !== BUDIBASE_INTERNAL_DB_ID
DerivedDatasourceStore )
>([this, tables as any], ([$store, $tables]) => { if (internalDS) {
// Set the internal datasource entities from the table list, which we're const tables: Table[] = $tables.list?.filter((table: Table) => {
// able to keep updated unlike the egress generated definition of the return (
// internal datasource table.sourceId === BUDIBASE_INTERNAL_DB_ID &&
let internalDS: Datasource | InternalDatasource | undefined = table._id !== TableNames.USERS
$store.list?.find(ds => ds._id === BUDIBASE_INTERNAL_DB_ID) )
let otherDS = $store.list?.filter( })
ds => ds._id !== BUDIBASE_INTERNAL_DB_ID internalDS = {
) ...internalDS,
if (internalDS) { entities: tables,
const tables: Table[] = $tables.list?.filter((table: Table) => { }
return (
table.sourceId === BUDIBASE_INTERNAL_DB_ID &&
table._id !== TableNames.USERS
)
})
internalDS = {
...internalDS,
entities: tables,
} }
}
// Build up enriched DS list // Build up enriched DS list
// Only add the internal DS if we have at least one non-users table // Only add the internal DS if we have at least one non-users table
let list: (InternalDatasource | Datasource)[] = [] let list: (InternalDatasource | Datasource)[] = []
if (internalDS?.entities?.length) { if (internalDS?.entities?.length) {
list.push(internalDS) list.push(internalDS)
} }
list = list.concat(otherDS || []) list = list.concat(otherDS || [])
return { return {
...$store, ...$store,
list, list,
selected: list?.find(ds => ds._id === $store.selectedDatasourceId), selected: list?.find(ds => ds._id === $store.selectedDatasourceId),
hasDefaultData: list?.some(ds => ds._id === DEFAULT_BB_DATASOURCE_ID), hasDefaultData: list?.some(ds => ds._id === DEFAULT_BB_DATASOURCE_ID),
hasData: list?.length > 0, hasData: list?.length > 0,
} }
}) })
}
super(
{
rawList: [],
selectedDatasourceId: null,
},
makeDerivedStore
)
this.fetch = this.fetch.bind(this) this.fetch = this.fetch.bind(this)
this.init = this.fetch.bind(this) this.init = this.fetch.bind(this)
@ -114,14 +117,13 @@ export class DatasourceStore extends BudiStore<DerivedDatasourceStore> {
this.save = this.save.bind(this) this.save = this.save.bind(this)
this.replaceDatasource = this.replaceDatasource.bind(this) this.replaceDatasource = this.replaceDatasource.bind(this)
this.getTableNames = this.getTableNames.bind(this) this.getTableNames = this.getTableNames.bind(this)
this.subscribe = derivedStore.subscribe
} }
async fetch() { async fetch() {
const datasources = await API.getDatasources() const datasources = await API.getDatasources()
this.store.update(state => ({ this.store.update(state => ({
...state, ...state,
list: datasources, rawList: datasources,
})) }))
} }
@ -158,7 +160,7 @@ export class DatasourceStore extends BudiStore<DerivedDatasourceStore> {
} }
sourceCount(source: string) { sourceCount(source: string) {
return get(this.store).list.filter( return get(this.store).rawList.filter(
datasource => datasource.source === source datasource => datasource.source === source
).length ).length
} }
@ -220,7 +222,7 @@ export class DatasourceStore extends BudiStore<DerivedDatasourceStore> {
integration: Integration integration: Integration
datasource: Datasource datasource: Datasource
}) { }) {
if (await this.checkDatasourceValidity(integration, datasource)) { if (!(await this.checkDatasourceValidity(integration, datasource)).valid) {
throw new Error("Unable to connect") throw new Error("Unable to connect")
} }
@ -250,7 +252,7 @@ export class DatasourceStore extends BudiStore<DerivedDatasourceStore> {
if (!datasource) { if (!datasource) {
this.store.update(state => ({ this.store.update(state => ({
...state, ...state,
list: state.list.filter(x => x._id !== datasourceId), rawList: state.rawList.filter(x => x._id !== datasourceId),
})) }))
tables.removeDatasourceTables(datasourceId) tables.removeDatasourceTables(datasourceId)
queries.removeDatasourceQueries(datasourceId) queries.removeDatasourceQueries(datasourceId)
@ -258,11 +260,13 @@ export class DatasourceStore extends BudiStore<DerivedDatasourceStore> {
} }
// Add new datasource // Add new datasource
const index = get(this.store).list.findIndex(x => x._id === datasource._id) const index = get(this.store).rawList.findIndex(
x => x._id === datasource._id
)
if (index === -1) { if (index === -1) {
this.store.update(state => ({ this.store.update(state => ({
...state, ...state,
list: [...state.list, datasource], rawList: [...state.rawList, datasource],
})) }))
// If this is a new datasource then we should refresh the tables list, // If this is a new datasource then we should refresh the tables list,
@ -273,7 +277,7 @@ export class DatasourceStore extends BudiStore<DerivedDatasourceStore> {
// Update existing datasource // Update existing datasource
else if (datasource) { else if (datasource) {
this.store.update(state => { this.store.update(state => {
state.list[index] = datasource state.rawList[index] = datasource
return state return state
}) })
} }
@ -283,10 +287,6 @@ export class DatasourceStore extends BudiStore<DerivedDatasourceStore> {
const info = await API.fetchInfoForDatasource(datasource) const info = await API.fetchInfoForDatasource(datasource)
return info.tableNames || [] return info.tableNames || []
} }
// subscribe() {
// return this.derivedStore.subscribe()
// }
} }
export const datasources = new DatasourceStore() export const datasources = new DatasourceStore()

2
packages/builder/src/stores/builder/hover.js
View File

@ -1,6 +1,6 @@
import { get } from "svelte/store" import { get } from "svelte/store"
import { previewStore } from "stores/builder" import { previewStore } from "stores/builder"
import BudiStore from "../BudiStore" import { BudiStore } from "../BudiStore"
export const INITIAL_HOVER_STATE = { export const INITIAL_HOVER_STATE = {
componentId: null, componentId: null,

2
packages/builder/src/stores/builder/layouts.js
View File

@ -1,6 +1,6 @@
import { derived, get } from "svelte/store" import { derived, get } from "svelte/store"
import { componentStore } from "stores/builder" import { componentStore } from "stores/builder"
import BudiStore from "../BudiStore" import { BudiStore } from "../BudiStore"
import { API } from "api" import { API } from "api"
export const INITIAL_LAYOUT_STATE = { export const INITIAL_LAYOUT_STATE = {

2
packages/builder/src/stores/builder/navigation.js
View File

@ -1,7 +1,7 @@
import { get } from "svelte/store" import { get } from "svelte/store"
import { API } from "api" import { API } from "api"
import { appStore } from "stores/builder" import { appStore } from "stores/builder"
import BudiStore from "../BudiStore" import { BudiStore } from "../BudiStore"
export const INITIAL_NAVIGATION_STATE = { export const INITIAL_NAVIGATION_STATE = {
navigation: "Top", navigation: "Top",

2
packages/builder/src/stores/builder/rowActions.js
View File

@ -1,5 +1,5 @@
import { get, derived } from "svelte/store" import { get, derived } from "svelte/store"
import BudiStore from "stores/BudiStore" import { BudiStore } from "stores/BudiStore"
import { tables } from "./tables" import { tables } from "./tables"
import { viewsV2 } from "./viewsV2" import { viewsV2 } from "./viewsV2"
import { automationStore } from "./automations" import { automationStore } from "./automations"

2
packages/builder/src/stores/builder/screens.js
View File

@ -12,7 +12,7 @@ import {
} from "stores/builder" } from "stores/builder"
import { createHistoryStore } from "stores/builder/history" import { createHistoryStore } from "stores/builder/history"
import { API } from "api" import { API } from "api"
import BudiStore from "../BudiStore" import { BudiStore } from "../BudiStore"
export const INITIAL_SCREENS_STATE = { export const INITIAL_SCREENS_STATE = {
screens: [], screens: [],

2
packages/builder/src/stores/builder/sortedIntegrations.ts
View File

@ -3,7 +3,7 @@ import { derived } from "svelte/store"
import { DatasourceTypes } from "constants/backend" import { DatasourceTypes } from "constants/backend"
import { UIIntegration, Integration } from "@budibase/types" import { UIIntegration, Integration } from "@budibase/types"
import BudiStore from "stores/BudiStore" import { BudiStore } from "stores/BudiStore"
const getIntegrationOrder = (type: string | undefined) => { const getIntegrationOrder = (type: string | undefined) => {
// if type is not known, sort to end // if type is not known, sort to end

2
packages/builder/src/stores/portal/apps.ts
View File

@ -3,7 +3,7 @@ import { derived } from "svelte/store"
import { AppStatus } from "constants" import { AppStatus } from "constants"
import { API } from "api" import { API } from "api"
import { auth } from "./auth" import { auth } from "./auth"
import BudiStore from "../BudiStore" import { BudiStore } from "../BudiStore"
import { App, UpdateAppRequest } from "@budibase/types" import { App, UpdateAppRequest } from "@budibase/types"
interface AppIdentifierMetadata { interface AppIdentifierMetadata {

2
packages/builder/src/stores/portal/auditLogs.ts
View File

@ -1,7 +1,7 @@
import { get } from "svelte/store" import { get } from "svelte/store"
import { API } from "api" import { API } from "api"
import { licensing } from "./licensing" import { licensing } from "./licensing"
import BudiStore from "../BudiStore" import { BudiStore } from "../BudiStore"
import { import {
DownloadAuditLogsRequest, DownloadAuditLogsRequest,
SearchAuditLogsRequest, SearchAuditLogsRequest,

2
packages/builder/src/stores/portal/auth.ts
View File

@ -2,7 +2,7 @@ import { get } from "svelte/store"
import { API } from "api" import { API } from "api"
import { admin } from "stores/portal" import { admin } from "stores/portal"
import analytics from "analytics" import analytics from "analytics"
import BudiStore from "stores/BudiStore" import { BudiStore } from "stores/BudiStore"
import { import {
isSSOUser, isSSOUser,
SetInitInfoRequest, SetInitInfoRequest,