Merge remote-tracking branch 'origin/master' into fix/bindings-fixes

.github/workflows/release-develop.yml

@@ -48,18 +48,7 @@ jobs:
 
       - run: yarn install --frozen-lockfile
       - name: Update versions
-        run: |
-          version=$(cat lerna.json \
-            | grep version \
-            | head -1 \
-            | awk -F: '{gsub(/"/,"",$2);gsub(/[[:space:]]*/,"",$2); print $2}' \
-            | sed 's/[",]//g')
-          echo "Setting version $version"
-          yarn lerna exec "yarn version --no-git-tag-version --new-version=$version"
-          echo "Updating dependencies"
-          node scripts/syncLocalDependencies.js $version
-          echo "Syncing yarn workspace"
-          yarn
+        run: ./scripts/updateVersions.sh
       - run: yarn build
       - run: yarn build:sdk
 

.github/workflows/release-master.yml

@@ -41,18 +41,7 @@ jobs:
 
       - run: yarn install --frozen-lockfile
       - name: Update versions
-        run: |
-          version=$(cat lerna.json \
-            | grep version \
-            | head -1 \
-            | awk -F: '{gsub(/"/,"",$2);gsub(/[[:space:]]*/,"",$2); print $2}' \
-            | sed 's/[",]//g')
-          echo "Setting version $version"
-          yarn lerna exec "yarn version --no-git-tag-version --new-version=$version"
-          echo "Updating dependencies"
-          node scripts/syncLocalDependencies.js $version
-          echo "Syncing yarn workspace"
-          yarn
+        run: ./scripts/updateVersions.sh
       - run: yarn lint
       - run: yarn build
       - run: yarn build:sdk

.github/workflows/release-selfhost.yml

@@ -17,6 +17,8 @@ jobs:
 
       - uses: actions/checkout@v2
         with:
+          submodules: true
+          token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
           fetch-depth: 0
 
       - name: Fail if tag is not in master

.github/workflows/release-singleimage.yml

@@ -5,7 +5,7 @@ on:
 
 env:
   CI: true
-  PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+  PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
   REGISTRY_URL: registry.hub.docker.com
 jobs:
   build:
@@ -24,6 +24,8 @@ jobs:
       - name: "Checkout"
         uses: actions/checkout@v2
         with:
+          submodules: true
+          token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
           fetch-depth: 0
 
       - name: Fail if tag is not in master
@@ -32,7 +34,7 @@ jobs:
             echo "Tag is not in master. This pipeline can only execute tags that are present on the master branch"
             exit 1
           fi
-          
+
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v1
         with:
@@ -44,10 +46,12 @@ jobs:
         uses: docker/setup-buildx-action@v1
       - name: Run Yarn
         run: yarn
-      - name: Run Yarn Bootstrap
-        run: yarn bootstrap
+      - name: Update versions
+        run: ./scripts/updateVersions.sh
       - name: Runt Yarn Lint
         run: yarn lint
+      - name: Update versions
+        run: ./scripts/updateVersions.sh
       - name: Run Yarn Build
         run: yarn build:docker:pre
       - name: Login to Docker Hub

hosting/single/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16-slim as build
+FROM node:14-slim as build
 
 # install node-gyp dependencies
 RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends apt-utils cron g++ make python
@@ -12,13 +12,15 @@ RUN chmod +x /cleanup.sh
 WORKDIR /app
 ADD packages/server .
 COPY yarn.lock .
-RUN yarn install --production=true && /cleanup.sh
+RUN yarn install --production=true
+RUN /cleanup.sh
 
 # build worker
 WORKDIR /worker
 ADD packages/worker .
 COPY yarn.lock .
-RUN yarn install --production=true && /cleanup.sh
+RUN yarn install --production=true
+RUN /cleanup.sh
 
 FROM budibase/couchdb
 ARG TARGETARCH

hosting/single/runner.sh

