From ae74c2498c23a1152b9b76d25717bc74c31ea75f Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 11 Jun 2024 14:38:56 +0100 Subject: [PATCH 1/5] small change to ensure that name of datasources is available in dropdown to prevent dupes --- .../controls/DataSourceSelect/DataSourceCategory.svelte | 4 ++-- .../controls/DataSourceSelect/DataSourceSelect.svelte | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte index 71de1716f2..6d0e5ef9e7 100644 --- a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte +++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte @@ -28,8 +28,8 @@ tabindex="0" on:click={() => onSelect(data)} > - - {data.label} + + {data.datasource?.name ? `${data.datasource.name} -` : ""} {data.label} ds._id === m.sourceId || m.datasourceId), })) $: viewsV1 = $viewsStore.list.map(view => ({ ...view, From f8f05a59d46869dc22f93a7917d068ab948a7046 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 11 Jun 2024 14:38:56 +0100 Subject: [PATCH 2/5] small change to ensure that name of datasources is available in dropdown to prevent dupes --- .../controls/DataSourceSelect/DataSourceCategory.svelte | 2 +- .../settings/controls/DataSourceSelect/DataSourceSelect.svelte | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte index 71de1716f2..8e4ce3b4c3 100644 --- a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte +++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte @@ -29,7 +29,7 @@ on:click={() => onSelect(data)} > - {data.label} + {data.datasource?.name ? `${data.datasource.name} -` : ""} {data.label} ds._id === m.sourceId || m.datasourceId), })) $: viewsV1 = $viewsStore.list.map(view => ({ ...view, From 2b2079b4f1233ca8415849f8a9c1ebf18e2cf0c1 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 11 Jun 2024 15:45:07 +0100 Subject: [PATCH 3/5] Moving app migrations back to API service. --- .../src/appMigrations/appMigrationMetadata.ts | 4 ++-- packages/server/src/startup/index.ts | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/packages/server/src/appMigrations/appMigrationMetadata.ts b/packages/server/src/appMigrations/appMigrationMetadata.ts index a9a75bc104..176cd0ff84 100644 --- a/packages/server/src/appMigrations/appMigrationMetadata.ts +++ b/packages/server/src/appMigrations/appMigrationMetadata.ts @@ -25,8 +25,8 @@ export async function getAppMigrationVersion(appId: string): Promise { 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 - if (metadata && !env.isDev() && !env.isQA()) { + // We don't want to cache in dev in order to be able to tweak it + if (metadata && !env.isDev()) { return metadata.version } diff --git a/packages/server/src/startup/index.ts b/packages/server/src/startup/index.ts index 7f244f6573..0e08075698 100644 --- a/packages/server/src/startup/index.ts +++ b/packages/server/src/startup/index.ts @@ -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 From c2415012c26edf83306cc301e72291ffd67df287 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 11 Jun 2024 16:02:38 +0100 Subject: [PATCH 4/5] Keep QA check for no caching of app migration info. --- packages/server/src/appMigrations/appMigrationMetadata.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/src/appMigrations/appMigrationMetadata.ts b/packages/server/src/appMigrations/appMigrationMetadata.ts index 176cd0ff84..971dde1e7a 100644 --- a/packages/server/src/appMigrations/appMigrationMetadata.ts +++ b/packages/server/src/appMigrations/appMigrationMetadata.ts @@ -25,8 +25,8 @@ export async function getAppMigrationVersion(appId: string): Promise { let metadata: AppMigrationDoc | undefined = await cache.get(cacheKey) - // We don't want to cache in dev in order to be able to tweak it - if (metadata && !env.isDev()) { + // 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 } From 9fcefb18b4adfc9da33d7a79d19ced2761e1f996 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 11 Jun 2024 16:09:13 +0100 Subject: [PATCH 5/5] Update packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte Co-authored-by: Andrew Kingston --- .../controls/DataSourceSelect/DataSourceCategory.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte index 8e4ce3b4c3..fa6f477ed9 100644 --- a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte +++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte @@ -29,7 +29,7 @@ on:click={() => onSelect(data)} > - {data.datasource?.name ? `${data.datasource.name} -` : ""} {data.label} + {data.datasource?.name ? `${data.datasource.name} - ` : ""}{data.label}