Merge branch 'develop' of github.com:Budibase/budibase into fix/patch-relationships

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.81-alpha.1",
+  "version": "1.0.81-alpha.7",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/backend-core/package.json

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

packages/backend-core/src/cloud/accounts.js

@@ -22,3 +22,18 @@ exports.getAccount = async email => {
 
   return json[0]
 }
+
+exports.getStatus = async () => {
+  const response = await api.get(`/api/status`, {
+    headers: {
+      [Headers.API_KEY]: env.ACCOUNT_PORTAL_API_KEY,
+    },
+  })
+  const json = await response.json()
+
+  if (response.status !== 200) {
+    throw new Error(`Error getting status`)
+  }
+
+  return json
+}

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.80-alpha.5",
+  "version": "1.0.81-alpha.7",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^1.0.80-alpha.5",
+    "@budibase/string-templates": "^1.0.81-alpha.7",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",

packages/bbui/src/Banner/Banner.svelte

@@ -57,3 +57,10 @@
     </div>
   </div>
 {/if}
+
+<style>
+  .spectrum-Toast {
+    pointer-events: all;
+    width: 100%;
+  }
+</style>

packages/bbui/src/Banner/BannerDisplay.svelte

@@ -0,0 +1,31 @@
+<script>
+  import "@spectrum-css/toast/dist/index-vars.css"
+  import Portal from "svelte-portal"
+  import { banner } from "../Stores/banner"
+  import Banner from "./Banner.svelte"
+  import { fly } from "svelte/transition"
+</script>
+
+<Portal target=".banner-container">
+  <div class="banner">
+    {#if $banner.message}
+      <div transition:fly={{ y: -30 }}>
+        <Banner
+          type={$banner.type}
+          extraButtonText={$banner.extraButtonText}
+          extraButtonAction={$banner.extraButtonAction}
+          on:change={$banner.onChange}
+        >
+          {$banner.message}
+        </Banner>
+      </div>
+    {/if}
+  </div>
+</Portal>
+
+<style>
+  .banner {
+    pointer-events: none;
+    width: 100%;
+  }
+</style>

packages/bbui/src/Stores/banner.js

@@ -0,0 +1,37 @@
+import { writable } from "svelte/store"
+
+export function createBannerStore() {
+  const DEFAULT_CONFIG = {}
+
+  const banner = writable(DEFAULT_CONFIG)
+
+  const show = async (
+    // eslint-disable-next-line
+    config = { message, type, extraButtonText, extraButtonAction, onChange }
+  ) => {
+    banner.update(store => {
+      return {
+        ...store,
+        ...config,
+      }
+    })
+  }
+
+  const showStatus = async () => {
+    const config = {
+      message: "Some systems are experiencing issues",
+      type: "negative",
+      extraButtonText: "View Status",
+      extraButtonAction: () => window.open("https://status.budibase.com/"),
+    }
+
+    await show(config)
+  }
+
+  return {
+    subscribe: banner.subscribe,
+    showStatus,
+  }
+}
+
+export const banner = createBannerStore()

packages/bbui/src/Stores/notifications.js

@@ -60,7 +60,7 @@ export const createNotificationStore = () => {
 }
 
 function id() {
-  return "_" + Math.random().toString(36).substr(2, 9)
+  return "_" + Math.random().toString(36).slice(2, 9)
 }
 
 export const notifications = createNotificationStore()

packages/bbui/src/Tabs/Tabs.svelte

@@ -68,7 +68,7 @@
   })
 
   function id() {
-    return "_" + Math.random().toString(36).substr(2, 9)
+    return "_" + Math.random().toString(36).slice(2, 9)
   }
 </script>
 

packages/bbui/src/index.js

@@ -60,6 +60,7 @@ export { default as StatusLight } from "./StatusLight/StatusLight.svelte"
 export { default as ColorPicker } from "./ColorPicker/ColorPicker.svelte"
 export { default as InlineAlert } from "./InlineAlert/InlineAlert.svelte"
 export { default as Banner } from "./Banner/Banner.svelte"
+export { default as BannerDisplay } from "./Banner/BannerDisplay.svelte"
 export { default as MarkdownEditor } from "./Markdown/MarkdownEditor.svelte"
 export { default as MarkdownViewer } from "./Markdown/MarkdownViewer.svelte"
 export { default as RichTextField } from "./Form/RichTextField.svelte"
@@ -84,6 +85,7 @@ export { default as clickOutside } from "./Actions/click_outside"
 
 // Stores
 export { notifications, createNotificationStore } from "./Stores/notifications"
+export { banner } from "./Stores/banner"
 
 // Helpers
 export * as Helpers from "./helpers"

packages/builder/package.json

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

packages/builder/src/App.svelte

@@ -1,13 +1,16 @@
 <script>
   import { Router } from "@roxi/routify"
   import { routes } from "../.routify/routes"
-  import { NotificationDisplay } from "@budibase/bbui"
+  import { NotificationDisplay, BannerDisplay } from "@budibase/bbui"
   import { parse, stringify } from "qs"
   import HelpIcon from "components/common/HelpIcon.svelte"
 
   const queryHandler = { parse, stringify }
 </script>
 
+<div class="banner-container" />
+<BannerDisplay />
+
 <NotificationDisplay />
 <Router {routes} config={{ queryHandler }} />
 <div class="modal-container" />

packages/builder/src/pages/builder/portal/manage/users/_components/BasicOnboardingModal.svelte

@@ -11,7 +11,7 @@
   import { users } from "stores/portal"
 
   const [email, error, touched] = createValidationStore("", emailValidator)
-  const password = Math.random().toString(36).substr(2, 20)
+  const password = Math.random().toString(36).slice(2, 20)
   let builder = false,
     admin = false
 

packages/builder/src/pages/builder/portal/manage/users/_components/ForceResetPasswordModal.svelte

@@ -7,7 +7,7 @@
 
   export let user
 
-  const password = Math.random().toString(36).substr(2, 20)
+  const password = Math.random().toString(36).slice(2, 20)
 
   async function resetPassword() {
     try {

packages/builder/src/stores/backend/tables.js

@@ -14,6 +14,7 @@ export function createTablesStore() {
       ...state,
       list: tables,
     }))
