@budibase/server 2.0.18 → 2.0.20

package/dist/api/controllers/application.js

@@ -38,6 +38,7 @@ const backend_core_2 = require("@budibase/backend-core");
 const types_1 = require("@budibase/types");
 const layouts_1 = require("../../constants/layouts");
 const pro_2 = require("@budibase/pro");
+const plugins_1 = require("../../utilities/plugins");
 const URL_REGEX_SLASH = /\/|\\/g;
 // utility function, need to do away with this
 function getLayouts() {
@@ -176,9 +177,11 @@ const fetchAppDefinition = (ctx) => __awaiter(void 0, void 0, void 0, function*
 exports.fetchAppDefinition = fetchAppDefinition;
 const fetchAppPackage = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const db = backend_core_1.context.getAppDB();
-    const application = yield db.get(utils_1.DocumentType.APP_METADATA);
+    let application = yield db.get(utils_1.DocumentType.APP_METADATA);
     const layouts = yield getLayouts();
     let screens = yield getScreens();
+    // Enrich plugin URLs
+    application.usedPlugins = (0, plugins_1.enrichPluginURLs)(application.usedPlugins);
     // Only filter screens if the user is not a builder
     if (!(ctx.user.builder && ctx.user.builder.global)) {
         const userRoleId = getUserRoleId(ctx);

package/dist/api/controllers/public/utils.js

@@ -32,7 +32,7 @@ function addRev(body, tableId) {
 }
 exports.addRev = addRev;
 /**
- * Performs a case insensitive search on the provided documents, using the
+ * Performs a case in-sensitive search on the provided documents, using the
  * provided key and value. This will be a string based search, using the
  * startsWith function.
  */

package/dist/api/controllers/row/internalSearch.js

@@ -120,7 +120,7 @@ class QueryBuilder {
      * @param options The preprocess options
      * @returns {string|*}
      */
-    preprocess(value, { escape, lowercase, wrap } = {}) {
+    preprocess(value, { escape, lowercase, wrap, type } = {}) {
         const hasVersion = !!this.version;
         // Determine if type needs wrapped
         const originalType = typeof value;
@@ -133,7 +133,7 @@ class QueryBuilder {
             value = `${value}`.replace(/[ #+\-&|!(){}\]^"~*?:\\]/g, "\\$&");
         }
         // Wrap in quotes
-        if (originalType === "string" && !isNaN(value) && !escape) {
+        if (originalType === "string" && !isNaN(value) && !type) {
             value = `"${value}"`;
         }
         else if (hasVersion && wrap) {
@@ -221,6 +221,7 @@ class QueryBuilder {
                 value = builder.preprocess(value, {
                     escape: true,
                     lowercase: true,
+                    type: "string",
                 });
                 return `${key}:${value}*`;
             });
@@ -249,6 +250,7 @@ class QueryBuilder {
                 value = builder.preprocess(value, {
                     escape: true,
                     lowercase: true,
+                    type: "fuzzy",
                 });
                 return `${key}:${value}~`;
             });

package/dist/api/controllers/static/index.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSignedUploadURL = exports.serveClientLibrary = exports.serveBuilderPreview = exports.serveApp = exports.deleteObjects = exports.uploadFile = exports.serveBuilder = exports.toggleBetaUiFeature = void 0;
+const plugins_1 = require("../../../utilities/plugins");
 require("svelte/register");
 const send = require("koa-send");
 const { resolve, join } = require("../../../utilities/centralPath");
@@ -108,12 +109,13 @@ const serveApp = function (ctx) {
         let appId = getAppId();
         if (!env.isJest()) {
             const App = require("./templates/BudibaseApp.svelte").default;
+            const plugins = (0, plugins_1.enrichPluginURLs)(appInfo.usedPlugins);
             const { head, html, css } = App.render({
                 title: appInfo.name,
                 production: env.isProd(),
                 appId,
                 clientLibPath: clientLibraryPath(appId, appInfo.version, ctx),
-                usedPlugins: appInfo.usedPlugins,
+                usedPlugins: plugins,
             });
             const appHbs = loadHandlebarsFile(`${__dirname}/templates/app.hbs`);
             ctx.body = yield processString(appHbs, {

package/dist/api/controllers/static/templates/BudibaseApp.svelte

@@ -88,9 +88,7 @@
   <!-- But before loadBudibase is called -->
   {#if usedPlugins?.length}
     {#each usedPlugins as plugin}
-      <script
-        type="application/javascript"
-        src={`/plugins/${plugin.jsUrl}`}></script>
+      <script type="application/javascript" src={plugin.jsUrl}></script>
     {/each}
   {/if}
   <script type="application/javascript">

package/dist/api/controllers/table/internal.js

@@ -30,6 +30,8 @@ const environment_1 = require("../../../environment");
 const rowProcessor_1 = require("../../../utilities/rowProcessor");
 const bulkFormula_1 = require("./bulkFormula");
 const pro_1 = require("@budibase/pro");
+const lodash_1 = require("lodash");
+const fp_1 = require("lodash/fp");
 function checkAutoColumns(table, oldTable) {
     if (!table.schema) {
         return table;
@@ -124,9 +126,15 @@ function save(ctx) {
         if (updatedRows && updatedRows.length !== 0) {
             yield db.bulkDocs(updatedRows);
         }
-        const result = yield db.put(tableToSave);
+        let result = yield db.put(tableToSave);
         tableToSave._rev = result.rev;
+        const savedTable = (0, fp_1.cloneDeep)(tableToSave);
         tableToSave = yield tableSaveFunctions.after(tableToSave);
+        // the table may be updated as part of the table save after functionality - need to write it
+        if (!(0, lodash_1.isEqual)(savedTable, tableToSave)) {
+            result = yield db.put(tableToSave);
+            tableToSave._rev = result.rev;
+        }
         // has to run after, make sure it has _id
         yield (0, bulkFormula_1.runStaticFormulaChecks)(tableToSave, { oldTable, deletion: null });
         return tableToSave;

package/dist/api/controllers/table/utils.js

@@ -220,7 +220,7 @@ class TableSaveFunctions {
     after(table) {
         return __awaiter(this, void 0, void 0, function* () {
             table = yield handleSearchIndexes(table);
-            yield handleDataImport(this.user, table, this.dataImport);
+            table = yield handleDataImport(this.user, table, this.dataImport);
             return table;
         });
     }

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.0.17",
+    "version": "2.0.19",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -77,11 +77,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "^2.0.17",
-        "@budibase/client": "^2.0.17",
-        "@budibase/pro": "2.0.17",
-        "@budibase/string-templates": "^2.0.17",
-        "@budibase/types": "^2.0.17",
+        "@budibase/backend-core": "^2.0.19",
+        "@budibase/client": "^2.0.19",
+        "@budibase/pro": "2.0.19",
+        "@budibase/string-templates": "^2.0.19",
+        "@budibase/types": "^2.0.19",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",