@budibase/server 1.3.21-alpha.1 → 1.3.21

package/specs/openapi.yaml

@@ -1004,7 +1004,7 @@ components:
           description: The ID of the query.
           type: string
         datasourceId:
-          description: The ID of the datasource the query belongs to.
+          description: The ID of the data source the query belongs to.
           type: string
         parameters:
           description: The bindings which are required to perform this query.
@@ -1051,7 +1051,7 @@ components:
                 description: The ID of the query.
                 type: string
               datasourceId:
-                description: The ID of the datasource the query belongs to.
+                description: The ID of the data source the query belongs to.
                 type: string
               parameters:
                 description: The bindings which are required to perform this query.
@@ -1264,98 +1264,6 @@ components:
               - _id
       required:
         - data
-    rowSearch:
-      type: object
-      properties:
-        query:
-          type: object
-          properties:
-            allOr:
-              type: boolean
-              description: Specifies that a row should be returned if it satisfies any of the
-                specified options, rather than requiring it to fulfill all the
-                search parameters. This defaults to false, meaning AND logic
-                will be used.
-            string:
-              type: object
-              example:
-                columnName1: value
-                columnName2: value
-              description: A map of field name to the string to search for, this will look for
-                rows that have a value starting with the string value.
-              additionalProperties:
-                type: string
-                description: The value to search for in the column.
-            fuzzy:
-              type: object
-              description: A fuzzy search, only supported by internal tables.
-            range:
-              type: object
-              description: Searches within a range, the format of this must be in the format
-                of an object with a "low" and "high" property.
-              example:
-                columnName1:
-                  low: 10
-                  high: 20
-            equal:
-              type: object
-              description: Searches for rows that have a column value that is exactly the
-                value set.
-            notEqual:
-              type: object
-              description: Searches for any row which does not contain the specified column
-                value.
-            empty:
-              type: object
-              description: Searches for rows which do not contain the specified column. The
-                object should simply contain keys of the column names, these can
-                map to any value.
-              example:
-                columnName1: ""
-            notEmpty:
-              type: object
-              description: Searches for rows which have the specified column.
-            oneOf:
-              type: object
-              description: Searches for rows which have a column value that is any of the
-                specified values. The format of this must be columnName ->
-                [value1, value2].
-        paginate:
-          type: boolean
-          description: Enables pagination, by default this is disabled.
-        bookmark:
-          oneOf:
-            - type: string
-            - type: integer
-          description: If retrieving another page, the bookmark from the previous request
-            must be supplied.
-        limit:
-          type: integer
-          description: The maximum number of rows to return, useful when paginating, for
-            internal tables this will be limited to 1000, for SQL tables it will
-            be 5000.
-        sort:
-          type: object
-          description: A set of parameters describing the sort behaviour of the search.
-          properties:
-            order:
-              type: string
-              enum:
-                - ascending
-                - descending
-              description: The order of the sort, by default this is ascending.
-            column:
-              type: string
-              description: The name of the column by which the rows will be sorted.
-            type:
-              type: string
-              enum:
-                - string
-                - number
-              description: Defines whether the column should be treated as a string or as
-                numbers when sorting.
-      required:
-        - query
     nameSearch:
       type: object
       properties:
@@ -1636,7 +1544,97 @@ paths:
         content:
           application/json:
             schema:
