@firecms/user_management 3.0.0-beta.13 → 3.0.0-beta.15

package/dist/index.es.js

@@ -3,7 +3,7 @@ import equal from "react-fast-compare";
 import { removeUndefined, useAuthController, toSnakeCase, FieldCaption, ConfirmationDialog, useNavigationController, useSnackbarController, useCustomizationController, defaultDateFormat } from "@firecms/core";
 import { jsx, jsxs, Fragment } from "react/jsx-runtime";
 import { c } from "react-compiler-runtime";
-import { getColorSchemeForSeed, Chip, TextField, TableRow, TableCell, Checkbox, Tooltip, Button, Typography, DialogTitle, TableHeader, Paper, Table, TableBody, SelectItem, Select, DialogContent, CheckIcon, LoadingButton, DialogActions, Dialog, IconButton, DeleteIcon, CenteredView, AddIcon, Container, MultiSelectItem, MultiSelect } from "@firecms/ui";
+import { getColorSchemeForSeed, Chip, TextField, TableRow, TableCell, Checkbox, Tooltip, Button, Typography, DialogTitle, TableHeader, Paper, Table, TableBody, SelectItem, Select, DialogContent, LoadingButton, DialogActions, Dialog, IconButton, DeleteIcon, CenteredView, AddIcon, Container, MultiSelectItem, MultiSelect } from "@firecms/ui";
 import * as Yup from "yup";
 import { useCreateFormex, getIn, Formex } from "@firecms/formex";
 import { format } from "date-fns";
