@budibase/server 1.0.98-alpha.1 → 1.0.98

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.98-alpha.1",
+  "version": "1.0.98",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,13 +68,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.98-alpha.1",
-    "@budibase/client": "^1.0.98-alpha.1",
-    "@budibase/string-templates": "^1.0.98-alpha.1",
+    "@budibase/backend-core": "^1.0.98",
+    "@budibase/client": "^1.0.98",
+    "@budibase/string-templates": "^1.0.98",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
-    "@google-cloud/firestore": "^5.0.2",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
     "@sentry/node": "^6.0.0",
@@ -146,7 +145,6 @@
     "@types/jest": "^26.0.23",
     "@types/koa": "^2.13.3",
     "@types/koa-router": "^7.4.2",
-    "@types/lodash": "4.14.180",
     "@types/node": "^15.12.4",
     "@types/oracledb": "^5.2.1",
     "@types/redis": "^4.0.11",
@@ -155,7 +153,6 @@
     "copyfiles": "^2.4.1",
     "docker-compose": "^0.23.6",
     "eslint": "^6.8.0",
-    "is-wsl": "^2.2.0",
     "jest": "^27.0.5",
     "jest-openapi": "^0.14.2",
     "nodemon": "^2.0.4",
@@ -174,5 +171,5 @@
   "optionalDependencies": {
     "oracledb": "^5.3.0"
   },
-  "gitHead": "b08461e611911f91162f643132406603646b1bde"
+  "gitHead": "c13a6db9c74b50786732c52d2827e018a3542047"
 }

package/scripts/dev/manage.js

@@ -2,11 +2,10 @@
 const compose = require("docker-compose")
 const path = require("path")
 const fs = require("fs")
-const isWsl = require("is-wsl")
 const { processStringSync } = require("@budibase/string-templates")
 
 function isLinux() {
-  return !isWsl && process.platform !== "darwin" && process.platform !== "win32"
+  return process.platform !== "darwin" && process.platform !== "win32"
 }
 
 // This script wraps docker-compose allowing you to manage your dev infrastructure with simple commands.

package/src/api/controllers/query/import/index.ts

@@ -2,7 +2,6 @@ import { queryValidation } from "../validation"
 import { generateQueryID } from "../../../../db/utils"
 import { ImportInfo, ImportSource } from "./sources/base"
 import { OpenAPI2 } from "./sources/openapi2"
-import { OpenAPI3 } from "./sources/openapi3"
 import { Query } from "./../../../../definitions/common"
 import { Curl } from "./sources/curl"
 // @ts-ignore