+    return tables
   }
 
   async function select(table) {

packages/builder/src/stores/portal/admin.js

@@ -1,6 +1,7 @@
 import { writable, get } from "svelte/store"
 import { API } from "api"
 import { auth } from "stores/portal"
+import { banner } from "@budibase/bbui"
 
 export function createAdminStore() {
   const DEFAULT_CONFIG = {
@@ -30,6 +31,13 @@ export function createAdminStore() {
       x => x?.checked
     ).length
     await getEnvironment()
+
+    // enable system status checks in the cloud
+    if (get(admin).cloud) {
+      await getSystemStatus()
+      checkStatus()
+    }
+
     admin.update(store => {
       store.loaded = true
       store.checklist = checklist
@@ -58,6 +66,21 @@ export function createAdminStore() {
     })
   }
 
+  const checkStatus = async () => {
+    const health = get(admin)?.status?.health
+    if (!health?.passing) {
+      await banner.showStatus()
+    }
+  }
+
+  async function getSystemStatus() {
+    const status = await API.getSystemStatus()
+    admin.update(store => {
+      store.status = status
+      return store
+    })
+  }
+
   function unload() {
     admin.update(store => {
       store.loaded = false

packages/cli/package.json

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

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.80-alpha.5",
+  "version": "1.0.81-alpha.7",
   "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.80-alpha.5",
+    "@budibase/bbui": "^1.0.81-alpha.7",
-    "@budibase/frontend-core": "^1.0.80-alpha.5",
+    "@budibase/frontend-core": "^1.0.81-alpha.7",
-    "@budibase/string-templates": "^1.0.80-alpha.5",
+    "@budibase/string-templates": "^1.0.81-alpha.7",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",

packages/frontend-core/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.80-alpha.5",
+  "version": "1.0.81-alpha.7",
   "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.80-alpha.5",
+    "@budibase/bbui": "^1.0.81-alpha.7",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }

packages/frontend-core/src/api/other.js

@@ -17,6 +17,15 @@ export const buildOtherEndpoints = API => ({
     })
   },
 
+  /**
+   * Gets the current system status.
+   */
+  getSystemStatus: async () => {
+    return await API.get({
+      url: "/api/system/status",
+    })
+  },
+
   /**
    * Gets the list of available integrations.
    */

packages/server/package.json

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

packages/server/scripts/docs/toSwagger.js

@@ -51,7 +51,7 @@ function extractPaths(apidocJson) {
     // Surrounds URL parameters with curly brackets -> :email with {email}
     let pathKeys = []
     for (let j = 1; j < matches.length; j++) {
-      let key = matches[j].substr(1)
+      let key = matches[j].slice(1)
       url = url.replace(matches[j], "{" + key + "}")
       pathKeys.push(key)
     }

packages/server/specs/openapi.json

@@ -503,6 +503,71 @@
           "data"
         ]
       },
+      "applicationSearch": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "name": {
+                  "description": "The name of the app.",
+                  "type": "string"
+                },
+                "url": {
+                  "description": "The URL by which the app is accessed, this must be URL encoded.",
+                  "type": "string"
+                },
+                "_id": {
+                  "description": "The ID of the app.",
+                  "type": "string"
+                },
+                "status": {
+                  "description": "The status of the app, stating it if is the development or published version.",
+                  "type": "string",
+                  "enum": [
+                    "development",
+                    "published"
+                  ]
+                },
+                "createdAt": {
+                  "description": "States when the app was created, will be constant. Stored in ISO format.",
+                  "type": "string"
+                },
+                "updatedAt": {
+                  "description": "States the last time the app was updated - stored in ISO format.",
+                  "type": "string"
+                },
+                "version": {
+                  "description": "States the version of the Budibase client this app is currently based on.",
+                  "type": "string"
+                },
+                "tenantId": {
+                  "description": "In a multi-tenant environment this will state the tenant this app is within.",
+                  "type": "string"
+                },
+                "lockedBy": {
+                  "description": "The user this app is currently being built by.",
+                  "type": "object"
+                }
+              },
+              "required": [
+                "_id",
+                "name",
+                "url",
+                "status",
+                "createdAt",
+                "updatedAt",
+                "version"
+              ]
+            }
+          }
+        },
+        "required": [
+          "data"
+        ]
+      },
       "row": {
         "description": "The row to be created/updated, based on the table schema.",
         "type": "object",
@@ -980,6 +1045,221 @@
           "data"
         ]
       },