@@ -242,6 +242,20 @@ function useBuildUserManagement({
     if (!userExists) {
       data.created_on = /* @__PURE__ */ new Date();
     }
+    if (userExists && userExists.uid !== user.uid) {
+      const entity = {
+        values: {},
+        path: usersPath,
+        id: userExists.uid
+      };
+      await dataSourceDelegate.deleteEntity({
+        entity
+      }).then(() => {
+        console.debug("Deleted previous user", userExists);
+      }).catch((e_3) => {
+        console.error("Error deleting user", e_3);
+      });
+    }
     return dataSourceDelegate.saveEntity({
       status: "existing",
       path: usersPath,
@@ -273,13 +287,13 @@ function useBuildUserManagement({
     const {
       uid
     } = user_0;
-    const entity = {
+    const entity_0 = {
       path: usersPath,
       id: uid,
       values: {}
     };
     await dataSourceDelegate.deleteEntity({
-      entity
+      entity: entity_0
     });
   }, [usersPath, dataSourceDelegate?.initialised]);
   const deleteRole = useCallback(async (role_0) => {
@@ -289,13 +303,13 @@ function useBuildUserManagement({
     const {
       id: id_0
     } = role_0;
-    const entity_0 = {
+    const entity_1 = {
       path: rolesPath,
       id: id_0,
       values: {}
     };
     await dataSourceDelegate.deleteEntity({
-      entity: entity_0
+      entity: entity_1
     });
   }, [rolesPath, dataSourceDelegate?.initialised]);
   const collectionPermissions = useCallback(({
@@ -320,12 +334,27 @@ function useBuildUserManagement({
     if (loading) {
       return false;
     }
+    if (user_3 === null) {
+      console.warn("User is null, returning");
+      return false;
+    }
     if (users.length === 0) {
       console.warn("No users created yet");
       return true;
     }
     const mgmtUser_0 = users.find((u_3) => u_3.email?.toLowerCase() === user_3?.email?.toLowerCase());
     if (mgmtUser_0) {
+      if (mgmtUser_0.uid !== user_3.uid) {
+        console.warn("User uid has changed, updating user in user management system");
+        saveUser({
+          ...mgmtUser_0,
+          uid: user_3.uid
+        }).then(() => {
+          console.debug("User updated in user management system", mgmtUser_0);
+        }).catch((e_4) => {
+          console.error("Error updating user in user management system", e_4);
+        });
+      }
       console.debug("User found in user management system", mgmtUser_0);
       return true;
     }
@@ -338,6 +367,11 @@ function useBuildUserManagement({
     console.debug("Setting roles", userRoles);
     authController.setUserRoles?.(userRoles ?? []);
   }, [userRoleIds]);
+  const getUser = useCallback((uid_0) => {
+    if (!users) return null;
+    const user_4 = users.find((u_4) => u_4.uid === uid_0);
+    return user_4 ?? null;
+  }, [users]);
   return {
     loading,
     roles,
@@ -357,6 +391,7 @@ function useBuildUserManagement({
     ...authController,
     initialLoading: authController.initialLoading || loading,
     userRoles,
+    getUser,
     user: authController.user ? {
       ...authController.user,
       roles: userRoles
@@ -453,7 +488,7 @@ function canRoleBeEdited(loggedUser) {
   return true;
 }
 function RolesDetailsForm(t0) {
-  const $ = c(165);
+  const $ = c(164);
   const {
     open,
     role,
@@ -1068,7 +1103,7 @@ function RolesDetailsForm(t0) {
   }
   let t80;
   if ($[144] !== handleClose) {
-    t80 = /* @__PURE__ */ jsx(Button, { variant: "text", onClick: () => {
+    t80 = /* @__PURE__ */ jsx(Button, { variant: "text", color: "primary", onClick: () => {
       handleClose();
     }, children: "Cancel" });
     $[144] = handleClose;
@@ -1077,71 +1112,64 @@ function RolesDetailsForm(t0) {
     t80 = $[145];
   }
   const t81 = !dirty;
-  let t82;
-  if ($[146] === Symbol.for("react.memo_cache_sentinel")) {
-    t82 = /* @__PURE__ */ jsx(CheckIcon, {});
-    $[146] = t82;
-  } else {
-    t82 = $[146];
-  }
-  const t83 = isNewRole ? "Create role" : "Update";
-  let t84;
-  if ($[147] !== isSubmitting || $[148] !== t81 || $[149] !== t83) {
-    t84 = /* @__PURE__ */ jsx(LoadingButton, { variant: "filled", color: "primary", type: "submit", disabled: t81, loading: isSubmitting, startIcon: t82, children: t83 });
-    $[147] = isSubmitting;
-    $[148] = t81;
+  const t82 = isNewRole ? "Create role" : "Update";
+  let t83;
+  if ($[146] !== isSubmitting || $[147] !== t81 || $[148] !== t82) {
+    t83 = /* @__PURE__ */ jsx(LoadingButton, { variant: "filled", color: "primary", type: "submit", disabled: t81, loading: isSubmitting, children: t82 });
+    $[146] = isSubmitting;
+    $[147] = t81;
+    $[148] = t82;
     $[149] = t83;
-    $[150] = t84;
   } else {
-    t84 = $[150];
+    t83 = $[149];
   }
-  let t85;
-  if ($[151] !== t79 || $[152] !== t80 || $[153] !== t84) {
-    t85 = /* @__PURE__ */ jsxs(DialogActions, { position: "sticky", children: [
+  let t84;
+  if ($[150] !== t79 || $[151] !== t80 || $[152] !== t83) {
+    t84 = /* @__PURE__ */ jsxs(DialogActions, { position: "sticky", children: [
       t79,
       t80,
-      t84
+      t83
     ] });
-    $[151] = t79;
-    $[152] = t80;
+    $[150] = t79;
+    $[151] = t80;
+    $[152] = t83;
     $[153] = t84;
-    $[154] = t85;
   } else {
-    t85 = $[154];
+    t84 = $[153];
   }
-  let t86;
-  if ($[155] !== formex.handleSubmit || $[156] !== t78 || $[157] !== t85) {
-    t86 = /* @__PURE__ */ jsxs("form", { noValidate: true, autoComplete: "off", onSubmit: formex.handleSubmit, style: t7, children: [
+  let t85;
+  if ($[154] !== formex.handleSubmit || $[155] !== t78 || $[156] !== t84) {
+    t85 = /* @__PURE__ */ jsxs("form", { noValidate: true, autoComplete: "off", onSubmit: formex.handleSubmit, style: t7, children: [
       t8,
       t78,
-      t85
+      t84
     ] });
-    $[155] = formex.handleSubmit;
-    $[156] = t78;
+    $[154] = formex.handleSubmit;
+    $[155] = t78;
+    $[156] = t84;
     $[157] = t85;
-    $[158] = t86;
   } else {
-    t86 = $[158];
+    t85 = $[157];
   }
-  let t87;
-  if ($[159] !== formex || $[160] !== t86) {
-    t87 = /* @__PURE__ */ jsx(Formex, { value: formex, children: t86 });
-    $[159] = formex;
+  let t86;
+  if ($[158] !== formex || $[159] !== t85) {
+    t86 = /* @__PURE__ */ jsx(Formex, { value: formex, children: t85 });
+    $[158] = formex;
+    $[159] = t85;
     $[160] = t86;
-    $[161] = t87;
   } else {
-    t87 = $[161];
+    t86 = $[160];
   }
-  let t88;
-  if ($[162] !== open || $[163] !== t87) {
-    t88 = /* @__PURE__ */ jsx(Dialog, { open, maxWidth: "4xl", children: t87 });
-    $[162] = open;
+  let t87;
+  if ($[161] !== open || $[162] !== t86) {
+    t87 = /* @__PURE__ */ jsx(Dialog, { open, maxWidth: "4xl", children: t86 });
+    $[161] = open;
+    $[162] = t86;
     $[163] = t87;
-    $[164] = t88;
   } else {
-    t88 = $[164];
+    t87 = $[163];
   }
-  return t88;
+  return t87;
 }
 function _temp6$1(value_1) {
   return value_1 === "own" ? "Own" : value_1 === "true" ? "Yes" : "No";
@@ -1448,7 +1476,7 @@ function canUserBeEdited(loggedUser, user, users, roles, prevUser) {
   return true;
 }
 function UserDetailsForm(t0) {
-  const $ = c(74);
+  const $ = c(73);
   const {
     open,
     user: userProp,
@@ -1686,7 +1714,7 @@ function UserDetailsForm(t0) {
   }
   let t25;
   if ($[53] !== handleClose) {
-    t25 = /* @__PURE__ */ jsx(Button, { variant: "text", onClick: () => {
+    t25 = /* @__PURE__ */ jsx(Button, { variant: "text", color: "primary", onClick: () => {
       handleClose();
     }, children: "Cancel" });
     $[53] = handleClose;
@@ -1695,70 +1723,63 @@ function UserDetailsForm(t0) {
     t25 = $[54];
   }
   const t26 = !dirty;
-  let t27;
-  if ($[55] === Symbol.for("react.memo_cache_sentinel")) {
-    t27 = /* @__PURE__ */ jsx(CheckIcon, {});
-    $[55] = t27;
-  } else {
-    t27 = $[55];
-  }
-  const t28 = isNewUser ? "Create user" : "Update";
-  let t29;
-  if ($[56] !== isSubmitting || $[57] !== t26 || $[58] !== t28) {
-    t29 = /* @__PURE__ */ jsx(LoadingButton, { variant: "filled", color: "primary", type: "submit", disabled: t26, loading: isSubmitting, startIcon: t27, children: t28 });
-    $[56] = isSubmitting;
-    $[57] = t26;
+  const t27 = isNewUser ? "Create user" : "Update";
+  let t28;
+  if ($[55] !== isSubmitting || $[56] !== t26 || $[57] !== t27) {
+    t28 = /* @__PURE__ */ jsx(LoadingButton, { variant: "filled", color: "primary", type: "submit", disabled: t26, loading: isSubmitting, children: t27 });
+    $[55] = isSubmitting;
+    $[56] = t26;
+    $[57] = t27;
     $[58] = t28;
-    $[59] = t29;
   } else {
-    t29 = $[59];
+    t28 = $[58];
   }
-  let t30;
-  if ($[60] !== t25 || $[61] !== t29) {
-    t30 = /* @__PURE__ */ jsxs(DialogActions, { children: [
+  let t29;
+  if ($[59] !== t25 || $[60] !== t28) {
+    t29 = /* @__PURE__ */ jsxs(DialogActions, { children: [
       t25,
-      t29
+      t28
     ] });
-    $[60] = t25;
+    $[59] = t25;
+    $[60] = t28;
     $[61] = t29;
-    $[62] = t30;
   } else {
-    t30 = $[62];
+    t29 = $[61];
   }
-  let t31;
-  if ($[63] !== handleSubmit || $[64] !== t24 || $[65] !== t30) {
-    t31 = /* @__PURE__ */ jsxs("form", { onSubmit: handleSubmit, autoComplete: "off", noValidate: true, style: t6, children: [
+  let t30;
+  if ($[62] !== handleSubmit || $[63] !== t24 || $[64] !== t29) {
+    t30 = /* @__PURE__ */ jsxs("form", { onSubmit: handleSubmit, autoComplete: "off", noValidate: true, style: t6, children: [
       t7,
       t24,
-      t30
+      t29
     ] });
-    $[63] = handleSubmit;
-    $[64] = t24;
+    $[62] = handleSubmit;
+    $[63] = t24;
+    $[64] = t29;
     $[65] = t30;
-    $[66] = t31;
   } else {
-    t31 = $[66];
+    t30 = $[65];
   }
-  let t32;
-  if ($[67] !== formex || $[68] !== t31) {
-    t32 = /* @__PURE__ */ jsx(Formex, { value: formex, children: t31 });
-    $[67] = formex;
+  let t31;
+  if ($[66] !== formex || $[67] !== t30) {
+    t31 = /* @__PURE__ */ jsx(Formex, { value: formex, children: t30 });
+    $[66] = formex;
+    $[67] = t30;
     $[68] = t31;
-    $[69] = t32;
   } else {
-    t32 = $[69];
+    t31 = $[68];
   }
-  let t33;
-  if ($[70] !== open || $[71] !== t32 || $[72] !== t5) {
-    t33 = /* @__PURE__ */ jsx(Dialog, { open, onOpenChange: t5, maxWidth: "4xl", children: t32 });
-    $[70] = open;
-    $[71] = t32;
-    $[72] = t5;
-    $[73] = t33;
+  let t32;
+  if ($[69] !== open || $[70] !== t31 || $[71] !== t5) {
+    t32 = /* @__PURE__ */ jsx(Dialog, { open, onOpenChange: t5, maxWidth: "4xl", children: t31 });
+    $[69] = open;
+    $[70] = t31;
+    $[71] = t5;
+    $[72] = t32;
   } else {
-    t33 = $[73];
+    t32 = $[72];
   }
-  return t33;
+  return t32;
 }
 function _temp7(userRole) {
   return /* @__PURE__ */ jsx(MultiSelectItem, { value: userRole.id, children: /* @__PURE__ */ jsx(RoleChip, { role: userRole }, userRole?.id) }, userRole.id);