-              $ref: "#/components/schemas/rowSearch"
+              type: object
+              required:
+                - query
+              properties:
+                query:
+                  type: object
+                  properties:
+                    allOr:
+                      type: boolean
+                      description: Specifies that a row should be returned if it satisfies any of the
+                        specified options, rather than requiring it to fulfill
+                        all the search parameters. This defaults to false,
+                        meaning AND logic will be used.
+                    string:
+                      type: object
+                      example:
+                        columnName1: value
+                        columnName2: value
+                      description: A map of field name to the string to search for, this will look for
+                        rows that have a value starting with the string value.
+                      additionalProperties:
+                        type: string
+                        description: The value to search for in the column.
+                    fuzzy:
+                      type: object
+                      description: A fuzzy search, only supported by internal tables.
+                    range:
+                      type: object
+                      description: Searches within a range, the format of this must be in the format
+                        of an object with a "low" and "high" property.
+                      example:
+                        columnName1:
+                          low: 10
+                          high: 20
+                    equal:
+                      type: object
+                      description: Searches for rows that have a column value that is exactly the
+                        value set.
+                    notEqual:
+                      type: object
+                      description: Searches for any row which does not contain the specified column
+                        value.
+                    empty:
+                      type: object
+                      description: Searches for rows which do not contain the specified column. The
+                        object should simply contain keys of the column names,
+                        these can map to any value.
+                      example:
+                        columnName1: ""
+                    notEmpty:
+                      type: object
+                      description: Searches for rows which have the specified column.
+                    oneOf:
+                      type: object
+                      description: Searches for rows which have a column value that is any of the
+                        specified values. The format of this must be columnName
+                        -> [value1, value2].
+                paginate:
+                  type: boolean
+                  description: Enables pagination, by default this is disabled.
+                bookmark:
+                  oneOf:
+                    - type: string
+                    - type: integer
+                  description: If retrieving another page, the bookmark from the previous request
+                    must be supplied.
+                limit:
+                  type: integer
+                  description: The maximum number of rows to return, useful when paginating, for
+                    internal tables this will be limited to 1000, for SQL tables
+                    it will be 5000.
+                sort:
+                  type: object
+                  description: A set of parameters describing the sort behaviour of the search.
+                  properties:
+                    order:
+                      type: string
+                      enum:
+                        - ascending
+                        - descending
+                      description: The order of the sort, by default this is ascending.
+                    column:
+                      type: string
+                      description: The name of the column by which the rows will be sorted.
+                    type:
+                      type: string
+                      enum:
+                        - string
+                        - number
+                      description: Defines whether the column should be treated as a string or as
+                        numbers when sorting.
       responses:
         "200":
           description: The response will contain an array of rows that match the search
@@ -1667,7 +1665,7 @@ paths:
       responses:
         "200":
           description: Returns the created table, including the ID which has been
-            generated for it. This can be internal or external datasources.
+            generated for it. This can be internal or external data sources.
           content:
             application/json:
               schema:

package/specs/resources/misc.js