@@ -17,6 +17,7 @@ declare -a DOCKER_VARS=("APP_PORT" "APPS_URL" "ARCHITECTURE" "BUDIBASE_ENVIRONME
 [[ -z "${WORKER_PORT}" ]] && export WORKER_PORT=4002
 [[ -z "${WORKER_URL}" ]] && export WORKER_URL=http://localhost:4002
 [[ -z "${APPS_URL}" ]] && export APPS_URL=http://localhost:4001
+[[ -z "${SERVER_TOP_LEVEL_PATH}" ]] && export SERVER_TOP_LEVEL_PATH=/app
 #  export CUSTOM_DOMAIN=budi001.custom.com
 
 # Azure App Service customisations

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.7.4",
+  "version": "2.7.9",
   "npmClient": "yarn",
   "packages": [
     "packages/backend-core",

packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte

@@ -37,7 +37,7 @@
   }
 
   async function saveDatasource() {
-    if (integration.features[DatasourceFeature.CONNECTION_CHECKING]) {
+    if (integration.features?.[DatasourceFeature.CONNECTION_CHECKING]) {
       const valid = await validateConfig()
       if (!valid) {
         return false

packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte

@@ -65,7 +65,7 @@
   }
 
   const saveDatasource = async () => {
-    if (integration.features[DatasourceFeature.CONNECTION_CHECKING]) {
+    if (integration.features?.[DatasourceFeature.CONNECTION_CHECKING]) {
       const valid = await validateConfig()
       if (!valid) {
         return false

packages/server/Dockerfile

@@ -14,7 +14,7 @@ ENV SERVICE=app-service
 ENV POSTHOG_TOKEN=phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU
 ENV TENANT_FEATURE_FLAGS=*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR
 ENV ACCOUNT_PORTAL_URL=https://account.budibase.app
-
+ENV TOP_LEVEL_PATH=/
 
 # handle node-gyp
 RUN apt-get update \

packages/server/src/api/controllers/static/index.ts

@@ -1,6 +1,6 @@
 require("svelte/register")
 
-import { resolve, join } from "../../../utilities/centralPath"
+import { join } from "../../../utilities/centralPath"
 const uuid = require("uuid")
 import { ObjectStoreBuckets } from "../../../constants"
 import { processString } from "@budibase/string-templates"
@@ -49,7 +49,7 @@ export const toggleBetaUiFeature = async function (ctx: any) {
     return
   }
 
-  let builderPath = resolve(TOP_LEVEL_PATH, "new_design_ui")
+  let builderPath = join(TOP_LEVEL_PATH, "new_design_ui")
 
   // // download it from S3
   if (!fs.existsSync(builderPath)) {
@@ -67,7 +67,7 @@ export const toggleBetaUiFeature = async function (ctx: any) {
 }
 
 export const serveBuilder = async function (ctx: any) {
-  const builderPath = resolve(TOP_LEVEL_PATH, "builder")
+  const builderPath = join(TOP_LEVEL_PATH, "builder")
   await send(ctx, ctx.file, { root: builderPath })
 }
 

packages/server/src/api/controllers/table/external.ts

@@ -208,6 +208,7 @@ export async function save(ctx: UserCtx) {
   let tableToSave: TableRequest = {
     type: "table",
     _id: buildExternalTableId(datasourceId, inputs.name),
+    sourceId: datasourceId,
     ...inputs,
   }
 

packages/server/src/environment.ts

@@ -98,7 +98,8 @@ const environment = {
   isInThread: () => {
     return process.env.FORKED_PROCESS
   },
-  TOP_LEVEL_PATH: process.env.TOP_LEVEL_PATH,
+  TOP_LEVEL_PATH:
+    process.env.TOP_LEVEL_PATH || process.env.SERVER_TOP_LEVEL_PATH,
 }
 
 // threading can cause memory issues with node-ts in development

packages/server/src/sdk/app/datasources/datasources.ts

@@ -135,7 +135,7 @@ export function mergeConfigs(update: Datasource, old: Datasource) {
   // specific to REST datasources, fix the auth configs again if required
   if (hasAuthConfigs(update)) {
     const configs = update.config.authConfigs as RestAuthConfig[]
-    const oldConfigs = old.config?.authConfigs as RestAuthConfig[]
+    const oldConfigs = (old.config?.authConfigs as RestAuthConfig[]) || []
     for (let config of configs) {
       if (config.type !== RestAuthType.BASIC) {
         continue

packages/server/src/utilities/fileSystem/filesystem.ts

@@ -1,14 +1,14 @@
 import { PathLike } from "fs"
 import fs from "fs"
 import { budibaseTempDir } from "../budibaseDir"
-import { join } from "path"
+import { resolve, join } from "path"
 import env from "../../environment"
 import tar from "tar"
 import environment from "../../environment"
 const uuid = require("uuid/v4")
 
 export const TOP_LEVEL_PATH =
-  environment.TOP_LEVEL_PATH || join(__dirname, "..", "..", "..")
+  environment.TOP_LEVEL_PATH || resolve(join(__dirname, "..", "..", ".."))
 
 /**
  * Upon first startup of instance there may not be everything we need in tmp directory, set it up.

packages/worker/package.json

@@ -104,4 +104,4 @@
     "update-dotenv": "1.1.1"
   },
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
-}
+}

scripts/resetVersions.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+echo "Resetting package versions"
+yarn lerna exec "yarn version --no-git-tag-version --new-version=0.0.0"
+echo "Updating dependencies"
+node scripts/syncLocalDependencies.js "0.0.0"
+git checkout package.json
+echo "Package versions reset!"

scripts/updateVersions.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+version=$(cat lerna.json \
+  | grep version \
+  | head -1 \
+  | awk -F: '{gsub(/"/,"",$2);gsub(/[[:space:]]*/,"",$2); print $2}' \
+  | sed 's/[",]//g')
+echo "Setting version $version"
+yarn lerna exec "yarn version --no-git-tag-version --new-version=$version"
+echo "Updating dependencies"
+node scripts/syncLocalDependencies.js $version
+echo "Syncing yarn workspace"
+yarn