@budibase/frontend-core 1.0.212-alpha.4 → 1.0.212-alpha.7

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.212-alpha.4",
+  "version": "1.0.212-alpha.7",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.212-alpha.4",
+    "@budibase/bbui": "^1.0.212-alpha.7",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   },
-  "gitHead": "03cdf3688a0c34a7303a83d81b24e03b8589ce54"
+  "gitHead": "548b2c1a9fa92fb4e9bef9f3cef05bb9097af701"
 }

package/src/api/other.js

@@ -60,7 +60,7 @@ export const buildOtherEndpoints = API => ({
    */
   checkBetaAccess: async email => {
     return await API.get({
-      url: `${process.env.FEATURE_PREVIEW_URL}/api/beta/access?email=${email}`,
+      url: `/api/beta/access?email=${email}`,
       external: true,
     })
   },

package/src/constants.js

@@ -42,6 +42,10 @@ export const OperatorOptions = {
     value: "notEqual",
     label: "Does Not Contain",
   },
+  In: {
+    value: "oneOf",
+    label: "Is in",
+  },
 }
 
 // Cookie names

package/src/utils/lucene.js

@@ -14,6 +14,7 @@ export const getValidOperatorsForType = type => {
     Op.Like,
     Op.Empty,
     Op.NotEmpty,
+    Op.In,
   ]
   const numOps = [
     Op.Equals,
@@ -22,6 +23,7 @@ export const getValidOperatorsForType = type => {
     Op.LessThan,
     Op.Empty,
     Op.NotEmpty,
+    Op.In,
   ]
   if (type === "string") {
     return stringOps
@@ -91,6 +93,7 @@ export const buildLuceneQuery = filter => {
     notEmpty: {},
     contains: {},
     notContains: {},
+    oneOf: {},
   }
   if (Array.isArray(filter)) {
     filter.forEach(expression => {
@@ -99,8 +102,12 @@ export const buildLuceneQuery = filter => {
       if (type === "datetime" && value) {
         value = new Date(value).toISOString()
       }
-      if (type === "number") {
-        value = parseFloat(value)
+      if (type === "number" && !Array.isArray(value)) {
+        if (operator === "oneOf") {
+          value = value.split(",").map(item => parseFloat(item))
+        } else {
+          value = parseFloat(value)
+        }
       }
       if (type === "boolean") {
         value = `${value}`?.toLowerCase() === "true"
@@ -139,7 +146,6 @@ export const buildLuceneQuery = filter => {
       }
     })
   }
-
   return query
 }
 
@@ -211,6 +217,17 @@ export const runLuceneQuery = (docs, query) => {
     return docValue == null || docValue === ""
   })
 
+  // Process an includes match (fails if the value is not included)
+  const oneOf = match("oneOf", (docValue, testValue) => {
+    if (typeof testValue === "string") {
+      testValue = testValue.split(",")
+      if (typeof docValue === "number") {
+        testValue = testValue.map(item => parseFloat(item))
+      }
+    }
+    return !testValue?.includes(docValue)
+  })
+
   // Match a document against all criteria
   const docMatch = doc => {
     return (
@@ -220,7 +237,8 @@ export const runLuceneQuery = (docs, query) => {
       equalMatch(doc) &&
       notEqualMatch(doc) &&
       emptyMatch(doc) &&
-      notEmptyMatch(doc)
+      notEmptyMatch(doc) &&
+      oneOf(doc)
     )
   }