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

package/dist/index.umd.js

@@ -58,8 +58,9 @@
       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 {
@@ -176,6 +177,11 @@
     React.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) {
@@ -198,10 +204,15 @@
           setRolesLoading(false);
         }
       });
-    }, [dataSourceDelegate?.initialised, rolesPath]);
+    }, [dataSourceDelegate?.initialised, dataSourceDelegate?.authenticated, rolesPath]);
     React.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) {
@@ -224,7 +235,7 @@
           setUsersLoading(false);
         }
       });
-    }, [dataSourceDelegate?.initialised, usersPath]);
+    }, [dataSourceDelegate?.initialised, dataSourceDelegate?.authenticated, usersPath]);
     const saveUser = React.useCallback(async (user) => {
       if (!dataSourceDelegate) throw Error("useBuildUserManagement Firebase not initialised");
       if (!usersPath) throw Error("useBuildUserManagement Firestore not initialised");
@@ -314,7 +325,7 @@
         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,
@@ -386,6 +397,13 @@
     id: Yup__namespace.string().required("Required"),
     name: Yup__namespace.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,
@@ -395,22 +413,34 @@
   }) {
     const { saveRole } = useUserManagement();
     const isNewRole = !role;
+    const {
+      user: loggedInUser
+    } = core.useAuthController();
     const [savingError, setSavingError] = React.useState();
     const onRoleUpdated = React.useCallback((role2) => {
       setSavingError(void 0);
+      if (!loggedInUser) throw new Error("User not found");
+      canRoleBeEdited(loggedInUser);
       return saveRole(role2);
-    }, [saveRole]);
+    }, [saveRole, loggedInUser]);
     const formex$1 = 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) => {
@@ -859,7 +889,7 @@
                 ] })
               ] }),
               /* @__PURE__ */ jsxRuntime.jsxs(ui.DialogActions, { position: "sticky", children: [
-                savingError && /* @__PURE__ */ jsxRuntime.jsx(ui.Typography, { className: "text-red-500", children: "There was an error saving this role" }),
+                savingError && /* @__PURE__ */ jsxRuntime.jsx(ui.Typography, { className: "text-red-500 dark:text-red-500", children: savingError.message ?? "There was an error saving this role" }),
                 /* @__PURE__ */ jsxRuntime.jsx(
                   ui.Button,
                   {