@firecms/user_management 3.0.0-canary.117 → 3.0.0-canary.118

package/src/hooks/useBuildUserManagement.tsx

@@ -2,10 +2,18 @@ import React, { useCallback, useEffect } from "react";
 import equal from "react-fast-compare"
 
 import { UserManagement } from "../types";
-import { Authenticator, DataSourceDelegate, Entity, PermissionsBuilder, Role, User } from "@firecms/core";
+import {
+    Authenticator,
+    DataSourceDelegate,
+    Entity,
+    PermissionsBuilder,
+    removeUndefined,
+    Role,
+    User
+} from "@firecms/core";
 import { resolveUserRolePermissions } from "../utils";
 
-type UserWithRoleIds = User & { roles: string[] };
+type UserWithRoleIds = Omit<User, "roles"> & { roles: string[] };
 
 export interface UserManagementParams {
 
@@ -154,15 +162,22 @@ export function useBuildUserManagement({
         const roleIds = user.roles?.map(r => r.id);
         const email = user.email?.toLowerCase().trim();
         if (!email) throw Error("Email is required");
+
+        const userExists = users.find(u => u.email?.toLowerCase() === email);
         const data = {
             ...user,
-            roles: roleIds
+            roles: roleIds ?? []
         };
+        if (!userExists) {
+            // @ts-ignore
+            data.created_on = new Date();
+        }
+
         return dataSourceDelegate.saveEntity({
             status: "existing",
             path: usersPath,
             entityId: email,
-            values: data
+            values: removeUndefined(data)
         }).then(() => user);
     }, [usersPath, dataSourceDelegate?.initialised]);
 
@@ -178,7 +193,7 @@ export function useBuildUserManagement({
             status: "existing",
             path: rolesPath,
             entityId: id,
-            values: roleData
+            values: removeUndefined(roleData)
         }).then(() => {
             return;
         });