CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-10-04 03:54:37 +13:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into cheeks-fixes

Browse source
This commit is contained in:
Andrew Kingston 2024-06-11 17:20:55 +02:00 committed by GitHub
commit 5f8a70d0dd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte
View file

@ -29,7 +29,7 @@
on:click={() => onSelect(data)}
>
<span class="spectrum-Menu-itemLabel">
{data.label}
{data.datasource?.name ? `${data.datasource.name} - ` : ""}{data.label}
</span>
<svg
class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"

1
packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
View file

@ -55,6 +55,7 @@
label: m.name,
tableId: m._id,
type: "table",
datasource: $datasources.list.find(ds => ds._id === m.sourceId || m.datasourceId),
}))
$: viewsV1 = $viewsStore.list.map(view => ({
...view,

2
packages/server/src/appMigrations/appMigrationMetadata.ts
View file

@ -25,7 +25,7 @@ export async function getAppMigrationVersion(appId: string): Promise<string> {
let metadata: AppMigrationDoc | undefined = await cache.get(cacheKey)
// We don't want to cache in dev or QA, in order to be able to tweak it
// We don't want to cache in dev or QA in order to be able to tweak it
if (metadata && !env.isDev() && !env.isQA()) {
return metadata.version
}

15
packages/server/src/startup/index.ts
View file

@ -20,7 +20,7 @@ import * as pro from "@budibase/pro"
import * as api from "../api"
import sdk from "../sdk"
import { initialise as initialiseWebsockets } from "../websockets"
import { automationsEnabled, printFeatures } from "../features"
import { apiEnabled, automationsEnabled, printFeatures } from "../features"
import * as jsRunner from "../jsRunner"
import Koa from "koa"
import { Server } from "http"
@ -70,13 +70,12 @@ export async function startup(
return
}
printFeatures()
if (env.BUDIBASE_ENVIRONMENT) {
console.log(`service running environment: "${env.BUDIBASE_ENVIRONMENT}"`)
}
STARTUP_RAN = true
if (app && server && !env.CLUSTER_MODE) {
let startupLog = `Budibase running on ${JSON.stringify(server.address())}`
if (env.BUDIBASE_ENVIRONMENT) {
startupLog = `${startupLog} - environment: "${env.BUDIBASE_ENVIRONMENT}"`
}
console.log(startupLog)
console.log(`Budibase running on ${JSON.stringify(server.address())}`)
const address = server.address() as AddressInfo
env._set("PORT", address.port)
}
@ -121,9 +120,11 @@ export async function startup(
queuePromises.push(events.processors.init(pro.sdk.auditLogs.write))
// app migrations and automations on other service
if (automationsEnabled()) {
queuePromises.push(appMigrations.init())
queuePromises.push(automations.init())
}
if (apiEnabled()) {
queuePromises.push(appMigrations.init())
}
queuePromises.push(initPro())
if (app) {
// bring routes online as final step once everything ready