Merge branch 'develop' of github.com:Budibase/budibase into frontend-core

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.49-alpha.9",
+  "version": "1.0.49-alpha.14",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/backend-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.49-alpha.9",
+  "version": "1.0.49-alpha.14",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",

packages/backend-core/src/security/roles.js

@@ -146,8 +146,9 @@ exports.getRole = async roleId => {
  * Simple function to get all the roles based on the top level user role ID.
  */
 async function getAllUserRoles(userRoleId) {
-  if (!userRoleId) {
+  // admins have access to all roles
-    return [BUILTIN_IDS.BASIC]
+  if (userRoleId === BUILTIN_IDS.ADMIN) {
+    return exports.getAllRoles()
   }
   let currentRole = await exports.getRole(userRoleId)
   let roles = currentRole ? [currentRole] : []

packages/backend-core/src/utils.js

@@ -256,7 +256,7 @@ exports.saveUser = async (
 exports.platformLogout = async ({ ctx, userId, keepActiveSession }) => {
   if (!ctx) throw new Error("Koa context must be supplied to logout.")
 
-  const currentSession = this.getCookie(ctx, Cookies.Auth)
+  const currentSession = exports.getCookie(ctx, Cookies.Auth)
   let sessions = await getUserSessions(userId)
 
   if (keepActiveSession) {
@@ -265,8 +265,8 @@ exports.platformLogout = async ({ ctx, userId, keepActiveSession }) => {
     )
   } else {
     // clear cookies
-    this.clearCookie(ctx, Cookies.Auth)
+    exports.clearCookie(ctx, Cookies.Auth)
-    this.clearCookie(ctx, Cookies.CurrentApp)
+    exports.clearCookie(ctx, Cookies.CurrentApp)
   }
 
   await invalidateSessions(

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.49-alpha.9",
+  "version": "1.0.49-alpha.14",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",

packages/bbui/src/Table/InternalRenderer.svelte

@@ -8,9 +8,34 @@
     copyToClipboard(value)
   }
 
-  function copyToClipboard(value) {
+  const copyToClipboard = value => {
-    navigator.clipboard.writeText(value).then(() => {
+    return new Promise(res => {
-      notifications.success("Copied")
+      if (navigator.clipboard && window.isSecureContext) {
+        // Try using the clipboard API first
+        navigator.clipboard.writeText(value).then(res)
+      } else {
+        // Fall back to the textarea hack
+        let textArea = document.createElement("textarea")
+        textArea.value = value
+        textArea.style.position = "fixed"
+        textArea.style.left = "-9999px"
+        textArea.style.top = "-9999px"
+        document.body.appendChild(textArea)
+        textArea.focus()
+        textArea.select()
+        document.execCommand("copy")
+        textArea.remove()
+        res()
+      }
+    })
+      .then(() => {
+        notifications.success("Copied to clipboard")
+      })
+      .catch(() => {
+        notifications.error(
+          "Failed to copy to clipboard. Check the dev console for the value."
+        )
+        console.warn("Failed to copy the value", value)
       })
   }
 </script>

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.49-alpha.9",
+  "version": "1.0.49-alpha.14",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -64,10 +64,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.49-alpha.9",
+    "@budibase/bbui": "^1.0.49-alpha.14",
-    "@budibase/client": "^1.0.49-alpha.9",
+    "@budibase/client": "^1.0.49-alpha.14",
-    "@budibase/frontend-core": "^1.0.49-alpha.9",
+    "@budibase/frontend-core": "^1.0.49-alpha.14",
-    "@budibase/string-templates": "^1.0.49-alpha.9",
+    "@budibase/string-templates": "^1.0.49-alpha.14",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/builder/src/builderStore/store/frontend.js

@@ -64,6 +64,9 @@ export const getFrontendStore = () => {
   const store = writable({ ...INITIAL_FRONTEND_STATE })
 
   store.actions = {
+    reset: () => {
+      store.set({ ...INITIAL_FRONTEND_STATE })
+    },
     initialise: async pkg => {
       const { layouts, screens, application, clientLibPath } = pkg
 

packages/builder/src/pages/builder/app/[application]/_layout.svelte

@@ -12,7 +12,7 @@
   import Logo from "assets/bb-emblem.svg"
   import { capitalise } from "helpers"
   import UpgradeModal from "components/upgrade/UpgradeModal.svelte"
-  import { onMount } from "svelte"
+  import { onMount, onDestroy } from "svelte"
 
   export let application
 
@@ -73,6 +73,10 @@
       hasSynced = true
     }
   })
+
+  onDestroy(() => {
+    store.actions.reset()
+  })
 </script>
 
 {#await promise}

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.49-alpha.9",
+  "version": "1.0.49-alpha.14",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {

packages/cli/yarn.lock

@@ -1583,9 +1583,9 @@ simple-concat@^1.0.0:
   integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==
 
 simple-get@^3.0.3:
-  version "3.1.0"
+  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3"
+  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.1.tgz#cc7ba77cfbe761036fbfce3d021af25fc5584d55"
-  integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==
+  integrity sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==
   dependencies:
     decompress-response "^4.2.0"
     once "^1.3.1"

packages/client/manifest.json

@@ -2537,6 +2537,11 @@
         "label": "Placeholder",
         "key": "placeholder"
       },
+      {
+        "type": "text",
+        "label": "Default value",
+        "key": "defaultValue"
+      },
       {
         "type": "boolean",
         "label": "Autocomplete",

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.49-alpha.9",
+  "version": "1.0.49-alpha.14",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.49-alpha.9",
+    "@budibase/bbui": "^1.0.49-alpha.14",
-    "@budibase/frontend-core": "^1.0.49-alpha.9",
+    "@budibase/frontend-core": "^1.0.49-alpha.14",
-    "@budibase/string-templates": "^1.0.49-alpha.9",
+    "@budibase/string-templates": "^1.0.49-alpha.14",
     "regexparam": "^1.3.0",
     "rollup-plugin-polyfill-node": "^0.8.0",
     "shortid": "^2.2.15",

packages/client/src/components/app/forms/RelationshipField.svelte

@@ -12,6 +12,7 @@
   export let disabled = false
   export let validation
   export let autocomplete = false
+  export let defaultValue
 
   let fieldState
   let fieldApi
@@ -27,6 +28,7 @@
   $: singleValue = flatten(fieldState?.value)?.[0]
   $: multiValue = flatten(fieldState?.value) ?? []
   $: component = multiselect ? CoreMultiselect : CoreSelect
+  $: expandedDefaultValue = expand(defaultValue)
 
   const fetchTable = async id => {
     if (id) {
@@ -66,6 +68,16 @@
   const multiHandler = e => {
     fieldApi.setValue(e.detail)
   }
+
+  const expand = values => {
+    if (!values) {
+      return []
+    }
+    if (Array.isArray(values)) {
+      return values
+    }
+    return values.split(",").map(value => value.trim())
+  }
 </script>
 
 <Field
@@ -73,11 +85,11 @@
   {field}
   {disabled}
   {validation}
+  defaultValue={expandedDefaultValue}
   type={FieldTypes.LINK}
   bind:fieldState
   bind:fieldApi
   bind:fieldSchema
-  defaultValue={[]}
 >
   {#if fieldState}
     <svelte:component

packages/frontend-core/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.49-alpha.9",
+  "version": "1.0.49-alpha.14",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.49-alpha.9",
+    "@budibase/bbui": "^1.0.49-alpha.14",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.49-alpha.9",
+  "version": "1.0.49-alpha.14",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,9 +70,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.49-alpha.9",
+    "@budibase/backend-core": "^1.0.49-alpha.14",
-    "@budibase/client": "^1.0.49-alpha.9",
+    "@budibase/client": "^1.0.49-alpha.14",
-    "@budibase/string-templates": "^1.0.49-alpha.9",
+    "@budibase/string-templates": "^1.0.49-alpha.14",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",

packages/server/scripts/integrations/mssql/data/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/mssql/server
+FROM mcr.microsoft.com/mssql/server:2017-latest
 
 ENV ACCEPT_EULA=Y
 ENV SA_PASSWORD=Passw0rd

packages/server/scripts/integrations/mssql/data/setup.sql

@@ -48,7 +48,20 @@ INSERT tasks
 VALUES
   ('Processing', 1);
 
-INSERT people
+INSERT INTO people (name, age)
-  (name, age)
+VALUES ('Bob', '30'),
-VALUES
+  ('Bert', '10'),
-  ('Bob', '30');
+  ('Jack', '12'),
+  ('Mike', '31'),
+  ('Dave', '44'),
+  ('Jim', '43'),
+  ('Kerry', '32'),
+  ('Julie', '12'),
+  ('Kim', '55'),
+  ('Andy', '33'),
+  ('John', '22'),
+  ('Ruth', '66'),
+  ('Robert', '88'),
+  ('Bobert', '99'),
+  ('Jan', '22'),
+  ('Megan', '11');

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

@@ -16,7 +16,7 @@ const { clientLibraryPath } = require("../../../utilities")
 const { upload } = require("../../../utilities/fileSystem")
 const { attachmentsRelativeURL } = require("../../../utilities")
 const { DocumentTypes } = require("../../../db/utils")
-const { getAppDB } = require("@budibase/backend-core/context")
+const { getAppDB, updateAppId } = require("@budibase/backend-core/context")
 const AWS = require("aws-sdk")
 const AWS_REGION = env.AWS_REGION ? env.AWS_REGION : "eu-west-1"
 
@@ -49,11 +49,9 @@ async function getAppIdFromUrl(ctx) {
     a => a.url && a.url.toLowerCase() === possibleAppUrl
   )[0]
 
-  if (app && app.appId) {
+  const appId = app && app.appId ? app.appId : ctx.params.appId
-    return app.appId
+  updateAppId(appId)
-  } else {
+  return appId
-    return ctx.params.appId
-  }
 }
 
 exports.serveBuilder = async function (ctx) {

packages/server/src/api/controllers/user.js

@@ -14,7 +14,7 @@ const {
   dbExists,
 } = require("@budibase/backend-core/db")
 const { UserStatus } = require("@budibase/backend-core/constants")
-const { getAppDB } = require("@budibase/backend-core/context")
+const { getAppDB, doInAppContext } = require("@budibase/backend-core/context")
 
 async function rawMetadata() {
   const db = getAppDB()
@@ -105,6 +105,7 @@ exports.syncUser = async function (ctx) {
       if (!(await dbExists(appId))) {
         continue
       }
+      await doInAppContext(appId, async () => {
         const db = getAppDB()
         const metadataId = generateUserMetadataID(userId)
         let metadata
@@ -112,7 +113,7 @@ exports.syncUser = async function (ctx) {
           metadata = await db.get(metadataId)
         } catch (err) {
           if (deleting) {
-          continue
+            return
           }
           metadata = {
             tableId: InternalTables.USER_METADATA,
@@ -133,6 +134,7 @@ exports.syncUser = async function (ctx) {
         if (combined) {
           await db.put(combined)
         }
+      })
     }
   }
   ctx.body = {

packages/server/src/integrations/base/sql.ts

@@ -166,15 +166,13 @@ class InternalBuilder {
 
   addSorting(query: KnexQuery, json: QueryJson): KnexQuery {
     let { sort, paginate } = json
-    if (!sort) {
-      return query
-    }
     const table = json.meta?.table
+    if (sort) {
       for (let [key, value] of Object.entries(sort)) {
         const direction = value === SortDirection.ASCENDING ? "asc" : "desc"
         query = query.orderBy(`${table?.name}.${key}`, direction)
       }
-    if (this.client === SqlClients.MS_SQL && !sort && paginate?.limit) {
+    } else if (this.client === SqlClients.MS_SQL && paginate?.limit) {
       // @ts-ignore
       query = query.orderBy(`${table?.name}.${table?.primary[0]}`)
     }

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.49-alpha.9",
+  "version": "1.0.49-alpha.14",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.49-alpha.9",
+  "version": "1.0.49-alpha.14",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -34,8 +34,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.49-alpha.9",
+    "@budibase/backend-core": "^1.0.49-alpha.14",
-    "@budibase/string-templates": "^1.0.49-alpha.9",
+    "@budibase/string-templates": "^1.0.49-alpha.14",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",