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

package/dist/index.es.js

@@ -1,9 +1,9 @@
 import React, { useEffect, useCallback, useContext, useState } from "react";
 import equal from "react-fast-compare";
+import { removeUndefined, useAuthController, toSnakeCase, FieldCaption, DeleteConfirmationDialog, useNavigationController, useSnackbarController, useCustomizationController, defaultDateFormat } from "@firecms/core";
 import { jsx, jsxs, Fragment } from "react/jsx-runtime";
 import { getColorSchemeForSeed, Chip, Dialog, DialogContent, Typography, TextField, Paper, Table, TableHeader, TableCell, TableBody, TableRow, Tooltip, Checkbox, Button, Select, SelectItem, DialogActions, LoadingButton, DoneIcon, IconButton, DeleteIcon, CenteredView, Container, AddIcon, MultiSelect, MultiSelectItem } from "@firecms/ui";
 import * as Yup from "yup";
-import { toSnakeCase, FieldCaption, DeleteConfirmationDialog, useNavigationController, useSnackbarController, useAuthController, useCustomizationController, defaultDateFormat } from "@firecms/core";
 import { useCreateFormex, getIn, Formex } from "@firecms/formex";
 import { format } from "date-fns";
 import * as locales from "date-fns/locale";
@@ -45,8 +45,9 @@ function resolveCollectionRole(role, id) {
     edit: role.isAdmin || role.defaultPermissions?.edit,
     delete: role.isAdmin || role.defaultPermissions?.delete
   };
-  if (role.collectionPermissions && role.collectionPermissions[id]) {
-    return mergePermissions(role.collectionPermissions[id], basePermissions);
+  const thisCollectionPermissions = role.collectionPermissions?.[id];
+  if (thisCollectionPermissions) {
+    return mergePermissions(thisCollectionPermissions, basePermissions);
   } else if (role.defaultPermissions) {
     return mergePermissions(role.defaultPermissions, basePermissions);
   } else {
@@ -163,6 +164,11 @@ function useBuildUserManagement({
   useEffect(() => {
     if (!dataSourceDelegate || !rolesPath) return;
     if (dataSourceDelegate.initialised !== void 0 && !dataSourceDelegate.initialised) return;
+    if (dataSourceDelegate.authenticated !== void 0 && !dataSourceDelegate.authenticated) {
+      setRolesLoading(false);
+      return;
+    }
+    setRolesLoading(true);
     return dataSourceDelegate.listenCollection?.({
       path: rolesPath,
       onUpdate(entities) {
@@ -185,10 +191,15 @@ function useBuildUserManagement({
         setRolesLoading(false);
       }
     });
-  }, [dataSourceDelegate?.initialised, rolesPath]);
+  }, [dataSourceDelegate?.initialised, dataSourceDelegate?.authenticated, rolesPath]);
   useEffect(() => {
     if (!dataSourceDelegate || !usersPath) return;
     if (dataSourceDelegate.initialised !== void 0 && !dataSourceDelegate.initialised) return;
+    if (dataSourceDelegate.authenticated !== void 0 && !dataSourceDelegate.authenticated) {
+      setUsersLoading(false);
+      return;
+    }
+    setUsersLoading(true);
     return dataSourceDelegate.listenCollection?.({
       path: usersPath,
       onUpdate(entities) {
@@ -211,7 +222,7 @@ function useBuildUserManagement({
         setUsersLoading(false);
       }
     });
-  }, [dataSourceDelegate?.initialised, usersPath]);
+  }, [dataSourceDelegate?.initialised, dataSourceDelegate?.authenticated, usersPath]);
   const saveUser = useCallback(async (user) => {
     if (!dataSourceDelegate) throw Error("useBuildUserManagement Firebase not initialised");
     if (!usersPath) throw Error("useBuildUserManagement Firestore not initialised");
@@ -219,15 +230,19 @@ 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) {
+      data.created_on = /* @__PURE__ */ new Date();
+    }
     return dataSourceDelegate.saveEntity({
       status: "existing",
       path: usersPath,
       entityId: email,
-      values: data
+      values: removeUndefined(data)
     }).then(() => user);
   }, [usersPath, dataSourceDelegate?.initialised]);
   const saveRole = useCallback((role) => {
@@ -242,7 +257,7 @@ function useBuildUserManagement({
       status: "existing",
       path: rolesPath,
       entityId: id,
-      values: roleData
+      values: removeUndefined(roleData)
     }).then(() => {
       return;
     });
@@ -297,7 +312,7 @@ function useBuildUserManagement({
       return true;
     }
     throw Error("Could not find a user with the provided email in the user management system.");
-  }, [loading, users]);
+  }, [loading, users, usersError, rolesError]);
   const isAdmin = roles.some((r) => r.id === "admin");
   return {
     loading,
@@ -369,6 +384,13 @@ const RoleYupSchema = Yup.object().shape({
   id: Yup.string().required("Required"),
   name: Yup.string().required("Required")
 });
+function canRoleBeEdited(loggedUser) {
+  const loggedUserIsAdmin = loggedUser.roles?.map((r) => r.id).includes("admin");
+  if (!loggedUserIsAdmin) {
+    throw new Error("Only admins can edit roles");
+  }
+  return true;
+}
 function RolesDetailsForm({
   open,
   role,
@@ -378,22 +400,34 @@ function RolesDetailsForm({
 }) {
   const { saveRole } = useUserManagement();
   const isNewRole = !role;
+  const {
+    user: loggedInUser
+  } = useAuthController();
   const [savingError, setSavingError] = useState();
   const onRoleUpdated = useCallback((role2) => {
     setSavingError(void 0);
+    if (!loggedInUser) throw new Error("User not found");
+    canRoleBeEdited(loggedInUser);
     return saveRole(role2);
-  }, [saveRole]);
+  }, [saveRole, loggedInUser]);
   const formex = useCreateFormex({
     initialValues: role ?? {
       name: ""
     },
     onSubmit: (role2, formexController) => {
-      return onRoleUpdated(role2).then(() => {
-        formexController.resetForm({
-          values: role2
+      try {
+        return onRoleUpdated(role2).then(() => {
+          formexController.resetForm({
+            values: role2
+          });
+          handleClose();
+        }).catch((e) => {
+          setSavingError(e);
         });
-        handleClose();
-      }).catch((e) => setSavingError(e));
+      } catch (e) {
+        setSavingError(e);
+        return Promise.resolve();
+      }
     },
     validation: (values2) => {
       return RoleYupSchema.validate(values2, { abortEarly: false }).then(() => ({})).catch((e) => {
@@ -842,7 +876,7 @@ function RolesDetailsForm({
               ] })
             ] }),
             /* @__PURE__ */ jsxs(DialogActions, { position: "sticky", children: [
-              savingError && /* @__PURE__ */ jsx(Typography, { className: "text-red-500", children: "There was an error saving this role" }),
+              savingError && /* @__PURE__ */ jsx(Typography, { className: "text-red-500 dark:text-red-500", children: savingError.message ?? "There was an error saving this role" }),
               /* @__PURE__ */ jsx(
                 Button,
                 {