@budibase/frontend-core 1.1.29-alpha.2 → 1.1.31

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.1.29-alpha.2",
+  "version": "1.1.31",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.1.29-alpha.2",
+    "@budibase/bbui": "^1.1.31",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   },
-  "gitHead": "b6680b2f69b7a019cb1ddd6bfd924edeac02d9d8"
+  "gitHead": "da3be5a095ce403e4f1ff13e3b9f21708a998e6b"
 }

package/src/api/index.js

@@ -23,7 +23,6 @@ import { buildUserEndpoints } from "./user"
 import { buildSelfEndpoints } from "./self"
 import { buildViewEndpoints } from "./views"
 import { buildLicensingEndpoints } from "./licensing"
-import { buildGroupsEndpoints } from "./groups"
 
 const defaultAPIClientConfig = {
   /**
@@ -242,6 +241,5 @@ export const createAPIClient = config => {
     ...buildViewEndpoints(API),
     ...buildSelfEndpoints(API),
     ...buildLicensingEndpoints(API),
-    ...buildGroupsEndpoints(API),
   }
 }

package/src/api/user.js

@@ -13,16 +13,13 @@ export const buildUserEndpoints = API => ({
    * @param {string} page The page to retrieve
    * @param {string} search The starts with string to search username/email by.
    */
-  searchUsers: async ({ page, email, appId } = {}) => {
+  searchUsers: async ({ page, search } = {}) => {
     const opts = {}
     if (page) {
       opts.page = page
     }
-    if (email) {
-      opts.email = email
-    }
-    if (appId) {
-      opts.appId = appId
+    if (search) {
+      opts.search = search
     }
     return await API.post({
       url: `/api/global/users/search`,
@@ -83,20 +80,6 @@ export const buildUserEndpoints = API => ({
     })
   },
 
-  /**
-   * Creates multiple users.
-   * @param users the array of user objects to create
-   */
-  createUsers: async ({ users, groups }) => {
-    return await API.post({
-      url: "/api/global/users/bulkCreate",
-      body: {
-        users,
-        groups,
-      },
-    })
-  },
-
   /**
    * Deletes a user from the curernt tenant.
    * @param userId the ID of the user to delete
@@ -107,19 +90,6 @@ export const buildUserEndpoints = API => ({
     })
   },
 
-  /**
-   * Deletes multiple users
-   * @param userId the ID of the user to delete
-   */
-  deleteUsers: async userIds => {
-    return await API.post({
-      url: `/api/global/users/bulkDelete`,
-      body: {
-        userIds,
-      },
-    })
-  },
-
   /**
    * Invites a user to the current tenant.
    * @param email the email address to send the invitation to
@@ -139,25 +109,6 @@ export const buildUserEndpoints = API => ({
     })
   },
 
-  /**
-   * Invites multiple users to the current tenant.
-   * @param email An array of email addresses
-   * @param builder whether the user should be a global builder
-   * @param admin whether the user should be a global admin
-   */
-  inviteUsers: async ({ emails, builder, admin }) => {
-    return await API.post({
-      url: "/api/global/users/inviteMultiple",
-      body: {
-        emails,
-        userInfo: {
-          admin: admin ? { global: true } : undefined,
-          builder: builder ? { global: true } : undefined,
-        },
-      },
-    })
-  },
-
   /**
    * Accepts an invite to join the platform and creates a user.
    * @param inviteCode the invite code sent in the email

package/src/constants.js

@@ -35,7 +35,7 @@ export const OperatorOptions = {
     label: "Less than",
   },
   Contains: {
-    value: "contains",
+    value: "equal",
     label: "Contains",
   },
   NotContains: {
@@ -60,37 +60,6 @@ export const TableNames = {
   USERS: "ta_users",
 }
 
-export const BbRoles = [
-  { label: "App User", value: "appUser" },
-  { label: "Developer", value: "developer" },
-  { label: "Admin", value: "admin" },
-]
-
-export const BuilderRoleDescriptions = [
-  {
-    value: "appUser",
-    icon: "User",
-    label: "App user - Only has access to published apps",
-  },
-  {
-    value: "developer",
-    icon: "Hammer",
-    label: "Developer - Access to the app builder",
-  },
-  {
-    value: "admin",
-    icon: "Draw",
-    label: "Admin - Full access",
-  },
-]
-
-export const PlanType = {
-  FREE: "free",
-  TEAM: "team",
-  BUSINESS: "business",
-  ENTERPRISE: "enterprise",
-}
-
 /**
  * API version header attached to all requests.
  * Version changelog:
@@ -99,10 +68,6 @@ export const PlanType = {
  */
 export const ApiVersion = "1"
 
-export const Features = {
-  USER_GROUPS: "userGroups",
-}
-
 // Role IDs
 export const Roles = {
   ADMIN: "ADMIN",
@@ -111,6 +76,7 @@ export const Roles = {
   PUBLIC: "PUBLIC",
   BUILDER: "BUILDER",
 }
+
 /**
  * Maximum minimum range for SQL number values
  */

package/src/utils/lucene.js

@@ -1,6 +1,8 @@
 import { Helpers } from "@budibase/bbui"
 import { OperatorOptions, SqlNumberTypeRangeMap } from "../constants"
 
+const HBS_REGEX = /{{([^{].*?)}}/g
+
 /**
  * Returns the valid operator options for a certain data type
  * @param type the data type
@@ -98,22 +100,16 @@ export const buildLuceneQuery = filter => {
   if (Array.isArray(filter)) {
     filter.forEach(expression => {
       let { operator, field, type, value, externalType } = expression
+      const isHbs =
+        typeof value === "string" && value.match(HBS_REGEX)?.length > 0
       // Parse all values into correct types
-      if (type === "datetime") {
-        // Ensure date value is a valid date and parse into correct format
-        if (!value) {
-          return
-        }
-        try {
-          value = new Date(value).toISOString()
-        } catch (error) {
-          return
-        }
+      if (type === "datetime" && value) {
+        value = new Date(value).toISOString()
       }
       if (type === "number" && !Array.isArray(value)) {
         if (operator === "oneOf") {
           value = value.split(",").map(item => parseFloat(item))
-        } else {
+        } else if (!isHbs) {
           value = parseFloat(value)
         }
       }

package/src/api/groups.js

@@ -1,40 +0,0 @@
-export const buildGroupsEndpoints = API => ({
-  /**
-   * Creates a user group.
-   * @param user the new group to create
-   */
-  saveGroup: async group => {
-    return await API.post({
-      url: "/api/global/groups",
-      body: group,
-    })
-  },
-  /**
-   * Gets all of the user groups
-   */
-  getGroups: async () => {
-    return await API.get({
-      url: "/api/global/groups",
-    })
-  },
-
-  /**
-   * Gets a group by ID
-   */
-  getGroup: async id => {
-    return await API.get({
-      url: `/api/global/groups/${id}`,
-    })
-  },
-
-  /**
-   * Deletes a user group
-   * @param id the id of the config to delete
-   * @param rev the revision of the config to delete
-   */
-  deleteGroup: async ({ id, rev }) => {
-    return await API.delete({
-      url: `/api/global/groups/${id}/${rev}`,
-    })
-  },
-})