@@ -2,122 +2,6 @@ const { object } = require("./utils")
 const Resource = require("./utils/Resource")
 
 module.exports = new Resource().setSchemas({
-  rowSearch: object(
-    {
-      query: {
-        type: "object",
-        properties: {
-          allOr: {
-            type: "boolean",
-            description:
-              "Specifies that a row should be returned if it satisfies any of the specified options, rather than requiring it to fulfill all the search parameters. This defaults to false, meaning AND logic will be used.",
-          },
-          string: {
-            type: "object",
-            example: {
-              columnName1: "value",
-              columnName2: "value",
-            },
-            description:
-              "A map of field name to the string to search for, this will look for rows that have a value starting with the string value.",
-            additionalProperties: {
-              type: "string",
-              description: "The value to search for in the column.",
-            },
-          },
-          fuzzy: {
-            type: "object",
-            description: "A fuzzy search, only supported by internal tables.",
-          },
-          range: {
-            type: "object",
-            description:
-              'Searches within a range, the format of this must be in the format of an object with a "low" and "high" property.',
-            example: {
-              columnName1: {
-                low: 10,
-                high: 20,
-              },
-            },
-          },
-          equal: {
-            type: "object",
-            description:
-              "Searches for rows that have a column value that is exactly the value set.",
-          },
-          notEqual: {
-            type: "object",
-            description:
-              "Searches for any row which does not contain the specified column value.",
-          },
-          empty: {
-            type: "object",
-            description:
-              "Searches for rows which do not contain the specified column. The object should simply contain keys of the column names, these can map to any value.",
-            example: {
-              columnName1: "",
-            },
-          },
-          notEmpty: {
-            type: "object",
-            description: "Searches for rows which have the specified column.",
-          },
-          oneOf: {
-            type: "object",
-            description:
-              "Searches for rows which have a column value that is any of the specified values. The format of this must be columnName -> [value1, value2].",
-          },
-        },
-      },
-      paginate: {
-        type: "boolean",
-        description: "Enables pagination, by default this is disabled.",
-      },
-      bookmark: {
-        oneOf: [
-          {
-            type: "string",
-          },
-          {
-            type: "integer",
-          },
-        ],
-        description:
-          "If retrieving another page, the bookmark from the previous request must be supplied.",
-      },
-      limit: {
-        type: "integer",
-        description:
-          "The maximum number of rows to return, useful when paginating, for internal tables this will be limited to 1000, for SQL tables it will be 5000.",
-      },
-      sort: {
-        type: "object",
-        description:
-          "A set of parameters describing the sort behaviour of the search.",
-        properties: {
-          order: {
-            type: "string",
-            enum: ["ascending", "descending"],
-            description: "The order of the sort, by default this is ascending.",
-          },
-          column: {
-            type: "string",
-            description:
-              "The name of the column by which the rows will be sorted.",
-          },
-          type: {
-            type: "string",
-            enum: ["string", "number"],
-            description:
-              "Defines whether the column should be treated as a string or as numbers when sorting.",
-          },
-        },
-      },
-    },
-    {
-      required: ["query"],
-    }
-  ),
   nameSearch: object({
     name: {
       type: "string",

package/specs/resources/query.js

@@ -82,7 +82,7 @@ const querySchema = object(
       type: "string",
     },
     datasourceId: {
-      description: "The ID of the datasource the query belongs to.",
+      description: "The ID of the data source the query belongs to.",
       type: "string",
     },
     parameters: {

package/src/api/controllers/application.ts

@@ -472,6 +472,7 @@ const destroyApp = async (ctx: any) => {
   const result = await db.destroy()
 
   if (isUnpublish) {
+    await quotas.removePublishedApp()
     await events.app.unpublished(app)
   } else {
     await quotas.removeApp()
@@ -571,7 +572,7 @@ export const sync = async (ctx: any, next: any) => {
   }
 }
 
-export const updateAppPackage = async (appPackage: any, appId: any) => {
+const updateAppPackage = async (appPackage: any, appId: any) => {
   return context.doInAppContext(appId, async () => {
     const db = context.getAppDB()
     const application = await db.get(DocumentType.APP_METADATA)

package/src/api/controllers/auth.js

@@ -4,15 +4,6 @@ const { getFullUser } = require("../../utilities/users")
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
 const { getAppDB, getAppId } = require("@budibase/backend-core/context")
 
-/**
- * Add the attributes that are session based to the current user.
- */
-const addSessionAttributesToUser = ctx => {
-  if (ctx.user) {
-    ctx.body.license = ctx.user.license
-  }
-}
-
 exports.fetchSelf = async ctx => {
   let userId = ctx.user.userId || ctx.user._id
   /* istanbul ignore next */
@@ -64,6 +55,4 @@ exports.fetchSelf = async ctx => {
   } else {
     ctx.body = user
   }
-
-  addSessionAttributesToUser(ctx)
 }

package/src/api/controllers/component.js

@@ -1,7 +1,6 @@
-const { DocumentType, getPluginParams } = require("../../db/utils")
+const { DocumentType } = require("../../db/utils")
 const { getComponentLibraryManifest } = require("../../utilities/fileSystem")
 const { getAppDB } = require("@budibase/backend-core/context")
-const { getGlobalDB } = require("@budibase/backend-core/tenancy")
 
 exports.fetchAppComponentDefinitions = async function (ctx) {
   try {
@@ -11,6 +10,7 @@ exports.fetchAppComponentDefinitions = async function (ctx) {
     let componentManifests = await Promise.all(
       app.componentLibraries.map(async library => {
         let manifest = await getComponentLibraryManifest(library)
+
         return {
           manifest,
           library,
@@ -31,25 +31,6 @@ exports.fetchAppComponentDefinitions = async function (ctx) {
         }
       }
     }
-
-    // Add custom components
-    const globalDB = getGlobalDB()
-    const response = await globalDB.allDocs(
-      getPluginParams(null, {
-        include_docs: true,
-      })
-    )
-    response.rows
-      .map(row => row.doc)
-      .filter(plugin => plugin.schema.type === "component")
-      .forEach(plugin => {
-        const fullComponentName = `plugin/${plugin.name}`
-        definitions[fullComponentName] = {
-          component: fullComponentName,
-          ...plugin.schema.schema,
-        }
-      })
-
     ctx.body = definitions
   } catch (err) {
     console.error(`component-definitions=failed`, err)

package/src/api/controllers/datasource.js

@@ -7,7 +7,7 @@ const {
   getTableParams,
 } = require("../../db/utils")
 const { BuildSchemaErrors, InvalidColumns } = require("../../constants")
-const { getIntegration } = require("../../integrations")
+const { integrations } = require("../../integrations")
 const { getDatasourceAndQuery } = require("./row/utils")
 const { invalidateDynamicVariables } = require("../../threads/utils")
 const { getAppDB } = require("@budibase/backend-core/context")
@@ -50,23 +50,9 @@ exports.fetch = async function (ctx) {
 exports.buildSchemaFromDb = async function (ctx) {
   const db = getAppDB()
   const datasource = await db.get(ctx.params.datasourceId)
-  const tablesFilter = ctx.request.body.tablesFilter
 
-  let { tables, error } = await buildSchemaHelper(datasource)
-  if (tablesFilter) {
-    if (!datasource.entities) {
-      datasource.entities = {}
-    }
-    for (let key in tables) {
-      if (
-        tablesFilter.some(filter => filter.toLowerCase() === key.toLowerCase())
-      ) {
-        datasource.entities[key] = tables[key]
-      }
-    }
-  } else {
-    datasource.entities = tables
-  }
+  const { tables, error } = await buildSchemaHelper(datasource)
+  datasource.entities = tables
 
   const dbResp = await db.put(datasource)
   datasource._rev = dbResp.rev
@@ -128,7 +114,7 @@ exports.update = async function (ctx) {
 
   // Drain connection pools when configuration is changed
   if (datasource.source) {
-    const source = await getIntegration(datasource.source)
+    const source = integrations[datasource.source]
     if (source && source.pool) {
       await source.pool.end()
     }
@@ -163,7 +149,7 @@ exports.save = async function (ctx) {
 
   // Drain connection pools when configuration is changed
   if (datasource.source) {
-    const source = await getIntegration(datasource.source)
+    const source = integrations[datasource.source]
     if (source && source.pool) {
       await source.pool.end()
     }
@@ -232,14 +218,15 @@ function updateError(error, newError, tables) {
 }
 
 const buildSchemaHelper = async datasource => {
-  const Connector = await getIntegration(datasource.source)
+  const Connector = integrations[datasource.source]
 
   // Connect to the DB and build the schema
   const connector = new Connector(datasource.config)
   await connector.buildSchema(datasource._id, datasource.entities)
+  datasource.entities = connector.tables
 
   // make sure they all have a display name selected
-  for (let entity of Object.values(datasource.entities ?? {})) {
+  for (let entity of Object.values(datasource.entities)) {
     if (entity.primaryDisplay) {
       continue
     }

package/src/api/controllers/deploy/index.ts

@@ -206,7 +206,12 @@ const _deployApp = async function (ctx: any) {
 
   console.log("Deploying app...")
 
-  let app = await deployApp(deployment)
+  let app
+  if (await isFirstDeploy()) {
+    app = await quotas.addPublishedApp(() => deployApp(deployment))
+  } else {
+    app = await deployApp(deployment)
+  }
 
   await events.app.published(app)
   ctx.body = deployment

package/src/api/controllers/integration.js

@@ -1,11 +1,12 @@
-const { getDefinitions } = require("../../integrations")
+const { cloneDeep } = require("lodash")
+const { definitions } = require("../../integrations")
 const { SourceName } = require("@budibase/types")
 const googlesheets = require("../../integrations/googlesheets")
 const { featureFlags } = require("@budibase/backend-core")
 
 exports.fetch = async function (ctx) {
   ctx.status = 200
-  const defs = await getDefinitions()
+  const defs = cloneDeep(definitions)
 
   // for google sheets integration google verification
   if (featureFlags.isEnabled(featureFlags.FeatureFlag.GOOGLE_SHEETS)) {
@@ -16,7 +17,6 @@ exports.fetch = async function (ctx) {
 }
 
 exports.find = async function (ctx) {
-  const defs = await getDefinitions()
   ctx.status = 200
-  ctx.body = defs[ctx.params.type]
+  ctx.body = definitions[ctx.params.type]
 }

package/src/api/controllers/public/mapping/types.ts

@@ -4,18 +4,10 @@ export type Query = components["schemas"]["query"]
 export type ExecuteQuery = components["schemas"]["executeQueryOutput"]
 
 export type Application = components["schemas"]["applicationOutput"]["data"]
-export type CreateApplicationParams = components["schemas"]["application"]
 
 export type Table = components["schemas"]["tableOutput"]["data"]
-export type CreateTableParams = components["schemas"]["table"]
 
 export type Row = components["schemas"]["rowOutput"]["data"]
 export type RowSearch = components["schemas"]["searchOutput"]
-export type CreateRowParams = components["schemas"]["row"]
 
 export type User = components["schemas"]["userOutput"]["data"]
-export type CreateUserParams = components["schemas"]["user"]
-
-export type SearchInputParams =
-  | components["schemas"]["nameSearch"]
-  | components["schemas"]["rowSearch"]

package/src/api/controllers/row/external.js

@@ -53,7 +53,7 @@ exports.save = async ctx => {
 }
 
 exports.fetchView = async ctx => {
-  // there are no views in external datasources, shouldn't ever be called
+  // there are no views in external data sources, shouldn't ever be called
   // for now just fetch
   const split = ctx.params.viewName.split("all_")
   ctx.params.tableId = split[1] ? split[1] : split[0]

package/src/api/controllers/screen.js

@@ -1,14 +1,7 @@
-const {
-  getScreenParams,
-  generateScreenID,
-  getPluginParams,
-  DocumentType,
-} = require("../../db/utils")
+const { getScreenParams, generateScreenID } = require("../../db/utils")
 const { AccessController } = require("@budibase/backend-core/roles")
 const { getAppDB } = require("@budibase/backend-core/context")
 const { events } = require("@budibase/backend-core")
-const { getGlobalDB } = require("@budibase/backend-core/tenancy")
-const { updateAppPackage } = require("./application")
 
 exports.fetch = async ctx => {
   const db = getAppDB()
@@ -39,48 +32,6 @@ exports.save = async ctx => {
 
   const response = await db.put(screen)
 
-  // Find any custom components being used
-  let pluginNames = []
-  let pluginAdded = false
-  findPlugins(screen.props, pluginNames)
-  if (pluginNames.length) {
-    const globalDB = getGlobalDB()
-    const pluginsResponse = await globalDB.allDocs(
-      getPluginParams(null, {
-        include_docs: true,
-      })
-    )
-    const requiredPlugins = pluginsResponse.rows
-      .map(row => row.doc)
-      .filter(plugin => {
-        return (
-          plugin.schema.type === "component" &&
-          pluginNames.includes(`plugin/${plugin.name}`)
-        )
-      })
-
-    // Update the app metadata
-    const application = await db.get(DocumentType.APP_METADATA)
-    let usedPlugins = application.usedPlugins || []
-
-    requiredPlugins.forEach(plugin => {
-      if (!usedPlugins.find(x => x._id === plugin._id)) {
-        pluginAdded = true
-        usedPlugins.push({
-          _id: plugin._id,
-          name: plugin.name,
-          version: plugin.version,
-          jsUrl: plugin.jsUrl,
-          hash: plugin.hash,
-        })
-      }
-    })
-
-    if (pluginAdded) {
-      await updateAppPackage({ usedPlugins }, ctx.appId)
-    }
-  }
-
   if (eventFn) {
     await eventFn(screen)
   }
@@ -89,7 +40,6 @@ exports.save = async ctx => {
     ...screen,
     _id: response.id,
     _rev: response.rev,
-    pluginAdded,
   }
 }
 
@@ -106,18 +56,3 @@ exports.destroy = async ctx => {
   }
   ctx.status = 200
 }
-
-const findPlugins = (component, foundPlugins) => {
-  if (!component) {
-    return
-  }
-  if (component._component.startsWith("plugin")) {
-    if (!foundPlugins.includes(component._component)) {
-      foundPlugins.push(component._component)
-    }
-  }
-  if (!component._children || !component._children.length) {
-    return
-  }
-  component._children.forEach(child => findPlugins(child, foundPlugins))
-}

package/src/api/controllers/static/index.ts

@@ -18,6 +18,7 @@ const { DocumentType } = require("../../../db/utils")
 const { getAppDB, getAppId } = require("@budibase/backend-core/context")
 const { setCookie, clearCookie } = require("@budibase/backend-core/utils")
 const AWS = require("aws-sdk")
+
 const fs = require("fs")
 const {
   downloadTarballDirect,
@@ -112,7 +113,6 @@ export const serveApp = async function (ctx: any) {
       production: env.isProd(),
       appId,
       clientLibPath: clientLibraryPath(appId, appInfo.version, ctx),
-      usedPlugins: appInfo.usedPlugins,
     })
 
     const appHbs = loadHandlebarsFile(`${__dirname}/templates/app.hbs`)