@firecms/user_management 3.0.1 → 3.1.0-canary.9e89e98

package/dist/components/roles/RolesDetailsForm.d.ts

@@ -1,15 +1,12 @@
 import * as Yup from "yup";
 import { EntityCollection, Role } from "@firecms/core";
-export declare const RoleYupSchema: Yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-    id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-    name: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-}>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-    id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-    name: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-}>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-    id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-    name: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-}>>>;
+export declare const RoleYupSchema: Yup.ObjectSchema<{
+    id: string;
+    name: string;
+}, Yup.AnyObject, {
+    id: undefined;
+    name: undefined;
+}, "">;
 export declare function RolesDetailsForm({ open, role, editable, handleClose, collections }: {
     open: boolean;
     editable?: boolean;

package/dist/components/users/UserDetailsForm.d.ts

@@ -1,18 +1,14 @@
 import * as Yup from "yup";
 import { User } from "@firecms/core";
-export declare const UserYupSchema: Yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-    displayName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-    email: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-    roles: import("yup/lib/array").OptionalArraySchema<Yup.AnySchema, import("yup/lib/types").AnyObject, any[] | undefined>;
-}>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-    displayName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-    email: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-    roles: import("yup/lib/array").OptionalArraySchema<Yup.AnySchema, import("yup/lib/types").AnyObject, any[] | undefined>;
-}>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-    displayName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-    email: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-    roles: import("yup/lib/array").OptionalArraySchema<Yup.AnySchema, import("yup/lib/types").AnyObject, any[] | undefined>;
-}>>>;
+export declare const UserYupSchema: Yup.ObjectSchema<{
+    displayName: string;
+    email: string;
+    roles: any[] | undefined;
+}, Yup.AnyObject, {
+    displayName: undefined;
+    email: undefined;
+    roles: undefined;
+}, "">;
 export declare function UserDetailsForm({ open, user: userProp, handleClose }: {
     open: boolean;
     user?: User;

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, 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, Avatar } from "@firecms/ui";
 import * as Yup from "yup";
 import { useCreateFormex, getIn, Formex } from "@firecms/formex";
 import { format } from "date-fns";
@@ -348,11 +348,17 @@ function useBuildUserManagement({
     }
     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");
+      const needsUidUpdate = mgmtUser_0.uid !== user_3.uid;
+      const needsPhotoUpdate = user_3.photoURL && mgmtUser_0.photoURL !== user_3.photoURL;
+      if (needsUidUpdate || needsPhotoUpdate) {
+        const updateReason = needsUidUpdate ? "uid" : "photoURL";
+        console.debug(`User ${updateReason} has changed, updating user in user management system`);
         saveUser({
           ...mgmtUser_0,
-          uid: user_3.uid
+          uid: user_3.uid,
+          ...needsPhotoUpdate ? {
+            photoURL: user_3.photoURL
+          } : {}
         }).then(() => {
           console.debug("User updated in user management system", mgmtUser_0);
         }).catch((e_4) => {
@@ -1110,7 +1116,7 @@ function RolesDetailsForm(t0) {
   }
   let t80;
   if ($[144] !== handleClose) {
-    t80 = /* @__PURE__ */ jsx(Button, { variant: "text", color: "primary", onClick: () => {
+    t80 = /* @__PURE__ */ jsx(Button, { variant: "text", onClick: () => {
       handleClose();
     }, children: "Cancel" });
     $[144] = handleClose;
@@ -1122,7 +1128,7 @@ function RolesDetailsForm(t0) {
   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 });
+    t83 = /* @__PURE__ */ jsx(LoadingButton, { variant: "filled", type: "submit", disabled: t81, loading: isSubmitting, children: t82 });
     $[146] = isSubmitting;
     $[147] = t81;
     $[148] = t82;
@@ -1295,7 +1301,7 @@ function RolesTable(t0) {
   if ($[5] !== allowDefaultRolesCreation || $[6] !== roles || $[7] !== saveRole) {
     t3 = (!roles || roles.length === 0) && /* @__PURE__ */ jsx(TableRow, { children: /* @__PURE__ */ jsx(TableCell, { colspan: 4, children: /* @__PURE__ */ jsxs(CenteredView, { className: "flex flex-col gap-4 my-8 items-center", children: [
       /* @__PURE__ */ jsx(Typography, { variant: "label", children: "You don't have any roles yet." }),
-      allowDefaultRolesCreation && /* @__PURE__ */ jsx(Button, { variant: "outlined", onClick: () => {
+      allowDefaultRolesCreation && /* @__PURE__ */ jsx(Button, { onClick: () => {
         DEFAULT_ROLES.forEach((role_0) => {
           saveRole(role_0);
         });
@@ -1721,7 +1727,7 @@ function UserDetailsForm(t0) {
   }
   let t25;
   if ($[53] !== handleClose) {
-    t25 = /* @__PURE__ */ jsx(Button, { variant: "text", color: "primary", onClick: () => {
+    t25 = /* @__PURE__ */ jsx(Button, { variant: "text", onClick: () => {
       handleClose();
     }, children: "Cancel" });
     $[53] = handleClose;
@@ -1733,7 +1739,7 @@ function UserDetailsForm(t0) {
   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 });
+    t28 = /* @__PURE__ */ jsx(LoadingButton, { variant: "filled", type: "submit", disabled: t26, loading: isSubmitting, children: t27 });
     $[55] = isSubmitting;
     $[56] = t26;
     $[57] = t27;
@@ -1832,11 +1838,12 @@ function UsersTable(t0) {
   let t1;
   if ($[0] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
     t1 = /* @__PURE__ */ jsxs(TableHeader, { children: [
-      /* @__PURE__ */ jsx(TableCell, { className: "truncate w-16" }),
+      /* @__PURE__ */ jsx(TableCell, { className: "w-12" }),
       /* @__PURE__ */ jsx(TableCell, { children: "Email" }),
       /* @__PURE__ */ jsx(TableCell, { children: "Name" }),
       /* @__PURE__ */ jsx(TableCell, { children: "Roles" }),
-      /* @__PURE__ */ jsx(TableCell, { children: "Created on" })
+      /* @__PURE__ */ jsx(TableCell, { children: "Created on" }),
+      /* @__PURE__ */ jsx(TableCell, { className: "w-12" })
     ] });
     $[0] = t1;
   } else {
@@ -1852,14 +1859,15 @@ function UsersTable(t0) {
       return /* @__PURE__ */ jsxs(TableRow, { onClick: () => {
         onUserClicked(user);
       }, children: [
-        /* @__PURE__ */ jsx(TableCell, { className: "w-10", children: /* @__PURE__ */ jsx(Tooltip, { asChild: true, title: "Delete this user", children: /* @__PURE__ */ jsx(IconButton, { size: "small", onClick: (event) => {
-          event.stopPropagation();
-          return setUserToBeDeleted(user);
-        }, children: /* @__PURE__ */ jsx(DeleteIcon, {}) }) }) }),
+        /* @__PURE__ */ jsx(TableCell, { className: "w-12", children: /* @__PURE__ */ jsx(Avatar, { src: user.photoURL ?? void 0, outerClassName: "w-8 h-8 min-w-8 min-h-8 p-0", className: "text-sm", hover: false, children: user.displayName ? user.displayName[0].toUpperCase() : user.email ? user.email[0].toUpperCase() : "U" }) }),
         /* @__PURE__ */ jsx(TableCell, { children: user.email }),
         /* @__PURE__ */ jsx(TableCell, { className: "font-medium align-left", children: user.displayName }),
         /* @__PURE__ */ jsx(TableCell, { className: "align-left", children: userRoles ? /* @__PURE__ */ jsx("div", { className: "flex flex-wrap gap-2", children: userRoles.map(_temp$1) }) : null }),
-        /* @__PURE__ */ jsx(TableCell, { children: formattedDate })
+        /* @__PURE__ */ jsx(TableCell, { children: formattedDate }),
+        /* @__PURE__ */ jsx(TableCell, { className: "w-12", children: /* @__PURE__ */ jsx(Tooltip, { asChild: true, title: "Delete this user", children: /* @__PURE__ */ jsx(IconButton, { size: "smallest", onClick: (event) => {
+          event.stopPropagation();
+          return setUserToBeDeleted(user);
+        }, children: /* @__PURE__ */ jsx(DeleteIcon, { size: "small" }) }) }) })
       ] }, "row_" + user.uid);
     });
     $[1] = dateFormat;
@@ -1874,7 +1882,7 @@ function UsersTable(t0) {
   if ($[6] !== authController || $[7] !== saveUser || $[8] !== snackbarController || $[9] !== users) {
     t3 = (!users || users.length === 0) && /* @__PURE__ */ jsx(TableRow, { children: /* @__PURE__ */ jsx(TableCell, { colspan: 6, children: /* @__PURE__ */ jsxs(CenteredView, { className: "flex flex-col gap-4 my-8 items-center", children: [
       /* @__PURE__ */ jsx(Typography, { variant: "label", children: "There are no users yet" }),
-      /* @__PURE__ */ jsx(Button, { variant: "outlined", onClick: () => {
+      /* @__PURE__ */ jsx(Button, { onClick: () => {
         if (!authController.user?.uid) {
           throw Error("UsersTable, authController misconfiguration");
         }
@@ -2242,7 +2250,7 @@ function IntroWidget(t0) {
     t5 = /* @__PURE__ */ jsxs(Paper, { className: "my-4 flex flex-col px-4 py-6 bg-white dark:bg-surface-accent-800 gap-2", children: [
       t1,
       t2,
-      /* @__PURE__ */ jsxs(Button, { variant: "outlined", onClick: t3, children: [
+      /* @__PURE__ */ jsxs(Button, { onClick: t3, children: [
         t4,
         buttonLabel
       ] })