@budibase/server 1.3.19-alpha.1 → 1.3.19

package/src/api/routes/index.ts

@@ -24,7 +24,6 @@ import metadataRoutes from "./metadata"
 import devRoutes from "./dev"
 import cloudRoutes from "./cloud"
 import migrationRoutes from "./migrations"
-import pluginRoutes from "./plugin"
 
 export { default as staticRoutes } from "./static"
 export { default as publicRoutes } from "./public"
@@ -58,5 +57,4 @@ export const mainRoutes = [
   tableRoutes,
   rowRoutes,
   migrationRoutes,
-  pluginRoutes,
 ]

package/src/api/routes/public/tables.ts

@@ -26,7 +26,7 @@ const read = [],
  *     responses:
  *       200:
  *         description: Returns the created table, including the ID which has been generated for it. This can be
- *           internal or external datasources.
+ *           internal or external data sources.
  *         content:
  *           application/json:
  *             schema:

package/src/api/routes/table.js

@@ -55,7 +55,7 @@ router
    * @apiParam (Body) {string} [_rev] If updating an existing internal table then the revision must also be specified.
    * @apiParam (Body) {string} type] This should either be "internal" or "external" depending on the table type -
    * this will default to internal.
-   * @apiParam (Body) {string} [sourceId] If creating an external table then this should be set to the datasource ID. If
+   * @apiParam (Body) {string} [sourceId] If creating an external table then this should be set to the data source ID. If
    * building an internal table this does not need to be set, although it will be returned as "bb_internal".
    * @apiParam (Body) {string} name The name of the table, this will be used in the UI. To rename the table simply
    * supply the table structure to this endpoint with the name changed.

package/src/api/routes/tests/query.spec.js

@@ -231,6 +231,20 @@ describe("/queries", () => {
         url: `/api/queries/preview`,
       })
     })
+
+    it("should fail with invalid integration type", async () => {
+      const { datasource } = await createInvalidIntegration()
+      await request
+        .post(`/api/queries/preview`)
+        .send({
+          datasourceId: datasource._id,
+          parameters: {},
+          fields: {},
+          queryVerb: "read",
+        })
+        .set(config.defaultHeaders())
+        .expect(400)
+    })
   })
 
   describe("execute", () => {
@@ -247,14 +261,17 @@ describe("/queries", () => {
     })
 
     it("should fail with invalid integration type", async () => {
-      let error
-      try {
-        await createInvalidIntegration()
-      } catch (err) {
-        error = err
-      }
-      expect(error).toBeDefined()
-      expect(error.message).toBe("No datasource implementation found.")
+      const { query, datasource } = await createInvalidIntegration()
+      await request
+        .post(`/api/queries/${query._id}`)
+        .send({
+          datasourceId: datasource._id,
+          parameters: {},
+          fields: {},
+          queryVerb: "read",
+        })
+        .set(config.defaultHeaders())
+        .expect(400)
     })
   })
 

package/src/api/routes/tests/user.spec.js