+      "tableSearch": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "description": "The table to be created/updated.",
+              "type": "object",
+              "required": [
+                "name",
+                "schema",
+                "_id"
+              ],
+              "properties": {
+                "name": {
+                  "description": "The name of the table.",
+                  "type": "string"
+                },
+                "primaryDisplay": {
+                  "type": "string",
+                  "description": "The name of the column which should be used in relationship tags when relating to this table."
+                },
+                "schema": {
+                  "type": "object",
+                  "additionalProperties": {
+                    "oneOf": [
+                      {
+                        "type": "object",
+                        "properties": {
+                          "type": {
+                            "type": "string",
+                            "enum": [
+                              "link"
+                            ],
+                            "description": "A relationship column."
+                          },
+                          "constraints": {
+                            "type": "object",
+                            "description": "A constraint can be applied to the column which will be validated against when a row is saved.",
+                            "properties": {
+                              "type": {
+                                "type": "string",
+                                "enum": [
+                                  "string",
+                                  "number",
+                                  "object",
+                                  "boolean"
+                                ]
+                              },
+                              "presence": {
+                                "type": "boolean",
+                                "description": "Defines whether the column is required or not."
+                              }
+                            }
+                          },
+                          "name": {
+                            "type": "string",
+                            "description": "The name of the column."
+                          },
+                          "autocolumn": {
+                            "type": "boolean",
+                            "description": "Defines whether the column is automatically generated."
+                          },
+                          "fieldName": {
+                            "type": "string",
+                            "description": "The name of the column which a relationship column is related to in another table."
+                          },
+                          "tableId": {
+                            "type": "string",
+                            "description": "The ID of the table which a relationship column is related to."
+                          },
+                          "relationshipType": {
+                            "type": "string",
+                            "enum": [
+                              "one-to-many",
+                              "many-to-one",
+                              "many-to-many"
+                            ],
+                            "description": "Defines the type of relationship that this column will be used for."
+                          },
+                          "through": {
+                            "type": "string",
+                            "description": "When using a SQL table that contains many to many relationships this defines the table the relationships are linked through."
+                          },
+                          "foreignKey": {
+                            "type": "string",
+                            "description": "When using a SQL table that contains a one to many relationship this defines the foreign key."
+                          },
+                          "throughFrom": {
+                            "type": "string",
+                            "description": "When using a SQL table that utilises a through table, this defines the primary key in the through table for this table."
+                          },
+                          "throughTo": {
+                            "type": "string",
+                            "description": "When using a SQL table that utilises a through table, this defines the primary key in the through table for the related table."
+                          }
+                        }
+                      },
+                      {
+                        "type": "object",
+                        "properties": {
+                          "type": {
+                            "type": "string",
+                            "enum": [
+                              "formula"
+                            ],
+                            "description": "A formula column."
+                          },
+                          "constraints": {
+                            "type": "object",
+                            "description": "A constraint can be applied to the column which will be validated against when a row is saved.",
+                            "properties": {
+                              "type": {
+                                "type": "string",
+                                "enum": [
+                                  "string",
+                                  "number",
+                                  "object",
+                                  "boolean"
+                                ]
+                              },
+                              "presence": {
+                                "type": "boolean",
+                                "description": "Defines whether the column is required or not."
+                              }
+                            }
+                          },
+                          "name": {
+                            "type": "string",
+                            "description": "The name of the column."
+                          },
+                          "autocolumn": {
+                            "type": "boolean",
+                            "description": "Defines whether the column is automatically generated."
+                          },
+                          "formula": {
+                            "type": "string",
+                            "description": "Defines a Handlebars or JavaScript formula to use, note that Javascript formulas are expected to be provided in the base64 format."
+                          },
+                          "formulaType": {
+                            "type": "string",
+                            "enum": [
+                              "static",
+                              "dynamic"
+                            ],
+                            "description": "Defines whether this is a static or dynamic formula."
+                          }
+                        }
+                      },
+                      {
+                        "type": "object",
+                        "properties": {
+                          "type": {
+                            "type": "string",
+                            "enum": [
+                              "string",
+                              "longform",
+                              "options",
+                              "number",
+                              "boolean",
+                              "array",
+                              "datetime",
+                              "attachment",
+                              "link",
+                              "formula",
+                              "auto",
+                              "json",
+                              "internal"
+                            ],
+                            "description": "Defines the type of the column, most explain themselves, a link column is a relationship."
+                          },
+                          "constraints": {
+                            "type": "object",
+                            "description": "A constraint can be applied to the column which will be validated against when a row is saved.",
+                            "properties": {
+                              "type": {
+                                "type": "string",
+                                "enum": [
+                                  "string",
+                                  "number",
+                                  "object",
+                                  "boolean"
+                                ]
+                              },
+                              "presence": {
+                                "type": "boolean",
+                                "description": "Defines whether the column is required or not."
+                              }
+                            }
+                          },
+                          "name": {
+                            "type": "string",
+                            "description": "The name of the column."
+                          },
+                          "autocolumn": {
+                            "type": "boolean",
+                            "description": "Defines whether the column is automatically generated."
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                "_id": {
+                  "description": "The ID of the table.",
+                  "type": "string"
+                }
+              }
+            }
+          }
+        },
+        "required": [
+          "data"
+        ]
+      },
       "executeQuery": {
         "description": "The query body must contain the required parameters for the query, this depends on query type, setup and bindings.",
         "type": "object",
@@ -1074,6 +1354,71 @@
           "_id"
         ]
       },
+      "querySearch": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "_id": {
+                  "description": "The ID of the query.",
+                  "type": "string"
+                },
+                "datasourceId": {
+                  "description": "The ID of the data source the query belongs to.",
+                  "type": "string"
+                },
+                "parameters": {
+                  "description": "The bindings which are required to perform this query.",
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                },
+                "fields": {
+                  "description": "The fields that are used to perform this query, e.g. the sql statement",
+                  "type": "object"
+                },
+                "queryVerb": {
+                  "description": "The verb that describes this query.",
+                  "enum": [
+                    "create",
+                    "read",
+                    "update",
+                    "delete"
+                  ]
+                },
+                "name": {
+                  "description": "The name of the query.",
+                  "type": "string"
+                },
+                "schema": {
+                  "description": "The schema of the data returned when the query is executed.",
+                  "type": "object"
+                },
+                "transformer": {
+                  "description": "The JavaScript transformer function, applied after the query responds with data.",
+                  "type": "string"
+                },
+                "readable": {
+                  "description": "Whether the query has readable data.",
+                  "type": "boolean"
+                }
+              },
+              "required": [
+                "name",
+                "schema",
+                "_id"
+              ]
+            }
+          }
+        },
+        "required": [
+          "data"
+        ]
+      },
       "user": {
         "type": "object",
         "properties": {
@@ -1215,6 +1560,86 @@
           "data"
         ]
       },
