@budibase/frontend-core 1.4.17 → 1.4.18-alpha.0

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.4.17",
+  "version": "1.4.18-alpha.0",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.4.17",
+    "@budibase/bbui": "1.4.18-alpha.0",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   },
-  "gitHead": "3ff0089293ddb047d76c1027f6e5ccf2c63c313d"
+  "gitHead": "98b35601971af8bfc10bf6a252d3213c0bc06a4a"
 }

package/src/api/groups.js

@@ -1,40 +1,91 @@
-export const buildGroupsEndpoints = API => ({
-  /**
-   * Creates a user group.
-   * @param user the new group to create
-   */
-  saveGroup: async group => {
+export const buildGroupsEndpoints = API => {
+  // underlying functionality of adding/removing users/apps to groups
+  async function updateGroupResource(groupId, resource, operation, ids) {
+    if (!Array.isArray(ids)) {
+      ids = [ids]
+    }
     return await API.post({
-      url: "/api/global/groups",
-      body: group,
+      url: `/api/global/groups/${groupId}/${resource}`,
+      body: {
+        [operation]: ids,
+      },
     })
-  },
-  /**
-   * 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}`,
-    })
-  },
+  return {
+    /**
+     * Creates a user group.
+     * @param group the new group to create
+     */
+    saveGroup: async group => {
+      return await API.post({
+        url: "/api/global/groups",
+        body: group,
+      })
+    },
+    /**
+     * Gets all the user groups
+     */
+    getGroups: async () => {
+      return await API.get({
+        url: "/api/global/groups",
+      })
+    },
 
-  /**
-   * 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}`,
-    })
-  },
-})
+    /**
+     * 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}`,
+      })
+    },
+
+    /**
+     * Adds users to a group
+     * @param groupId The group to update
+     * @param userIds The user IDs to be added
+     */
+    addUsersToGroup: async (groupId, userIds) => {
+      return updateGroupResource(groupId, "users", "add", userIds)
+    },
+
+    /**
+     * Removes users from a group
+     * @param groupId The group to update
+     * @param userIds The user IDs to be removed
+     */
+    removeUsersFromGroup: async (groupId, userIds) => {
+      return updateGroupResource(groupId, "users", "remove", userIds)
+    },
+
+    /**
+     * Adds apps to a group
+     * @param groupId The group to update
+     * @param appArray Array of objects, containing the appId and roleId to be added
+     */
+    addAppsToGroup: async (groupId, appArray) => {
+      return updateGroupResource(groupId, "apps", "add", appArray)
+    },
+
+    /**
+     * Removes apps from a group
+     * @param groupId The group to update
+     * @param appArray Array of objects, containing the appId to be removed
+     */
+    removeAppsFromGroup: async (groupId, appArray) => {
+      return updateGroupResource(groupId, "apps", "remove", appArray)
+    },
+  }
+}

package/src/api/licensing.js

@@ -9,6 +9,15 @@ export const buildLicensingEndpoints = API => ({
     })
   },
 
+  /**
+   * Delete a self hosted license key
+   */
+  deleteLicenseKey: async () => {
+    return API.delete({
+      url: `/api/global/license/info`,
+    })
+  },
+
   /**
    * Get the license info - metadata about the license including the
    * obfuscated license key.

package/src/api/user.js

@@ -86,15 +86,19 @@ export const buildUserEndpoints = API => ({
   /**
    * Creates multiple users.
    * @param users the array of user objects to create
+   * @param groups the array of group ids to add all users to
    */
   createUsers: async ({ users, groups }) => {
-    return await API.post({
-      url: "/api/global/users/bulkCreate",
+    const res = await API.post({
+      url: "/api/global/users/bulk",
       body: {
-        users,
-        groups,
+        create: {
+          users,
+          groups,
+        },
       },
     })
+    return res.created
   },
 
   /**
@@ -109,15 +113,18 @@ export const buildUserEndpoints = API => ({
 
   /**
    * Deletes multiple users
-   * @param userId the ID of the user to delete
+   * @param userIds the ID of the user to delete
    */
   deleteUsers: async userIds => {
-    return await API.post({
-      url: `/api/global/users/bulkDelete`,
+    const res = await API.post({
+      url: `/api/global/users/bulk`,
       body: {
-        userIds,
+        delete: {
+          userIds,
+        },
       },
     })
+    return res.deleted
   },
 
   /**
@@ -151,6 +158,7 @@ export const buildUserEndpoints = API => ({
         userInfo: {
           admin: user.admin ? { global: true } : undefined,
           builder: user.admin || user.builder ? { global: true } : undefined,
+          groups: user.groups,
         },
       })),
     })

package/src/fetch/DataFetch.js

@@ -156,6 +156,8 @@ export default class DataFetch {
       schema,
       query,
       loading: true,
+      cursors: [],
+      cursor: null,
     }))
 
     // Actually fetch data

package/src/fetch/UserFetch.js

@@ -0,0 +1,52 @@
+import { get } from "svelte/store"
+import DataFetch from "./DataFetch.js"
+import { TableNames } from "../constants"
+
+export default class UserFetch extends DataFetch {
+  constructor(opts) {
+    super({
+      ...opts,
+      datasource: {
+        tableId: TableNames.USERS,
+      },
+    })
+  }
+
+  determineFeatureFlags() {
+    return {
+      supportsSearch: true,
+      supportsSort: false,
+      supportsPagination: true,
+    }
+  }
+
+  async getDefinition() {
+    return {
+      schema: {},
+    }
+  }
+
+  async getData() {
+    const { cursor, query } = get(this.store)
+    try {
+      // "query" normally contains a lucene query, but users uses a non-standard
+      // search endpoint so we use query uniquely here
+      const res = await this.API.searchUsers({
+        page: cursor,
+        email: query.email,
+        appId: query.appId,
+      })
+      return {
+        rows: res?.data || [],
+        hasNextPage: res?.hasNextPage || false,
+        cursor: res?.nextPage || null,
+      }
+    } catch (error) {
+      return {
+        rows: [],
+        hasNextPage: false,
+        error,
+      }
+    }
+  }
+}

package/src/fetch/fetchData.js

@@ -5,12 +5,14 @@ import RelationshipFetch from "./RelationshipFetch.js"
 import NestedProviderFetch from "./NestedProviderFetch.js"
 import FieldFetch from "./FieldFetch.js"
 import JSONArrayFetch from "./JSONArrayFetch.js"
+import UserFetch from "./UserFetch.js"
 
 const DataFetchMap = {
   table: TableFetch,
   view: ViewFetch,
   query: QueryFetch,
   link: RelationshipFetch,
+  user: UserFetch,
 
   // Client specific datasource types
   provider: NestedProviderFetch,

package/src/themes/nord.css

@@ -28,6 +28,7 @@
   --spectrum-global-color-static-blue-600: #5680b4;
   --spectrum-global-color-static-blue-700: #4e79af;
   --spectrum-global-color-static-blue-800: #4a73a6;
+  --spectrum-global-color-static-blue: var(--spectrum-global-color-blue-600);
 
   --spectrum-global-color-gray-50: #2e3440;
   --spectrum-global-color-gray-75: #353b4a;

package/src/utils/utils.js

@@ -19,3 +19,24 @@ export const sequential = fn => {
     }
   }
 }
+
+/**
+ * Utility to debounce an async function and ensure a minimum delay between
+ * invocations is enforced.
+ * @param callback an async function to run
+ * @param minDelay the minimum delay between invocations
+ * @returns {Promise} a debounced version of the callback
+ */
+export const debounce = (callback, minDelay = 1000) => {
+  let timeout
+  return async (...params) => {
+    return new Promise(resolve => {
+      if (timeout) {
+        clearTimeout(timeout)
+      }
+      timeout = setTimeout(async () => {
+        resolve(await callback(...params))
+      }, minDelay)
+    })
+  }
+}