@@ -19,7 +18,7 @@ export class RestImporter {
 
   constructor(data: string) {
     this.data = data
-    this.sources = [new OpenAPI2(), new OpenAPI3(), new Curl()]
+    this.sources = [new OpenAPI2(), new Curl()]
   }
 
   init = async () => {

package/src/api/controllers/query/import/sources/base/index.ts

@@ -23,7 +23,7 @@ export abstract class ImportSource {
     name: string,
     method: string,
     path: string,
-    url: URL | string | undefined,
+    url: URL,
     queryString: string,
     headers: object = {},
     parameters: QueryParameter[] = [],
@@ -34,17 +34,7 @@ export abstract class ImportSource {
     const transformer = "return data"
     const schema = {}
     path = this.processPath(path)
-    if (url) {
-      if (typeof url === "string") {
-        path = `${url}/${path}`
-      } else {
-        let href = url.href
-        if (href.endsWith("/")) {
-          href = href.slice(0, -1)
-        }
-        path = `${href}/${path}`
-      }
-    }
+    path = `${url.origin}/${path}`
     queryString = this.processQuery(queryString)
     const requestBody = JSON.stringify(body, null, 2)
 

package/src/api/controllers/query/import/sources/curl.ts

@@ -74,7 +74,7 @@ export class Curl extends ImportSource {
   getQueries = async (datasourceId: string): Promise<Query[]> => {
     const url = this.getUrl()
     const name = url.pathname
-    const path = url.origin + url.pathname
+    const path = url.pathname
     const method = this.curl.method
     const queryString = url.search
     const headers = this.curl.headers
@@ -90,7 +90,7 @@ export class Curl extends ImportSource {
       name,
       method,
       path,
-      undefined,
+      url,
       queryString,
       headers,
       [],

package/src/api/controllers/query/import/tests/index.spec.js

@@ -23,27 +23,14 @@ const oapi2CrudYaml = getData("openapi2/data/crud/crud.json")
 const oapi2PetstoreJson = getData("openapi2/data/petstore/petstore.json")
 const oapi2PetstoreYaml = getData("openapi2/data/petstore/petstore.json")
 
-// openapi3 
-const oapi3CrudJson = getData("openapi3/data/crud/crud.json")
-const oapi3CrudYaml = getData("openapi3/data/crud/crud.json")
-const oapi3PetstoreJson = getData("openapi3/data/petstore/petstore.json")
-const oapi3PetstoreYaml = getData("openapi3/data/petstore/petstore.json")
-
 // curl
 const curl = getData("curl/data/post.txt")
 
 const datasets = {
-  // openapi2 (swagger)
   oapi2CrudJson,
   oapi2CrudYaml,
   oapi2PetstoreJson,
   oapi2PetstoreYaml,
-  // openapi3
-  oapi3CrudJson,
-  oapi3CrudYaml,
-  oapi3PetstoreJson,
-  oapi3PetstoreYaml,
-  // curl
   curl
 }
 
@@ -69,7 +56,6 @@ describe("Rest Importer", () => {
 
   it("gets info", async () => {
     const assertions = {
-      // openapi2 (swagger)
       "oapi2CrudJson" : {
         name: "CRUD",
       },
@@ -82,20 +68,6 @@ describe("Rest Importer", () => {
       "oapi2PetstoreYaml" :{
         name: "Swagger Petstore",
       },
-      // openapi3
-      "oapi3CrudJson" : {
-        name: "CRUD",
-      },
-      "oapi3CrudYaml" : {
-        name: "CRUD",
-      },
-      "oapi3PetstoreJson" : {
-        name: "Swagger Petstore - OpenAPI 3.0",
-      },
-      "oapi3PetstoreYaml" :{
-        name: "Swagger Petstore - OpenAPI 3.0",
-      },
-      // curl
       "curl": {
         name: "example.com",
       }
@@ -117,7 +89,6 @@ describe("Rest Importer", () => {
     // simple sanity assertions that the whole dataset 
     // makes it through the importer
     const assertions = {
-      // openapi2 (swagger)
       "oapi2CrudJson" : {
         count: 6,
       },
@@ -130,20 +101,6 @@ describe("Rest Importer", () => {
       "oapi2PetstoreYaml" :{
         count: 20,
       },
-      // openapi3
-      "oapi3CrudJson" : {
-        count: 6,
-      },
-      "oapi3CrudYaml" :{
-        count: 6,
-      },
-      "oapi3PetstoreJson" : {
-        count: 19,
-      },
-      "oapi3PetstoreYaml" :{
-        count: 19,
-      },
-      // curl
       "curl": {
         count: 1
       }

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

@@ -85,11 +85,7 @@ exports.patch = async ctx => {
   const isUserTable = tableId === InternalTables.USER_METADATA
   let oldRow
   try {
-    let dbTable = await db.get(tableId)
-    oldRow = await outputProcessing(
-      dbTable,
-      await findRow(ctx, tableId, inputs._id)
-    )
+    oldRow = await db.get(inputs._id)
   } catch (err) {
     if (isUserTable) {
       // don't include the rev, it'll be the global rev

package/src/api/routes/analytics.js

@@ -4,7 +4,7 @@ const controller = require("../controllers/analytics")
 const router = Router()
 
 router
-  .get("/api/bbtel", controller.isEnabled)
-  .post("/api/bbtel/ping", controller.endUserPing)
+  .get("/api/analytics", controller.isEnabled)
+  .post("/api/analytics/ping", controller.endUserPing)
 
 module.exports = router

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

@@ -11,10 +11,10 @@ describe("run misc tests", () => {
     await config.init()
   })
 
-  describe("/bbtel", () => {
+  describe("/analytics", () => {
       it("check if analytics enabled", async () => {
         const res = await request
-          .get(`/api/bbtel`)
+          .get(`/api/analytics`)
           .set(config.defaultHeaders())
           .expect("Content-Type", /json/)
           .expect(200)

package/src/definitions/datasource.ts

@@ -48,7 +48,6 @@ export enum SourceNames {
   REST = "REST",
   ORACLE = "ORACLE",
   GOOGLE_SHEETS = "GOOGLE_SHEETS",
-  FIREBASE = "FIREBASE",
 }
 
 export enum IncludeRelationships {