+      "userSearch": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "email": {
+                  "description": "The email address of the user, this must be unique.",
+                  "type": "string"
+                },
+                "password": {
+                  "description": "The password of the user if using password based login - this will never be returned. This can be left out of subsequent requests (updates) and will be enriched back into the user structure.",
+                  "type": "string"
+                },
+                "status": {
+                  "description": "The status of the user, if they are active.",
+                  "type": "string",
+                  "enum": [
+                    "active"
+                  ]
+                },
+                "firstName": {
+                  "description": "The first name of the user",
+                  "type": "string"
+                },
+                "lastName": {
+                  "description": "The last name of the user",
+                  "type": "string"
+                },
+                "forceResetPassword": {
+                  "description": "If set to true forces the user to reset their password on first login.",
+                  "type": "boolean"
+                },
+                "builder": {
+                  "description": "Describes if the user is a builder user or not.",
+                  "type": "object",
+                  "properties": {
+                    "global": {
+                      "description": "If set to true the user will be able to build any app in the system.",
+                      "type": "boolean"
+                    }
+                  }
+                },
+                "admin": {
+                  "description": "Describes if the user is an admin user or not.",
+                  "type": "object",
+                  "properties": {
+                    "global": {
+                      "description": "If set to true the user will be able to administrate the system.",
+                      "type": "boolean"
+                    }
+                  }
+                },
+                "roles": {
+                  "description": "Contains the roles of the user per app (assuming they are not a builder user).",
+                  "type": "object",
+                  "additionalProperties": {
+                    "type": "string",
+                    "description": "A map of app ID (production app ID, minus the _dev component) to a role ID, e.g. ADMIN."
+                  }
+                },
+                "_id": {
+                  "description": "The ID of the user.",
+                  "type": "string"
+                }
+              },
+              "required": [
+                "email",
+                "roles",
+                "_id"
+              ]
+            }
+          }
+        },
+        "required": [
+          "data"
+        ]
+      },
       "nameSearch": {
         "type": "object",
         "properties": {
@@ -1399,18 +1824,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "type": "object",
+                  "$ref": "#/components/schemas/applicationSearch"
-                  "required": [
-                    "data"
-                  ],
-                  "properties": {
-                    "data": {
-                      "type": "array",
-                      "items": {
-                        "$ref": "#/components/schemas/application"
-                      }
-                    }
-                  }
                 },
                 "examples": {
                   "applications": {
@@ -1498,18 +1912,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "type": "object",
+                  "$ref": "#/components/schemas/querySearch"
-                  "required": [
-                    "data"
-                  ],
-                  "properties": {
-                    "data": {
-                      "type": "array",
-                      "items": {
-                        "$ref": "#/components/schemas/query"
-                      }
-                    }
-                  }
                 },
                 "examples": {
                   "queries": {
@@ -2025,18 +2428,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "type": "object",
+                  "$ref": "#/components/schemas/tableSearch"
-                  "required": [
-                    "data"
-                  ],
-                  "properties": {
-                    "data": {
-                      "type": "array",
-                      "items": {
-                        "$ref": "#/components/schemas/table"
-                      }
-                    }
-                  }
                 },
                 "examples": {
                   "tables": {
@@ -2203,18 +2595,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "type": "object",
+                  "$ref": "#/components/schemas/userSearch"
-                  "required": [
-                    "data"
-                  ],
-                  "properties": {
-                    "data": {
-                      "type": "array",
-                      "items": {
-                        "$ref": "#/components/schemas/user"
-                      }
-                    }
-                  }
                 },
                 "examples": {
                   "users": {

packages/server/specs/openapi.yaml

@@ -360,6 +360,58 @@ components:
             - version
       required:
         - data
+    applicationSearch:
+      type: object
+      properties:
+        data:
+          type: array
+          items:
+            type: object
+            properties:
+              name:
+                description: The name of the app.
+                type: string
+              url:
+                description: The URL by which the app is accessed, this must be URL encoded.
+                type: string
+              _id:
+                description: The ID of the app.
+                type: string
+              status:
+                description: The status of the app, stating it if is the development or
+                  published version.
+                type: string
+                enum:
+                  - development
+                  - published
+              createdAt:
+                description: States when the app was created, will be constant. Stored in ISO
+                  format.
+                type: string
+              updatedAt:
+                description: States the last time the app was updated - stored in ISO format.
+                type: string
+              version:
+                description: States the version of the Budibase client this app is currently
+                  based on.
+                type: string
+              tenantId:
+                description: In a multi-tenant environment this will state the tenant this app
+                  is within.
+                type: string
+              lockedBy:
+                description: The user this app is currently being built by.
+                type: object
+            required:
+              - _id
+              - name
+              - url
+              - status
+              - createdAt
+              - updatedAt
+              - version
+      required:
+        - data
     row:
       description: The row to be created/updated, based on the table schema.
       type: object
@@ -730,6 +782,175 @@ components:
               type: string
       required:
         - data
+    tableSearch:
+      type: object
+      properties:
+        data:
+          type: array
+          items:
+            description: The table to be created/updated.
+            type: object
+            required:
+              - name
+              - schema
+              - _id
+            properties:
+              name:
+                description: The name of the table.
+                type: string
+              primaryDisplay:
+                type: string
+                description: The name of the column which should be used in relationship tags
+                  when relating to this table.
+              schema:
+                type: object
+                additionalProperties:
+                  oneOf:
+                    - type: object
+                      properties:
+                        type:
+                          type: string
+                          enum:
+                            - link
+                          description: A relationship column.
+                        constraints:
+                          type: object
+                          description: A constraint can be applied to the column which will be validated
+                            against when a row is saved.
+                          properties:
+                            type:
+                              type: string
+                              enum:
+                                - string
+                                - number
+                                - object
+                                - boolean
+                            presence:
+                              type: boolean
+                              description: Defines whether the column is required or not.
+                        name:
+                          type: string
+                          description: The name of the column.
+                        autocolumn:
+                          type: boolean
+                          description: Defines whether the column is automatically generated.
+                        fieldName:
+                          type: string
+                          description: The name of the column which a relationship column is related to in
+                            another table.
+                        tableId:
+                          type: string
+                          description: The ID of the table which a relationship column is related to.
+                        relationshipType:
+                          type: string
+                          enum:
+                            - one-to-many
+                            - many-to-one
+                            - many-to-many
+                          description: Defines the type of relationship that this column will be used for.
+                        through:
+                          type: string
+                          description: When using a SQL table that contains many to many relationships
+                            this defines the table the relationships are linked
+                            through.
+                        foreignKey:
+                          type: string
+                          description: When using a SQL table that contains a one to many relationship
+                            this defines the foreign key.
+                        throughFrom:
+                          type: string
+                          description: When using a SQL table that utilises a through table, this defines
+                            the primary key in the through table for this table.
+                        throughTo:
+                          type: string
+                          description: When using a SQL table that utilises a through table, this defines
+                            the primary key in the through table for the related
+                            table.
+                    - type: object
+                      properties:
+                        type:
+                          type: string
+                          enum:
+                            - formula
+                          description: A formula column.
+                        constraints:
+                          type: object
+                          description: A constraint can be applied to the column which will be validated
+                            against when a row is saved.
+                          properties:
+                            type:
+                              type: string
+                              enum:
+                                - string
+                                - number
+                                - object
+                                - boolean
+                            presence:
+                              type: boolean
+                              description: Defines whether the column is required or not.
+                        name:
+                          type: string
+                          description: The name of the column.
+                        autocolumn:
+                          type: boolean
+                          description: Defines whether the column is automatically generated.
+                        formula:
+                          type: string
+                          description: Defines a Handlebars or JavaScript formula to use, note that
+                            Javascript formulas are expected to be provided in
+                            the base64 format.
+                        formulaType:
+                          type: string
+                          enum:
+                            - static
+                            - dynamic
+                          description: Defines whether this is a static or dynamic formula.
+                    - type: object
+                      properties:
+                        type:
+                          type: string
+                          enum:
+                            - string
+                            - longform
+                            - options
+                            - number
+                            - boolean
+                            - array
+                            - datetime
+                            - attachment
+                            - link
+                            - formula
+                            - auto
+                            - json
+                            - internal
+                          description: Defines the type of the column, most explain themselves, a link
+                            column is a relationship.
+                        constraints:
+                          type: object
+                          description: A constraint can be applied to the column which will be validated
+                            against when a row is saved.
+                          properties:
+                            type:
+                              type: string
+                              enum:
+                                - string
+                                - number
+                                - object
+                                - boolean
+                            presence:
+                              type: boolean
+                              description: Defines whether the column is required or not.
+                        name:
+                          type: string
+                          description: The name of the column.
+                        autocolumn:
+                          type: boolean
+                          description: Defines whether the column is automatically generated.
+              _id:
+                description: The ID of the table.
+                type: string
+      required:
+        - data
     executeQuery:
       description: The query body must contain the required parameters for the query,
         this depends on query type, setup and bindings.
@@ -803,6 +1024,55 @@ components:
         - name
         - schema
         - _id
+    querySearch:
+      type: object
+      properties:
+        data:
+          type: array
+          items:
+            type: object
+            properties:
+              _id:
+                description: The ID of the query.
+                type: string
+              datasourceId:
+                description: The ID of the data source the query belongs to.
+                type: string
+              parameters:
+                description: The bindings which are required to perform this query.
+                type: array
+                items:
+                  type: string
+              fields:
+                description: The fields that are used to perform this query, e.g. the sql
+                  statement
+                type: object
+              queryVerb:
+                description: The verb that describes this query.
+                enum:
+                  - create
+                  - read
+                  - update
+                  - delete
+              name:
+                description: The name of the query.
+                type: string
+              schema:
+                description: The schema of the data returned when the query is executed.
+                type: object
+              transformer:
+                description: The JavaScript transformer function, applied after the query
+                  responds with data.
+                type: string
+              readable:
+                description: Whether the query has readable data.
+                type: boolean
+            required:
+              - name
+              - schema
+              - _id
+      required:
+        - data
     user:
       type: object
       properties:
@@ -916,6 +1186,69 @@ components:
             - _id
       required:
         - data
+    userSearch:
+      type: object
+      properties:
+        data:
+          type: array
+          items:
+            type: object
+            properties:
+              email:
+                description: The email address of the user, this must be unique.
+                type: string
+              password:
+                description: The password of the user if using password based login - this will
+                  never be returned. This can be left out of subsequent requests
+                  (updates) and will be enriched back into the user structure.
+                type: string
+              status:
+                description: The status of the user, if they are active.
+                type: string
+                enum:
+                  - active
+              firstName:
+                description: The first name of the user
+                type: string
+              lastName:
+                description: The last name of the user
+                type: string
+              forceResetPassword:
+                description: If set to true forces the user to reset their password on first
+                  login.
+                type: boolean
+              builder:
+                description: Describes if the user is a builder user or not.
+                type: object
+                properties:
+                  global:
+                    description: If set to true the user will be able to build any app in the
+                      system.
+                    type: boolean
+              admin:
+                description: Describes if the user is an admin user or not.
+                type: object
+                properties:
+                  global:
+                    description: If set to true the user will be able to administrate the system.
+                    type: boolean
+              roles:
+                description: Contains the roles of the user per app (assuming they are not a
+                  builder user).
+                type: object
+                additionalProperties:
+                  type: string
+                  description: A map of app ID (production app ID, minus the _dev component) to a
+                    role ID, e.g. ADMIN.
+              _id:
+                description: The ID of the user.
+                type: string
+            required:
+              - email
+              - roles
+              - _id
+      required:
+        - data
     nameSearch:
       type: object
       properties:
@@ -1028,14 +1361,7 @@ paths:
           content:
             application/json:
               schema:
-                type: object
+                $ref: "#/components/schemas/applicationSearch"
-                required:
-                  - data
-                properties:
-                  data:
-                    type: array
-                    items:
-                      $ref: "#/components/schemas/application"
               examples:
                 applications:
                   $ref: "#/components/examples/applications"
@@ -1087,14 +1413,7 @@ paths:
           content:
             application/json:
               schema:
-                type: object
+                $ref: "#/components/schemas/querySearch"
-                required:
-                  - data
-                properties:
-                  data:
-                    type: array
-                    items:
-                      $ref: "#/components/schemas/query"
               examples:
                 queries:
                   $ref: "#/components/examples/queries"
@@ -1419,14 +1738,7 @@ paths:
           content:
             application/json:
               schema:
-                type: object
+                $ref: "#/components/schemas/tableSearch"
-                required:
-                  - data
-                properties:
-                  data:
-                    type: array
-                    items:
-                      $ref: "#/components/schemas/table"
               examples:
                 tables:
                   $ref: "#/components/examples/tables"
@@ -1524,14 +1836,7 @@ paths:
           content:
             application/json:
               schema:
-                type: object
+                $ref: "#/components/schemas/userSearch"
-                required:
-                  - data
-                properties:
-                  data:
-                    type: array
-                    items:
-                      $ref: "#/components/schemas/user"
               examples:
                 users:
                   $ref: "#/components/examples/users"

packages/server/specs/resources/application.js

@@ -98,4 +98,10 @@ module.exports = new Resource()
     applicationOutput: object({
       data: applicationOutputSchema,
     }),
+    applicationSearch: object({
+      data: {
+        type: "array",
+        items: applicationOutputSchema,
+      },
+    }),
   })

packages/server/specs/resources/query.js

@@ -186,4 +186,10 @@ module.exports = new Resource()
     executeQuery: executeQuerySchema,
     executeQueryOutput: executeQueryOutputSchema,
     query: querySchema,
+    querySearch: object({
+      data: {
+        type: "array",
+        items: querySchema,
+      },
+    }),
   })

packages/server/specs/resources/table.js

@@ -188,4 +188,10 @@ module.exports = new Resource()
     tableOutput: object({
       data: tableOutputSchema,
     }),
+    tableSearch: object({
+      data: {
+        type: "array",
+        items: tableOutputSchema,
+      },
+    }),
   })

