@budibase/server 1.0.13-alpha.0 → 1.0.13

package/dist/api/controllers/{query/index.js → query.js}

@@ -9,12 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { processString } = require("@budibase/string-templates");
-const CouchDB = require("../../../db");
-const { generateQueryID, getQueryParams, isProdAppID, } = require("../../../db/utils");
-const { BaseQueryVerbs } = require("../../../constants");
-const { Thread, ThreadType } = require("../../../threads");
-const { save: saveDatasource } = require("../datasource");
-const { RestImporter } = require("./import");
+const CouchDB = require("../../db");
+const { generateQueryID, getQueryParams, isProdAppID, } = require("../../db/utils");
+const { BaseQueryVerbs } = require("../../constants");
+const { Thread, ThreadType } = require("../../threads");
 const Runner = new Thread(ThreadType.QUERY, { timeoutMs: 10000 });
 // simple function to append "readable" to all read queries
 function enrichQueries(input) {
@@ -36,38 +34,6 @@ exports.fetch = function (ctx) {
         ctx.body = enrichQueries(body.rows.map(row => row.doc));
     });
 };
-exports.import = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const body = ctx.request.body;
-    const data = body.data;
-    const importer = new RestImporter(data);
-    yield importer.init();
-    let datasourceId;
-    if (!body.datasourceId) {
-        // construct new datasource
-        const info = yield importer.getInfo();
-        let datasource = {
-            type: "datasource",
-            source: "REST",
-            config: {
-                url: info.url,
-                defaultHeaders: [],
-            },
-            name: info.name,
-        };
-        // save the datasource
-        const datasourceCtx = Object.assign({}, ctx);
-        datasourceCtx.request.body.datasource = datasource;
-        yield saveDatasource(datasourceCtx);
-        datasourceId = datasourceCtx.body.datasource._id;
-    }
-    else {
-        // use existing datasource
-        datasourceId = body.datasourceId;
-    }
-    const importResult = yield importer.importQueries(ctx.appId, datasourceId);
-    ctx.body = Object.assign(Object.assign({}, importResult), { datasourceId });
-    ctx.status = 200;
-});
 exports.save = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = new CouchDB(ctx.appId);

package/dist/api/controllers/webhook.js

@@ -65,10 +65,6 @@ exports.buildSchema = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         let automation = yield db.get(webhook.action.target);
         const autoOutputs = automation.definition.trigger.schema.outputs;
         let properties = webhook.bodySchema.properties;
-        // reset webhook outputs
-        autoOutputs.properties = {
-            body: autoOutputs.properties.body,
-        };
         for (let prop of Object.keys(properties)) {
             autoOutputs.properties[prop] = {
                 type: properties[prop].type,

package/dist/api/routes/query.js

@@ -2,14 +2,44 @@
 const Router = require("@koa/router");
 const queryController = require("../controllers/query");
 const authorized = require("../../middleware/authorized");
+const Joi = require("joi");
 const { PermissionLevels, PermissionTypes, BUILDER, } = require("@budibase/auth/permissions");
+const joiValidator = require("../../middleware/joi-validator");
 const { bodyResource, bodySubResource, paramResource, } = require("../../middleware/resourceId");
-const { generateQueryPreviewValidation, generateQueryValidation, } = require("../controllers/query/validation");
 const router = Router();
+function generateQueryValidation() {
+    // prettier-ignore
+    return joiValidator.body(Joi.object({
+        _id: Joi.string(),
+        _rev: Joi.string(),
+        name: Joi.string().required(),
+        fields: Joi.object().required(),
+        datasourceId: Joi.string().required(),
+        readable: Joi.boolean(),
+        parameters: Joi.array().items(Joi.object({
+            name: Joi.string(),
+            default: Joi.string().allow(""),
+        })),
+        queryVerb: Joi.string().allow().required(),
+        extra: Joi.object().optional(),
+        schema: Joi.object({}).required().unknown(true),
+        transformer: Joi.string().optional(),
+    }));
+}
+function generateQueryPreviewValidation() {
+    // prettier-ignore
+    return joiValidator.body(Joi.object({
+        fields: Joi.object().required(),
+        queryVerb: Joi.string().allow().required(),
+        extra: Joi.object().optional(),
+        datasourceId: Joi.string().required(),
+        transformer: Joi.string().optional(),
+        parameters: Joi.object({}).required().unknown(true)
+    }));
+}
 router
     .get("/api/queries", authorized(BUILDER), queryController.fetch)
     .post("/api/queries", bodySubResource("datasourceId", "_id"), authorized(BUILDER), generateQueryValidation(), queryController.save)
-    .post("/api/queries/import", authorized(BUILDER), queryController.import)
     .post("/api/queries/preview", bodyResource("datasourceId"), authorized(BUILDER), generateQueryPreviewValidation(), queryController.preview)
     .get("/api/queries/:queryId", paramResource("queryId"), authorized(PermissionTypes.QUERY, PermissionLevels.READ), queryController.find)
     .post("/api/queries/:queryId", paramResource("queryId"), authorized(PermissionTypes.QUERY, PermissionLevels.WRITE), queryController.execute)

package/dist/package.json

@@ -69,7 +69,6 @@
     "author": "Budibase",
     "license": "GPL-3.0",
     "dependencies": {
-        "@apidevtools/swagger-parser": "^10.0.3",
         "@budibase/auth": "^1.0.12",
         "@budibase/client": "^1.0.12",
         "@budibase/string-templates": "^1.0.12",
@@ -86,14 +85,12 @@
         "bull": "^3.22.4",
         "chmodr": "1.2.0",
         "csvtojson": "2.0.10",
-        "curlconverter": "^3.21.0",
         "dotenv": "8.2.0",
         "download": "8.0.0",
         "fix-path": "3.0.0",
         "fs-extra": "8.1.0",
         "jimp": "0.16.1",
         "joi": "17.2.1",
-        "js-yaml": "^4.1.0",
         "jsonschema": "1.4.0",
         "knex": "^0.95.6",
         "koa": "2.7.0",
@@ -149,7 +146,6 @@
         "eslint": "^6.8.0",
         "jest": "^27.0.5",
         "nodemon": "^2.0.4",
-        "openapi-types": "^9.3.1",
         "path-to-regexp": "^6.2.0",
         "prettier": "^2.3.1",
         "rimraf": "^3.0.2",