@@ -23,6 +23,7 @@ describe("/users", () => {
   })
 
   describe("fetch", () => {
+
     it("returns a list of users from an instance db", async () => {
       await config.createUser("uuidx")
       await config.createUser("uuidy")
@@ -37,6 +38,7 @@ describe("/users", () => {
       expect(res.body.find(u => u._id === `ro_ta_users_us_uuidy`)).toBeDefined()
     })
 
+
     it("should apply authorization to endpoint", async () => {
       await config.createUser()
       await checkPermissionsEndpoint({

package/src/api/routes/utils/validators.js

@@ -10,7 +10,6 @@ const Joi = require("joi")
 const OPTIONAL_STRING = Joi.string().optional().allow(null).allow("")
 const OPTIONAL_NUMBER = Joi.number().optional().allow(null)
 const OPTIONAL_BOOLEAN = Joi.boolean().optional().allow(null)
-const APP_NAME_REGEX = /^[\w\s]+$/
 
 exports.tableValidator = () => {
   // prettier-ignore
@@ -215,7 +214,7 @@ exports.applicationValidator = () => {
   return joiValidator.body(Joi.object({
     _id: OPTIONAL_STRING,
     _rev: OPTIONAL_STRING,
-    name: Joi.string().pattern(new RegExp(APP_NAME_REGEX)).required().error(new Error('App name must be letters, numbers and spaces only')),
+    name: Joi.string().required(),
     url: OPTIONAL_STRING,
     template: Joi.object({
       templateString: OPTIONAL_STRING,

package/src/app.ts

@@ -26,13 +26,10 @@ const bullboard = require("./automations/bullboard")
 const { logAlert } = require("@budibase/backend-core/logging")
 const { pinoSettings } = require("@budibase/backend-core")
 const { Thread } = require("./threads")
-const fs = require("fs")
 import redis from "./utilities/redis"
 import * as migrations from "./migrations"
 import { events, installation, tenancy } from "@budibase/backend-core"
 import { createAdminUser, getChecklist } from "./utilities/workerRequests"
-import { watch } from "./watch"
-import { initialise as initialiseWebsockets } from "./websocket"
 
 const app = new Koa()
 
@@ -77,7 +74,6 @@ if (env.isProd()) {
 
 const server = http.createServer(app.callback())
 destroyable(server)
-initialiseWebsockets(server)
 
 let shuttingDown = false,
   errCode = 0
@@ -143,16 +139,6 @@ module.exports = server.listen(env.PORT || 0, async () => {
     }
   }
 
-  // monitor plugin directory if required
-  if (
-    env.SELF_HOSTED &&
-    !env.MULTI_TENANCY &&
-    env.PLUGINS_DIR &&
-    fs.existsSync(env.PLUGINS_DIR)
-  ) {
-    watch()
-  }
-
   // check for version updates
   await installation.checkInstallVersion()
 

package/src/db/utils.js

@@ -42,7 +42,6 @@ const DocumentType = {
   MEM_VIEW: "view",
   USER_FLAG: "flag",
   AUTOMATION_METADATA: "meta_au",
-  PLUGIN: "plg",
 }
 
 const InternalTables = {
@@ -371,10 +370,6 @@ exports.getMemoryViewParams = (otherProps = {}) => {
   return getDocParams(DocumentType.MEM_VIEW, null, otherProps)
 }
 
-exports.generatePluginID = name => {
-  return `${DocumentType.PLUGIN}${SEPARATOR}${name}`
-}
-
 /**
  * This can be used with the db.allDocs to get a list of IDs
  */
@@ -384,10 +379,3 @@ exports.getMultiIDParams = ids => {
     include_docs: true,
   }
 }
-
-/**
- * Gets parameters for retrieving automations, this is a utility function for the getDocParams function.
- */
-exports.getPluginParams = (pluginId = null, otherProps = {}) => {
-  return getDocParams(DocumentType.PLUGIN, pluginId, otherProps)
-}

package/src/definitions/openapi.ts

@@ -344,7 +344,7 @@ export interface paths {
         };
       };
       responses: {
-        /** Returns the created table, including the ID which has been generated for it. This can be internal or external datasources. */
+        /** Returns the created table, including the ID which has been generated for it. This can be internal or external data sources. */
         200: {
           content: {
             "application/json": components["schemas"]["tableOutput"];
@@ -965,7 +965,7 @@ export interface components {
     query: {
       /** @description The ID of the query. */
       _id: string;
-      /** @description The ID of the datasource the query belongs to. */
+      /** @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[];
@@ -989,7 +989,7 @@ export interface components {
       data: {
         /** @description The ID of the query. */
         _id: string;
-        /** @description The ID of the datasource the query belongs to. */
+        /** @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[];

package/src/environment.js

@@ -74,7 +74,6 @@ module.exports = {
   SQL_MAX_ROWS: process.env.SQL_MAX_ROWS,
   BB_ADMIN_USER_EMAIL: process.env.BB_ADMIN_USER_EMAIL,
   BB_ADMIN_USER_PASSWORD: process.env.BB_ADMIN_USER_PASSWORD,
-  PLUGINS_DIR: process.env.PLUGINS_DIR || "/plugins",
   // flags
   ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS,
   DISABLE_THREADING: process.env.DISABLE_THREADING,

package/src/integrations/airtable.ts

@@ -5,144 +5,146 @@ import {
   IntegrationBase,
 } from "@budibase/types"
 
-const Airtable = require("airtable")
+module AirtableModule {
+  const Airtable = require("airtable")
 
-interface AirtableConfig {
-  apiKey: string
-  base: string
-}
+  interface AirtableConfig {
+    apiKey: string
+    base: string
+  }
 
-const SCHEMA: Integration = {
-  docs: "https://airtable.com/api",
-  description:
-    "Airtable is a spreadsheet-database hybrid, with the features of a database but applied to a spreadsheet.",
-  friendlyName: "Airtable",
-  type: "Spreadsheet",
-  datasource: {
-    apiKey: {
-      type: DatasourceFieldType.PASSWORD,
-      default: "enter api key",
-      required: true,
-    },
-    base: {
-      type: DatasourceFieldType.STRING,
-      default: "mybase",
-      required: true,
-    },
-  },
-  query: {
-    create: {
-      type: QueryType.FIELDS,
-      customisable: true,
-      fields: {
-        table: {
-          type: DatasourceFieldType.STRING,
-          required: true,
-        },
+  const SCHEMA: Integration = {
+    docs: "https://airtable.com/api",
+    description:
+      "Airtable is a spreadsheet-database hybrid, with the features of a database but applied to a spreadsheet.",
+    friendlyName: "Airtable",
+    type: "Spreadsheet",
+    datasource: {
+      apiKey: {
+        type: DatasourceFieldType.PASSWORD,
+        default: "enter api key",
+        required: true,
+      },
+      base: {
+        type: DatasourceFieldType.STRING,
+        default: "mybase",
+        required: true,
       },
     },
-    read: {
-      type: QueryType.FIELDS,
-      fields: {
-        table: {
-          type: DatasourceFieldType.STRING,
-          required: true,
-        },
-        view: {
-          type: DatasourceFieldType.STRING,
-          required: true,
-        },
-        numRecords: {
-          type: DatasourceFieldType.NUMBER,
-          default: 10,
+    query: {
+      create: {
+        type: QueryType.FIELDS,
+        customisable: true,
+        fields: {
+          table: {
+            type: DatasourceFieldType.STRING,
+            required: true,
+          },
         },
       },
-    },
-    update: {
-      type: QueryType.FIELDS,
-      customisable: true,
-      fields: {
-        id: {
-          display: "Record ID",
-          type: DatasourceFieldType.STRING,
-          required: true,
+      read: {
+        type: QueryType.FIELDS,
+        fields: {
+          table: {
+            type: DatasourceFieldType.STRING,
+            required: true,
+          },
+          view: {
+            type: DatasourceFieldType.STRING,
+            required: true,
+          },
+          numRecords: {
+            type: DatasourceFieldType.NUMBER,
+            default: 10,
+          },
         },
-        table: {
-          type: DatasourceFieldType.STRING,
-          required: true,
+      },
+      update: {
+        type: QueryType.FIELDS,
+        customisable: true,
+        fields: {
+          id: {
+            display: "Record ID",
+            type: DatasourceFieldType.STRING,
+            required: true,
+          },
+          table: {
+            type: DatasourceFieldType.STRING,
+            required: true,
+          },
         },
       },
+      delete: {
+        type: QueryType.JSON,
+      },
     },
-    delete: {
-      type: QueryType.JSON,
-    },
-  },
-}
+  }
 
-class AirtableIntegration implements IntegrationBase {
-  private config: AirtableConfig
-  private client: any
+  class AirtableIntegration implements IntegrationBase {
+    private config: AirtableConfig
+    private client: any
 
-  constructor(config: AirtableConfig) {
-    this.config = config
-    this.client = new Airtable(config).base(config.base)
-  }
+    constructor(config: AirtableConfig) {
+      this.config = config
+      this.client = new Airtable(config).base(config.base)
+    }
 
-  async create(query: { table: any; json: any }) {
-    const { table, json } = query
+    async create(query: { table: any; json: any }) {
+      const { table, json } = query
 
-    try {
-      return await this.client(table).create([
-        {
-          fields: json,
-        },
-      ])
-    } catch (err) {
-      console.error("Error writing to airtable", err)
-      throw err
+      try {
+        return await this.client(table).create([
+          {
+            fields: json,
+          },
+        ])
+      } catch (err) {
+        console.error("Error writing to airtable", err)
+        throw err
+      }
     }
-  }
 
-  async read(query: { table: any; numRecords: any; view: any }) {
-    try {
-      const records = await this.client(query.table)
-        .select({ maxRecords: query.numRecords || 10, view: query.view })
-        .firstPage()
-      // @ts-ignore
-      return records.map(({ fields }) => fields)
-    } catch (err) {
-      console.error("Error writing to airtable", err)
-      return []
+    async read(query: { table: any; numRecords: any; view: any }) {
+      try {
+        const records = await this.client(query.table)
+          .select({ maxRecords: query.numRecords || 10, view: query.view })
+          .firstPage()
+        // @ts-ignore
+        return records.map(({ fields }) => fields)
+      } catch (err) {
+        console.error("Error writing to airtable", err)
+        return []
+      }
     }
-  }
 
-  async update(query: { table: any; id: any; json: any }) {
-    const { table, id, json } = query
+    async update(query: { table: any; id: any; json: any }) {
+      const { table, id, json } = query
 
-    try {
-      return await this.client(table).update([
-        {
-          id,
-          fields: json,
-        },
-      ])
-    } catch (err) {
-      console.error("Error writing to airtable", err)
-      throw err
+      try {
+        return await this.client(table).update([
+          {
+            id,
+            fields: json,
+          },
+        ])
+      } catch (err) {
+        console.error("Error writing to airtable", err)
+        throw err
+      }
     }
-  }
 
-  async delete(query: { table: any; ids: any }) {
-    try {
-      return await this.client(query.table).destroy(query.ids)
-    } catch (err) {
-      console.error("Error writing to airtable", err)
-      throw err
+    async delete(query: { table: any; ids: any }) {
+      try {
+        return await this.client(query.table).destroy(query.ids)
+      } catch (err) {
+        console.error("Error writing to airtable", err)
+        throw err
+      }
     }
   }
-}
 
-export default {
-  schema: SCHEMA,
-  integration: AirtableIntegration,
+  module.exports = {
+    schema: SCHEMA,
+    integration: AirtableIntegration,
+  }
 }