packages/server/specs/resources/user.js

@@ -123,4 +123,10 @@ module.exports = new Resource()
     userOutput: object({
       data: userOutputSchema,
     }),
+    userSearch: object({
+      data: {
+        type: "array",
+        items: userOutputSchema,
+      },
+    }),
   })

packages/server/src/api/controllers/public/rows.ts

@@ -1,6 +1,7 @@
 import { default as rowController } from "../row"
 import { addRev } from "./utils"
 import { Row } from "../../../definitions/common"
+import { convertBookmark } from "../../../utilities"
 
 // makes sure that the user doesn't need to pass in the type, tableId or _id params for
 // the call to be correct
@@ -30,7 +31,7 @@ export async function search(ctx: any, next: any) {
     sort: sort.column,
     sortType: sort.type,
     sortOrder: sort.order,
-    bookmark,
+    bookmark: convertBookmark(bookmark),
     paginate,
     limit,
     query,

packages/server/src/api/controllers/row/external.js

@@ -33,11 +33,11 @@ exports.handleRequest = handleRequest
 exports.patch = async ctx => {
   const inputs = ctx.request.body
   const tableId = ctx.params.tableId
-  const id = breakRowIdField(inputs._id)
+  const id = inputs._id
   // don't save the ID to db
   delete inputs._id
   return handleRequest(DataSourceOperation.UPDATE, tableId, {
-    id,
+    id: breakRowIdField(id),
     row: inputs,
   })
 }
@@ -67,7 +67,7 @@ exports.find = async ctx => {
   const id = ctx.params.rowId
   const tableId = ctx.params.tableId
   const response = await handleRequest(DataSourceOperation.READ, tableId, {
-    id,
+    id: breakRowIdField(id),
   })
   return response ? response[0] : response
 }
@@ -76,7 +76,7 @@ exports.destroy = async ctx => {
   const tableId = ctx.params.tableId
   const id = ctx.request.body._id
   const { row } = await handleRequest(DataSourceOperation.DELETE, tableId, {
-    id,
+    id: breakRowIdField(id),
   })
   return { response: { ok: true }, row }
 }

packages/server/src/api/routes/public/applications.ts

@@ -135,14 +135,7 @@ read.push(new Endpoint("get", "/applications/:appId", controller.read))
  *         content:
  *           application/json:
  *             schema:
- *               type: object
+ *               $ref: '#/components/schemas/applicationSearch'
- *               required:
- *                 - data
- *               properties:
- *                 data:
- *                   type: array
- *                   items:
- *                     $ref: '#/components/schemas/application'
  *             examples:
  *               applications:
  *                 $ref: '#/components/examples/applications'

packages/server/src/api/routes/public/queries.ts

@@ -60,14 +60,7 @@ write.push(new Endpoint("post", "/queries/:queryId", controller.execute))
  *         content:
  *           application/json:
  *             schema:
- *               type: object
+ *               $ref: '#/components/schemas/querySearch'
- *               required:
- *                 - data
- *               properties:
- *                 data:
- *                   type: array
- *                   items:
- *                     $ref: '#/components/schemas/query'
  *             examples:
  *               queries:
  *                 $ref: '#/components/examples/queries'

packages/server/src/api/routes/public/tables.ts

@@ -148,14 +148,7 @@ read.push(new Endpoint("get", "/tables/:tableId", controller.read))
  *         content:
  *           application/json:
  *             schema:
- *               type: object
+ *               $ref: '#/components/schemas/tableSearch'
- *               required:
- *                 - data
- *               properties:
- *                 data:
- *                   type: array
- *                   items:
- *                     $ref: '#/components/schemas/table'
  *             examples:
  *               tables:
  *                 $ref: '#/components/examples/tables'

packages/server/src/api/routes/public/users.ts

@@ -123,14 +123,7 @@ read.push(new Endpoint("get", "/users/:userId", controller.read))
  *         content:
  *           application/json:
  *             schema:
- *               type: object
+ *               $ref: '#/components/schemas/userSearch'
- *               required:
- *                 - data
- *               properties:
- *                 data:
- *                   type: array
- *                   items:
- *                     $ref: '#/components/schemas/user'
  *             examples:
  *               users:
  *                 $ref: '#/components/examples/users'

packages/server/src/definitions/openapi.ts

@@ -95,9 +95,7 @@ export interface paths {
         /** Returns the applications that were found based on the search parameters. */
         200: {
           content: {
-            "application/json": {
+            "application/json": components["schemas"]["applicationSearch"]
-              data: components["schemas"]["application"][]
-            }
           }
         }
       }
@@ -149,9 +147,7 @@ export interface paths {
         /** Returns the queries found based on the search parameters. */
         200: {
           content: {
-            "application/json": {
+            "application/json": components["schemas"]["querySearch"]
-              data: components["schemas"]["query"][]
-            }
           }
         }
       }
@@ -449,9 +445,7 @@ export interface paths {
         /** Returns the found tables, based on the search parameters. */
         200: {
           content: {
-            "application/json": {
+            "application/json": components["schemas"]["tableSearch"]
-              data: components["schemas"]["table"][]
-            }
           }
         }
       }
@@ -541,9 +535,7 @@ export interface paths {
         /** Returns the found users based on search parameters. */
         200: {
           content: {
-            "application/json": {
+            "application/json": components["schemas"]["userSearch"]
-              data: components["schemas"]["user"][]
-            }
           }
         }
       }
@@ -589,6 +581,31 @@ export interface components {
         lockedBy?: { [key: string]: unknown }
       }
     }
