Merge branch 'master' into lock-container-start

packages/backend-core/src/environment.ts

@@ -93,15 +93,21 @@ function isApps() {
   return environment.SERVICE_TYPE === ServiceType.APPS
 }
 
+function isQA() {
+  return environment.BUDIBASE_ENVIRONMENT === "QA"
+}
+
 const environment = {
   isTest,
   isJest,
   isDev,
   isWorker,
   isApps,
+  isQA,
   isProd: () => {
     return !isDev()
   },
+  BUDIBASE_ENVIRONMENT: process.env.BUDIBASE_ENVIRONMENT,
   JS_BCRYPT: process.env.JS_BCRYPT,
   JWT_SECRET: process.env.JWT_SECRET,
   JWT_SECRET_FALLBACK: process.env.JWT_SECRET_FALLBACK,

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

@@ -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"

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

@@ -55,6 +55,9 @@
     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,

packages/server/src/appMigrations/appMigrationMetadata.ts

@@ -25,8 +25,8 @@ export async function getAppMigrationVersion(appId: string): Promise<string> {
 
   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
   }
 

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,6 +70,9 @@ 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) {
     console.log(`Budibase running on ${JSON.stringify(server.address())}`)
@@ -117,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

packages/worker/src/environment.ts

@@ -46,6 +46,7 @@ const environment = {
   SMTP_FALLBACK_ENABLED: process.env.SMTP_FALLBACK_ENABLED,
   DISABLE_DEVELOPER_LICENSE: process.env.DISABLE_DEVELOPER_LICENSE,
   SQS_SEARCH_ENABLE: process.env.SQS_SEARCH_ENABLE,
+  BUDIBASE_ENVIRONMENT: process.env.BUDIBASE_ENVIRONMENT,
   // smtp
   SMTP_USER: process.env.SMTP_USER,
   SMTP_PASSWORD: process.env.SMTP_PASSWORD,

packages/worker/src/index.ts

@@ -88,7 +88,11 @@ const shutdown = () => {
 }
 
 export default server.listen(parseInt(env.PORT || "4002"), async () => {
-  console.log(`Worker running on ${JSON.stringify(server.address())}`)
+  let startupLog = `Worker running on ${JSON.stringify(server.address())}`
+  if (env.BUDIBASE_ENVIRONMENT) {
+    startupLog = `${startupLog} - environment: "${env.BUDIBASE_ENVIRONMENT}"`
+  }
+  console.log(startupLog)
   await initPro()
   await redis.clients.init()
   cache.docWritethrough.init()