@firecms/user_management 3.0.0-canary.259 → 3.0.0-canary.260

package/dist/hooks/useBuildUserManagement.d.ts

@@ -1,5 +1,5 @@
 import { UserManagement } from "../types";
-import { AuthController, DataSourceDelegate, User } from "@firecms/core";
+import { AuthController, DataSourceDelegate, Role, User } from "@firecms/core";
 export interface UserManagementParams<CONTROLLER extends AuthController<any> = AuthController<any>> {
     authController: CONTROLLER;
     /**
@@ -19,6 +19,11 @@ export interface UserManagementParams<CONTROLLER extends AuthController<any> = A
      * Default: __FIRECMS/config/roles
      */
     rolesPath?: string;
+    /**
+     * The roles that are available in the user management system.
+     * If you provide this, the user management system will not fetch the roles from the database.
+     */
+    roles?: Role[];
     /**
      * If there are no roles in the database, provide a button to create the default roles.
      */
@@ -35,7 +40,8 @@ export interface UserManagementParams<CONTROLLER extends AuthController<any> = A
  * @param dataSourceDelegate
  * @param usersPath
  * @param rolesPath
+ * @param roles
  * @param allowDefaultRolesCreation
  * @param includeCollectionConfigPermissions
  */
-export declare function useBuildUserManagement<CONTROLLER extends AuthController<any> = AuthController<any>, USER extends User = CONTROLLER extends AuthController<infer U> ? U : any>({ authController, dataSourceDelegate, usersPath, rolesPath, allowDefaultRolesCreation, includeCollectionConfigPermissions }: UserManagementParams<CONTROLLER>): UserManagement<USER> & CONTROLLER;
+export declare function useBuildUserManagement<CONTROLLER extends AuthController<any> = AuthController<any>, USER extends User = CONTROLLER extends AuthController<infer U> ? U : any>({ authController, dataSourceDelegate, roles: rolesProp, usersPath, rolesPath, allowDefaultRolesCreation, includeCollectionConfigPermissions }: UserManagementParams<CONTROLLER>): UserManagement<USER> & CONTROLLER;

package/dist/index.es.js

@@ -145,6 +145,7 @@ function hexToRgbaWithOpacity(hexColor, opacity = 10) {
 function useBuildUserManagement({
   authController,
   dataSourceDelegate,
+  roles: rolesProp,
   usersPath = "__FIRECMS/config/users",
   rolesPath = "__FIRECMS/config/roles",
   allowDefaultRolesCreation,
@@ -153,9 +154,10 @@ function useBuildUserManagement({
   if (!authController) {
     throw Error("useBuildUserManagement: You need to provide an authController since version 3.0.0-beta.11. Check https://firecms.co/docs/pro/migrating_from_v3_beta");
   }
-  const [rolesLoading, setRolesLoading] = React.useState(true);
+  const rolesDefinedInCode = (rolesProp ?? [])?.length > 0;
+  const [rolesLoading, setRolesLoading] = React.useState(!rolesDefinedInCode);
   const [usersLoading, setUsersLoading] = React.useState(true);
-  const [roles, setRoles] = React.useState([]);
+  const [roles, setRoles] = React.useState(rolesProp ?? []);
   const [usersWithRoleIds, setUsersWithRoleIds] = React.useState([]);
   const users = usersWithRoleIds.map((u) => ({
     ...u,
@@ -167,6 +169,7 @@ function useBuildUserManagement({
   const _rolesLoading = rolesLoading;
   const loading = _rolesLoading || _usersLoading;
   useEffect(() => {
+    if (rolesDefinedInCode) return;
     if (!dataSourceDelegate || !rolesPath) return;
     if (dataSourceDelegate.initialised !== void 0 && !dataSourceDelegate.initialised) return;
     if (authController?.initialLoading) return;
@@ -175,6 +178,7 @@ function useBuildUserManagement({
       path: rolesPath,
       onUpdate(entities) {
         setRolesError(void 0);
+        console.debug("Updating roles", entities);
         try {
           const newRoles = entityToRoles(entities);
           if (!equal(newRoles, roles)) {
@@ -194,7 +198,7 @@ function useBuildUserManagement({
         setRolesLoading(false);
       }
     });
-  }, [dataSourceDelegate?.initialised, authController?.initialLoading, authController?.user?.uid, rolesPath]);
+  }, [rolesDefinedInCode, dataSourceDelegate?.initialised, authController?.initialLoading, authController?.user?.uid, rolesPath]);
   useEffect(() => {
     if (!dataSourceDelegate || !usersPath) return;
     if (dataSourceDelegate.initialised !== void 0 && !dataSourceDelegate.initialised) {
@@ -364,7 +368,10 @@ function useBuildUserManagement({
   const isAdmin = (userRoles ?? []).some((r_2) => r_2.id === "admin");
   const userRoleIds = userRoles?.map((r_3) => r_3.id);
   useEffect(() => {
-    console.debug("Setting roles", userRoles);
+    console.debug("Setting user roles", {
+      userRoles,
+      roles
+    });
     authController.setUserRoles?.(userRoles ?? []);
   }, [userRoleIds]);
   const getUser = useCallback((uid_0) => {