+    applicationSearch: {
+      data: {
+        /** @description The name of the app. */
+        name: string
+        /** @description The URL by which the app is accessed, this must be URL encoded. */
+        url: string
+        /** @description The ID of the app. */
+        _id: string
+        /**
+         * @description The status of the app, stating it if is the development or published version.
+         * @enum {string}
+         */
+        status: "development" | "published"
+        /** @description States when the app was created, will be constant. Stored in ISO format. */
+        createdAt: string
+        /** @description States the last time the app was updated - stored in ISO format. */
+        updatedAt: string
+        /** @description States the version of the Budibase client this app is currently based on. */
+        version: string
+        /** @description In a multi-tenant environment this will state the tenant this app is within. */
+        tenantId?: string
+        /** @description The user this app is currently being built by. */
+        lockedBy?: { [key: string]: unknown }
+      }[]
+    }
     /** @description The row to be created/updated, based on the table schema. */
     row: { [key: string]: unknown }
     searchOutput: {
@@ -817,6 +834,113 @@ export interface components {
         _id: string
       }
     }
+    tableSearch: {
+      data: {
+        /** @description The name of the table. */
+        name: string
+        /** @description The name of the column which should be used in relationship tags when relating to this table. */
+        primaryDisplay?: string
+        schema: {
+          [key: string]:
+            | {
+                /**
+                 * @description A relationship column.
+                 * @enum {string}
+                 */
+                type?: "link"
+                /** @description A constraint can be applied to the column which will be validated against when a row is saved. */
+                constraints?: {
+                  /** @enum {string} */
+                  type?: "string" | "number" | "object" | "boolean"
+                  /** @description Defines whether the column is required or not. */
+                  presence?: boolean
+                }
+                /** @description The name of the column. */
+                name?: string
+                /** @description Defines whether the column is automatically generated. */
+                autocolumn?: boolean
+                /** @description The name of the column which a relationship column is related to in another table. */
+                fieldName?: string
+                /** @description The ID of the table which a relationship column is related to. */
+                tableId?: string
+                /**
+                 * @description Defines the type of relationship that this column will be used for.
+                 * @enum {string}
+                 */
+                relationshipType?:
+                  | "one-to-many"
+                  | "many-to-one"
+                  | "many-to-many"
+                /** @description When using a SQL table that contains many to many relationships this defines the table the relationships are linked through. */
+                through?: string
+                /** @description When using a SQL table that contains a one to many relationship this defines the foreign key. */
+                foreignKey?: string
+                /** @description When using a SQL table that utilises a through table, this defines the primary key in the through table for this table. */
+                throughFrom?: string
+                /** @description When using a SQL table that utilises a through table, this defines the primary key in the through table for the related table. */
+                throughTo?: string
+              }
+            | {
+                /**
+                 * @description A formula column.
+                 * @enum {string}
+                 */
+                type?: "formula"
+                /** @description A constraint can be applied to the column which will be validated against when a row is saved. */
+                constraints?: {
+                  /** @enum {string} */
+                  type?: "string" | "number" | "object" | "boolean"
+                  /** @description Defines whether the column is required or not. */
+                  presence?: boolean
+                }
+                /** @description The name of the column. */
+                name?: string
+                /** @description Defines whether the column is automatically generated. */
+                autocolumn?: boolean
+                /** @description Defines a Handlebars or JavaScript formula to use, note that Javascript formulas are expected to be provided in the base64 format. */
+                formula?: string
+                /**
+                 * @description Defines whether this is a static or dynamic formula.
+                 * @enum {string}
+                 */
+                formulaType?: "static" | "dynamic"
+              }
+            | {
+                /**
+                 * @description Defines the type of the column, most explain themselves, a link column is a relationship.
+                 * @enum {string}
+                 */
+                type?:
+                  | "string"
+                  | "longform"
+                  | "options"
+                  | "number"
+                  | "boolean"
+                  | "array"
+                  | "datetime"
+                  | "attachment"
+                  | "link"
+                  | "formula"
+                  | "auto"
+                  | "json"
+                  | "internal"
+                /** @description A constraint can be applied to the column which will be validated against when a row is saved. */
+                constraints?: {
+                  /** @enum {string} */
+                  type?: "string" | "number" | "object" | "boolean"
+                  /** @description Defines whether the column is required or not. */
+                  presence?: boolean
+                }
+                /** @description The name of the column. */
+                name?: string
+                /** @description Defines whether the column is automatically generated. */
+                autocolumn?: boolean
+              }
+        }
+        /** @description The ID of the table. */
+        _id: string
+      }[]
+    }
     /** @description The query body must contain the required parameters for the query, this depends on query type, setup and bindings. */
     executeQuery: { [key: string]: unknown }
     executeQueryOutput: {
@@ -855,6 +979,31 @@ export interface components {
       /** @description Whether the query has readable data. */
       readable?: boolean
     }
+    querySearch: {
+      data: {
+        /** @description The ID of the query. */
+        _id: string
+        /** @description The ID of the data source the query belongs to. */
+        datasourceId?: string
+        /** @description The bindings which are required to perform this query. */
+        parameters?: string[]
+        /** @description The fields that are used to perform this query, e.g. the sql statement */
+        fields?: { [key: string]: unknown }
+        /**
+         * @description The verb that describes this query.
+         * @enum {undefined}
+         */
+        queryVerb?: "create" | "read" | "update" | "delete"
+        /** @description The name of the query. */
+        name: string
+        /** @description The schema of the data returned when the query is executed. */
+        schema: { [key: string]: unknown }
+        /** @description The JavaScript transformer function, applied after the query responds with data. */
+        transformer?: string
+        /** @description Whether the query has readable data. */
+        readable?: boolean
+      }[]
+    }
     user: {
       /** @description The email address of the user, this must be unique. */
       email: string
@@ -917,6 +1066,39 @@ export interface components {
         _id: string
       }
     }
+    userSearch: {
+      data: {
+        /** @description The email address of the user, this must be unique. */
+        email: string
+        /** @description The password of the user if using password based login - this will never be returned. This can be left out of subsequent requests (updates) and will be enriched back into the user structure. */
+        password?: string
+        /**
+         * @description The status of the user, if they are active.
+         * @enum {string}
+         */
+        status?: "active"
+        /** @description The first name of the user */
+        firstName?: string
+        /** @description The last name of the user */
+        lastName?: string
+        /** @description If set to true forces the user to reset their password on first login. */
+        forceResetPassword?: boolean
+        /** @description Describes if the user is a builder user or not. */
+        builder?: {
+          /** @description If set to true the user will be able to build any app in the system. */
+          global?: boolean
+        }
+        /** @description Describes if the user is an admin user or not. */
+        admin?: {
+          /** @description If set to true the user will be able to administrate the system. */
+          global?: boolean
+        }
+        /** @description Contains the roles of the user per app (assuming they are not a builder user). */
+        roles: { [key: string]: string }
+        /** @description The ID of the user. */
+        _id: string
+      }[]
+    }
     nameSearch: {
       /** @description The name to be used when searching - this will be used in a case insensitive starts with match. */
       name: string

packages/server/src/utilities/index.js

@@ -151,3 +151,11 @@ exports.formatBytes = bytes => {
   }
   return `${size.toFixed(size < 10 && unit > 0 ? 1 : 0)}${units[unit]}`
 }
+
+exports.convertBookmark = bookmark => {
+  const IS_NUMBER = /^\d+\.?\d*$/
+  if (typeof bookmark === "string" && bookmark.match(IS_NUMBER)) {
+    return parseFloat(bookmark)
+  }
+  return bookmark
+}

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.80-alpha.5",
+  "version": "1.0.81-alpha.7",
   "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.80-alpha.5",
+  "version": "1.0.81-alpha.7",
   "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.80-alpha.5",
+    "@budibase/backend-core": "^1.0.81-alpha.7",
-    "@budibase/string-templates": "^1.0.80-alpha.5",
+    "@budibase/string-templates": "^1.0.81-alpha.7",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",

packages/worker/src/api/controllers/global/self.js

@@ -1,10 +1,20 @@
-const { getGlobalDB, getTenantId } = require("@budibase/backend-core/tenancy")
+const {
+  getGlobalDB,
+  getTenantId,
+  isUserInAppTenant,
+} = require("@budibase/backend-core/tenancy")
 const { generateDevInfoID, SEPARATOR } = require("@budibase/backend-core/db")
 const { user: userCache } = require("@budibase/backend-core/cache")
-const { hash, platformLogout } = require("@budibase/backend-core/utils")
+const {
+  hash,
+  platformLogout,
+  getCookie,
+  clearCookie,
+} = require("@budibase/backend-core/utils")
 const { encrypt } = require("@budibase/backend-core/encryption")
 const { newid } = require("@budibase/backend-core/utils")
 const { getUser } = require("../../utilities")
+const { Cookies } = require("@budibase/backend-core/constants")
 
 function newApiKey() {
   return encrypt(`${getTenantId()}${SEPARATOR}${newid()}`)
@@ -48,6 +58,16 @@ exports.fetchAPIKey = async ctx => {
   ctx.body = cleanupDevInfo(devInfo)
 }
 
+const checkCurrentApp = ctx => {
+  const appCookie = getCookie(ctx, Cookies.CurrentApp)
+  if (appCookie && !isUserInAppTenant(appCookie.appId)) {
+    // there is a currentapp cookie from another tenant
+    // remove the cookie as this is incompatible with the builder
+    // due to builder and admin permissions being removed
+    clearCookie(ctx, Cookies.CurrentApp)
+  }
+}
+
 exports.getSelf = async ctx => {
   if (!ctx.user) {
     ctx.throw(403, "User not logged in")
@@ -56,6 +76,9 @@ exports.getSelf = async ctx => {
   ctx.params = {
     id: userId,
   }
+
+  checkCurrentApp(ctx)
+
   // get the main body of the user
   ctx.body = await getUser(userId)
   // forward session information not found in db

packages/worker/src/api/controllers/system/status.js

@@ -0,0 +1,15 @@
+const accounts = require("@budibase/backend-core/accounts")
+const env = require("../../../environment")
+
+exports.fetch = async ctx => {
+  if (!env.SELF_HOSTED && !env.DISABLE_ACCOUNT_PORTAL) {
+    const status = await accounts.getStatus()
+    ctx.body = status
+  } else {
+    ctx.body = {
+      health: {
+        passing: true,
+      },
+    }
+  }
+}

packages/worker/src/api/index.js

@@ -39,7 +39,6 @@ const PUBLIC_ENDPOINTS = [
     method: "GET",
   },
   {
-    // TODO: Add an provisioning API key to this endpoint in the cloud
     route: "/api/global/users/init",
     method: "POST",
   },
@@ -51,6 +50,10 @@ const PUBLIC_ENDPOINTS = [
     route: "api/system/environment",
     method: "GET",
   },
+  {
+    route: "api/system/status",
+    method: "GET",
+  },
   {
     route: "/api/global/users/tenant/:id",
     method: "GET",

packages/worker/src/api/routes/index.js

@@ -8,6 +8,7 @@ const roleRoutes = require("./global/roles")
 const sessionRoutes = require("./global/sessions")
 const environmentRoutes = require("./system/environment")
 const tenantsRoutes = require("./system/tenants")
+const statusRoutes = require("./system/status")
 const selfRoutes = require("./global/self")
 
 exports.routes = [
@@ -21,5 +22,6 @@ exports.routes = [
   sessionRoutes,
   roleRoutes,
   environmentRoutes,
+  statusRoutes,
   selfRoutes,
 ]

packages/worker/src/api/routes/system/status.js

@@ -0,0 +1,8 @@
+const Router = require("@koa/router")
+const controller = require("../../controllers/system/status")
+
+const router = Router()
+
+router.get("/api/system/status", controller.fetch)
+
+module.exports = router