@budibase/server 1.0.27-alpha.10 → 1.0.27-alpha.11

package/dist/api/controllers/datasource.js

@@ -13,6 +13,7 @@ const { generateDatasourceID, getDatasourceParams, getQueryParams, DocumentTypes
 const { BuildSchemaErrors, InvalidColumns } = require("../../constants");
 const { integrations } = require("../../integrations");
 const { getDatasourceAndQuery } = require("./row/utils");
+const { invalidateDynamicVariables } = require("../../threads/utils");
 exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const database = new CouchDB(ctx.appId);
@@ -45,11 +46,39 @@ exports.buildSchemaFromDb = function (ctx) {
         ctx.body = response;
     });
 };
+/**
+ * Check for variables that have been updated or removed and invalidate them.
+ */
+const invalidateVariables = (existingDatasource, updatedDatasource) => __awaiter(void 0, void 0, void 0, function* () {
+    const existingVariables = existingDatasource.config.dynamicVariables;
+    const updatedVariables = updatedDatasource.config.dynamicVariables;
+    const toInvalidate = [];
+    if (!existingVariables) {
+        return;
+    }
+    if (!updatedVariables) {
+        // invalidate all
+        toInvalidate.push(...existingVariables);
+    }
+    else {
+        // invaldate changed / removed
+        existingVariables.forEach(existing => {
+            const unchanged = updatedVariables.find(updated => existing.name === updated.name &&
+                existing.queryId === updated.queryId &&
+                existing.value === updated.value);
+            if (!unchanged) {
+                toInvalidate.push(existing);
+            }
+        });
+    }
+    yield invalidateDynamicVariables(toInvalidate);
+});
 exports.update = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = new CouchDB(ctx.appId);
         const datasourceId = ctx.params.datasourceId;
         let datasource = yield db.get(datasourceId);
+        yield invalidateVariables(datasource, ctx.request.body);
         datasource = Object.assign(Object.assign({}, datasource), ctx.request.body);
         const response = yield db.put(datasource);
         datasource._rev = response.rev;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.27-alpha.9",
+    "version": "1.0.27-alpha.10",
     "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/auth": "^1.0.27-alpha.9",
-        "@budibase/client": "^1.0.27-alpha.9",
-        "@budibase/string-templates": "^1.0.27-alpha.9",
+        "@budibase/auth": "^1.0.27-alpha.10",
+        "@budibase/client": "^1.0.27-alpha.10",
+        "@budibase/string-templates": "^1.0.27-alpha.10",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",

package/dist/tests/utilities/TestConfiguration.js

@@ -301,6 +301,46 @@ class TestConfiguration {
             return this.datasource;
         });
     }
+    restDatasource(cfg) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.createDatasource({
+                datasource: Object.assign(Object.assign({}, basicDatasource().datasource), { source: "REST", config: cfg || {} }),
+            });
+        });
+    }
+    dynamicVariableDatasource() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let datasource = yield this.restDatasource();
+            const basedOnQuery = yield this.createQuery(Object.assign(Object.assign({}, basicQuery(datasource._id)), { fields: {
+                    path: "www.google.com",
+                } }));
+            datasource = yield this.updateDatasource(Object.assign(Object.assign({}, datasource), { config: {
+                    dynamicVariables: [
+                        {
+                            queryId: basedOnQuery._id,
+                            name: "variable3",
+                            value: "{{ data.0.[value] }}",
+                        },
+                    ],
+                } }));
+            return { datasource, query: basedOnQuery };
+        });
+    }
+    previewQuery(request, config, datasource, fields) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return request
+                .post(`/api/queries/preview`)
+                .send({
+                datasourceId: datasource._id,
+                parameters: {},
+                fields,
+                queryVerb: "read",
+            })
+                .set(config.defaultHeaders())
+                .expect("Content-Type", /json/)
+                .expect(200);
+        });
+    }
     createQuery(config = null) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.datasource && !config) {