@budibase/server 1.0.59 → 1.0.63

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.59",
+  "version": "1.0.63",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,9 +70,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.59",
-    "@budibase/client": "^1.0.59",
-    "@budibase/string-templates": "^1.0.59",
+    "@budibase/backend-core": "^1.0.63",
+    "@budibase/client": "^1.0.63",
+    "@budibase/string-templates": "^1.0.63",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
@@ -168,5 +168,5 @@
   "optionalDependencies": {
     "oracledb": "^5.3.0"
   },
-  "gitHead": "ac163154169db8c04a6ed148091cf41d1135d668"
+  "gitHead": "3d8776ed83bae17c3ba7dfdab5b9e1ffd40f0db7"
 }

package/src/api/controllers/query/validation.js

@@ -1,6 +1,8 @@
 const joiValidator = require("../../../middleware/joi-validator")
 const Joi = require("joi")
 
+const OPTIONAL_STRING = Joi.string().optional().allow(null).allow("")
+
 exports.queryValidation = () => {
   return Joi.object({
     _id: Joi.string(),
@@ -18,7 +20,7 @@ exports.queryValidation = () => {
     queryVerb: Joi.string().allow().required(),
     extra: Joi.object().optional(),
     schema: Joi.object({}).required().unknown(true),
-    transformer: Joi.string().optional(),
+    transformer: OPTIONAL_STRING,
     flags: Joi.object().optional(),
   })
 }
@@ -31,12 +33,18 @@ exports.generateQueryValidation = () => {
 exports.generateQueryPreviewValidation = () => {
   // prettier-ignore
   return joiValidator.body(Joi.object({
+    _id: OPTIONAL_STRING,
+    _rev: OPTIONAL_STRING,
+    readable: Joi.boolean().optional(),
     fields: Joi.object().required(),
-    queryVerb: Joi.string().allow().required(),
+    queryVerb: Joi.string().required(),
+    name: OPTIONAL_STRING,
+    flags: Joi.object().optional(),
+    schema: Joi.object().optional(),
     extra: Joi.object().optional(),
     datasourceId: Joi.string().required(),
-    transformer: Joi.string().optional(),
+    transformer: OPTIONAL_STRING,
     parameters: Joi.object({}).required().unknown(true),
-    queryId: Joi.string().optional(),
+    queryId: OPTIONAL_STRING,
   }))
 }

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

@@ -169,6 +169,7 @@ describe("/queries", () => {
           parameters: {},
           fields: {},
           queryVerb: "read",
+          name: datasource.name,
         })
         .set(config.defaultHeaders())
         .expect("Content-Type", /json/)
@@ -261,9 +262,13 @@ describe("/queries", () => {
     })
 
     it("check that it automatically retries on fail with cached dynamics", async () => {
-      const { datasource, query: base } = await config.dynamicVariableDatasource()
+      const { datasource, query: base } =
+        await config.dynamicVariableDatasource()
       // preview once to cache
-      await preview(datasource, { path: "www.google.com", queryString: "test={{ variable3 }}" })
+      await preview(datasource, {
+        path: "www.google.com",
+        queryString: "test={{ variable3 }}",
+      })
       // check its in cache
       const contents = await checkCacheForDynamicVariable(base._id, "variable3")
       expect(contents.rows.length).toEqual(1)
@@ -276,9 +281,13 @@ describe("/queries", () => {
     })
 
     it("deletes variables when linked query is deleted", async () => {
-      const { datasource, query: base } = await config.dynamicVariableDatasource()
+      const { datasource, query: base } =
+        await config.dynamicVariableDatasource()
       // preview once to cache
-      await preview(datasource, { path: "www.google.com", queryString: "test={{ variable3 }}" })
+      await preview(datasource, {
+        path: "www.google.com",
+        queryString: "test={{ variable3 }}",
+      })
       // check its in cache
       let contents = await checkCacheForDynamicVariable(base._id, "variable3")
       expect(contents.rows.length).toEqual(1)

package/src/tests/utilities/TestConfiguration.js

@@ -393,6 +393,7 @@ class TestConfiguration {
         parameters: {},
         fields,
         queryVerb: "read",
+        name: datasource.name,
       })
       .set(config.defaultHeaders())
       .expect("Content-Type", /json/)