@budibase/frontend-core 2.28.6 → 2.28.7

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.28.6",
+  "version": "2.28.7",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.28.6",
-    "@budibase/shared-core": "2.28.6",
-    "@budibase/types": "2.28.6",
+    "@budibase/bbui": "2.28.7",
+    "@budibase/shared-core": "2.28.7",
+    "@budibase/types": "2.28.7",
     "dayjs": "^1.10.8",
     "lodash": "4.17.21",
     "shortid": "2.2.15",
     "socket.io-client": "^4.6.1"
   },
-  "gitHead": "bc810319e03346048231738ec87f781e438e9554"
+  "gitHead": "b1ed4509cf54dc3e0e52f8968ffcc1d76b198061"
 }

package/src/components/FilterBuilder.svelte

@@ -13,7 +13,7 @@
   } from "@budibase/bbui"
   import { FieldType, SearchFilterOperator } from "@budibase/types"
   import { generate } from "shortid"
-  import { LuceneUtils, Constants } from "@budibase/frontend-core"
+  import { QueryUtils, Constants } from "@budibase/frontend-core"
   import { getContext } from "svelte"
   import FilterUsers from "./FilterUsers.svelte"
   import { getFields } from "../utils/searchFields"
@@ -112,7 +112,7 @@
       return []
     }
 
-    return LuceneUtils.getValidOperatorsForType(
+    return QueryUtils.getValidOperatorsForType(
       filter,
       filter.field || filter.name,
       datasource

package/src/components/Updating.svelte

@@ -1,18 +1,22 @@
 <script>
   export let isMigrationDone
   export let onMigrationDone
-  export let timeoutSeconds = 10 // 3 minutes
+  export let timeoutSeconds = 60 // 1 minute
+  export let minTimeSeconds = 3
 
   const loadTime = Date.now()
+  const intervalMs = 1000
   let timedOut = false
+  let secondsWaited = 0
 
   async function checkMigrationsFinished() {
     setTimeout(async () => {
       const isMigrated = await isMigrationDone()
 
       const timeoutMs = timeoutSeconds * 1000
-      if (!isMigrated) {
+      if (!isMigrated || secondsWaited <= minTimeSeconds) {
         if (loadTime + timeoutMs > Date.now()) {
+          secondsWaited += 1
           return checkMigrationsFinished()
         }
 
@@ -20,7 +24,7 @@
       }
 
       onMigrationDone()
-    }, 1000)
+    }, intervalMs)
   }
 
   checkMigrationsFinished()
@@ -41,6 +45,11 @@
   <span class="subtext">
     {#if !timedOut}
       Please wait and we will be back in a second!
+      <br />
+      Checkout the
+      <a href="https://docs.budibase.com/docs/app-migrations" target="_blank"
+        >documentation</a
+      > on app migrations.
     {:else}
       An error occurred, please try again later.
       <br />

package/src/fetch/DataFetch.js

@@ -1,10 +1,9 @@
 import { writable, derived, get } from "svelte/store"
 import { cloneDeep } from "lodash/fp"
-import { LuceneUtils } from "../utils"
+import { QueryUtils } from "../utils"
 import { convertJSONSchemaToTableSchema } from "../utils/json"
 
-const { buildLuceneQuery, luceneLimit, runLuceneQuery, luceneSort } =
-  LuceneUtils
+const { buildQuery, limit: queryLimit, runQuery, sort } = QueryUtils
 
 /**
  * Parent class which handles the implementation of fetching data from an
@@ -177,10 +176,10 @@ export default class DataFetch {
       }
     }
 
-    // Build the lucene query
+    // Build the query
     let query = this.options.query
     if (!query) {
-      query = buildLuceneQuery(filter)
+      query = buildQuery(filter)
     }
 
     // Update store
@@ -229,17 +228,17 @@ export default class DataFetch {
 
     // If we don't support searching, do a client search
     if (!this.features.supportsSearch && clientSideSearching) {
-      rows = runLuceneQuery(rows, query)
+      rows = runQuery(rows, query)
     }
 
     // If we don't support sorting, do a client-side sort
     if (!this.features.supportsSort && clientSideSorting) {
-      rows = luceneSort(rows, sortColumn, sortOrder, sortType)
+      rows = sort(rows, sortColumn, sortOrder, sortType)
     }
 
     // If we don't support pagination, do a client-side limit
     if (!this.features.supportsPagination && clientSideLimiting) {
-      rows = luceneLimit(rows, limit)
+      rows = queryLimit(rows, limit)
     }
 
     return {

package/src/fetch/UserFetch.js

@@ -1,7 +1,7 @@
 import { get } from "svelte/store"
 import DataFetch from "./DataFetch.js"
 import { TableNames } from "../constants"
-import { LuceneUtils } from "../utils"
+import { QueryUtils } from "../utils"
 
 export default class UserFetch extends DataFetch {
   constructor(opts) {
@@ -33,7 +33,7 @@ export default class UserFetch extends DataFetch {
     let finalQuery
     // convert old format to new one - we now allow use of the lucene format
     const { appId, paginated, ...rest } = query
-    if (!LuceneUtils.hasFilters(query) && rest.email != null) {
+    if (!QueryUtils.hasFilters(query) && rest.email != null) {
       finalQuery = { string: { email: rest.email } }
     } else {
       finalQuery = rest

package/src/utils/index.js

@@ -1,4 +1,4 @@
-export { dataFilters as LuceneUtils } from "@budibase/shared-core"
+export { dataFilters as QueryUtils } from "@budibase/shared-core"
 export * as JSONUtils from "./json"
 export * as CookieUtils from "./cookies"
 export * as RoleUtils from "./roles"