@firecms/user_management 3.0.0-canary.116 → 3.0.0-canary.118
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.es.js +20 -16
- package/dist/index.es.js.map +1 -1
- package/dist/index.umd.js +21 -17
- package/dist/index.umd.js.map +1 -1
- package/package.json +5 -5
- package/src/components/roles/RolesDetailsForm.tsx +12 -12
- package/src/hooks/useBuildUserManagement.tsx +20 -5
package/dist/index.umd.js
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
(function(global, factory) {
|
2
|
-
typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("react"), require("react-fast-compare"), require("react/jsx-runtime"), require("@firecms/ui"), require("yup"), require("@firecms/
|
3
|
-
})(this, function(exports2, React, equal, jsxRuntime, ui, Yup,
|
2
|
+
typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("react"), require("react-fast-compare"), require("@firecms/core"), require("react/jsx-runtime"), require("@firecms/ui"), require("yup"), require("@firecms/formex"), require("date-fns"), require("date-fns/locale")) : typeof define === "function" && define.amd ? define(["exports", "react", "react-fast-compare", "@firecms/core", "react/jsx-runtime", "@firecms/ui", "yup", "@firecms/formex", "date-fns", "date-fns/locale"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.FireCMS = {}, global.React, global.equal, global.core, global.jsxRuntime, global.ui, global.Yup, global.formex, global.dateFns, global.locales));
|
3
|
+
})(this, function(exports2, React, equal, core, jsxRuntime, ui, Yup, formex, dateFns, locales) {
|
4
4
|
"use strict";
|
5
5
|
function _interopNamespaceDefault(e) {
|
6
6
|
const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
|
@@ -232,15 +232,19 @@
|
|
232
232
|
const roleIds = user.roles?.map((r) => r.id);
|
233
233
|
const email = user.email?.toLowerCase().trim();
|
234
234
|
if (!email) throw Error("Email is required");
|
235
|
+
const userExists = users.find((u) => u.email?.toLowerCase() === email);
|
235
236
|
const data = {
|
236
237
|
...user,
|
237
|
-
roles: roleIds
|
238
|
+
roles: roleIds ?? []
|
238
239
|
};
|
240
|
+
if (!userExists) {
|
241
|
+
data.created_on = /* @__PURE__ */ new Date();
|
242
|
+
}
|
239
243
|
return dataSourceDelegate.saveEntity({
|
240
244
|
status: "existing",
|
241
245
|
path: usersPath,
|
242
246
|
entityId: email,
|
243
|
-
values: data
|
247
|
+
values: core.removeUndefined(data)
|
244
248
|
}).then(() => user);
|
245
249
|
}, [usersPath, dataSourceDelegate?.initialised]);
|
246
250
|
const saveRole = React.useCallback((role) => {
|
@@ -255,7 +259,7 @@
|
|
255
259
|
status: "existing",
|
256
260
|
path: rolesPath,
|
257
261
|
entityId: id,
|
258
|
-
values: roleData
|
262
|
+
values: core.removeUndefined(roleData)
|
259
263
|
}).then(() => {
|
260
264
|
return;
|
261
265
|
});
|
@@ -659,8 +663,8 @@
|
|
659
663
|
ui.Checkbox,
|
660
664
|
{
|
661
665
|
disabled: isAdmin || defaultCreate || !editable,
|
662
|
-
checked: (isAdmin || defaultCreate || formex.getIn(values, `collectionPermissions.${col.
|
663
|
-
onCheckedChange: (checked) => setFieldValue(`collectionPermissions.${col.
|
666
|
+
checked: (isAdmin || defaultCreate || formex.getIn(values, `collectionPermissions.${col.id}.create`)) ?? false,
|
667
|
+
onCheckedChange: (checked) => setFieldValue(`collectionPermissions.${col.id}.create`, checked)
|
664
668
|
}
|
665
669
|
)
|
666
670
|
}
|
@@ -673,8 +677,8 @@
|
|
673
677
|
ui.Checkbox,
|
674
678
|
{
|
675
679
|
disabled: isAdmin || defaultRead || !editable,
|
676
|
-
checked: (isAdmin || defaultRead || formex.getIn(values, `collectionPermissions.${col.
|
677
|
-
onCheckedChange: (checked) => setFieldValue(`collectionPermissions.${col.
|
680
|
+
checked: (isAdmin || defaultRead || formex.getIn(values, `collectionPermissions.${col.id}.read`)) ?? false,
|
681
|
+
onCheckedChange: (checked) => setFieldValue(`collectionPermissions.${col.id}.read`, checked)
|
678
682
|
}
|
679
683
|
)
|
680
684
|
}
|
@@ -687,8 +691,8 @@
|
|
687
691
|
ui.Checkbox,
|
688
692
|
{
|
689
693
|
disabled: isAdmin || defaultEdit || !editable,
|
690
|
-
checked: (isAdmin || defaultEdit || formex.getIn(values, `collectionPermissions.${col.
|
691
|
-
onCheckedChange: (checked) => setFieldValue(`collectionPermissions.${col.
|
694
|
+
checked: (isAdmin || defaultEdit || formex.getIn(values, `collectionPermissions.${col.id}.edit`)) ?? false,
|
695
|
+
onCheckedChange: (checked) => setFieldValue(`collectionPermissions.${col.id}.edit`, checked)
|
692
696
|
}
|
693
697
|
)
|
694
698
|
}
|
@@ -701,8 +705,8 @@
|
|
701
705
|
ui.Checkbox,
|
702
706
|
{
|
703
707
|
disabled: isAdmin || defaultDelete || !editable,
|
704
|
-
checked: (isAdmin || defaultDelete || formex.getIn(values, `collectionPermissions.${col.
|
705
|
-
onCheckedChange: (checked) => setFieldValue(`collectionPermissions.${col.
|
708
|
+
checked: (isAdmin || defaultDelete || formex.getIn(values, `collectionPermissions.${col.id}.delete`)) ?? false,
|
709
|
+
onCheckedChange: (checked) => setFieldValue(`collectionPermissions.${col.id}.delete`, checked)
|
706
710
|
}
|
707
711
|
)
|
708
712
|
}
|
@@ -720,10 +724,10 @@
|
|
720
724
|
{
|
721
725
|
className: "color-inherit",
|
722
726
|
onClick: () => {
|
723
|
-
setFieldValue(`collectionPermissions.${col.
|
724
|
-
setFieldValue(`collectionPermissions.${col.
|
725
|
-
setFieldValue(`collectionPermissions.${col.
|
726
|
-
setFieldValue(`collectionPermissions.${col.
|
727
|
+
setFieldValue(`collectionPermissions.${col.id}.create`, true);
|
728
|
+
setFieldValue(`collectionPermissions.${col.id}.read`, true);
|
729
|
+
setFieldValue(`collectionPermissions.${col.id}.edit`, true);
|
730
|
+
setFieldValue(`collectionPermissions.${col.id}.delete`, true);
|
727
731
|
},
|
728
732
|
disabled: isAdmin || !editable,
|
729
733
|
variant: "text",
|