@firecms/user_management 3.0.0-canary.152 → 3.0.0-canary.154
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/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@firecms/user_management",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "3.0.0-canary.
|
|
4
|
+
"version": "3.0.0-canary.154",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
7
7
|
},
|
|
@@ -29,9 +29,9 @@
|
|
|
29
29
|
"types": "dist/index.d.ts",
|
|
30
30
|
"source": "src/index.ts",
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@firecms/core": "^3.0.0-canary.
|
|
33
|
-
"@firecms/formex": "^3.0.0-canary.
|
|
34
|
-
"@firecms/ui": "^3.0.0-canary.
|
|
32
|
+
"@firecms/core": "^3.0.0-canary.154",
|
|
33
|
+
"@firecms/formex": "^3.0.0-canary.154",
|
|
34
|
+
"@firecms/ui": "^3.0.0-canary.154",
|
|
35
35
|
"date-fns": "^3.6.0"
|
|
36
36
|
},
|
|
37
37
|
"peerDependencies": {
|
|
@@ -55,5 +55,5 @@
|
|
|
55
55
|
"src",
|
|
56
56
|
"bin"
|
|
57
57
|
],
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "52858cb15cdbbbb9c1b6ed8368e133304321cf49"
|
|
59
59
|
}
|
|
@@ -16,8 +16,7 @@ import { resolveUserRolePermissions } from "../utils";
|
|
|
16
16
|
|
|
17
17
|
type UserWithRoleIds<USER extends User = any> = Omit<USER, "roles"> & { roles: string[] };
|
|
18
18
|
|
|
19
|
-
export interface UserManagementParams<CONTROLLER extends AuthController<any> = AuthController<any
|
|
20
|
-
USER extends User = CONTROLLER extends AuthController<infer U> ? U : any> {
|
|
19
|
+
export interface UserManagementParams<CONTROLLER extends AuthController<any> = AuthController<any>> {
|
|
21
20
|
|
|
22
21
|
authController: CONTROLLER;
|
|
23
22
|
|
|
@@ -86,7 +85,7 @@ export function useBuildUserManagement<CONTROLLER extends AuthController<any> =
|
|
|
86
85
|
canEditRoles = true,
|
|
87
86
|
allowDefaultRolesCreation,
|
|
88
87
|
includeCollectionConfigPermissions
|
|
89
|
-
}: UserManagementParams<CONTROLLER
|
|
88
|
+
}: UserManagementParams<CONTROLLER>): UserManagement<USER> & CONTROLLER {
|
|
90
89
|
|
|
91
90
|
if (!authController) {
|
|
92
91
|
throw Error("useBuildUserManagement: You need to provide an authController since version 3.0.0-beta.11. Check https://firecms.co/docs/pro/migrating_from_v3_beta");
|
|
@@ -154,10 +153,6 @@ export function useBuildUserManagement<CONTROLLER extends AuthController<any> =
|
|
|
154
153
|
if (authController?.initialLoading) {
|
|
155
154
|
return;
|
|
156
155
|
}
|
|
157
|
-
// if (authController.user === null) {
|
|
158
|
-
// setUsersLoading(false);
|
|
159
|
-
// return;
|
|
160
|
-
// }
|
|
161
156
|
|
|
162
157
|
setUsersLoading(true);
|
|
163
158
|
return dataSourceDelegate.listenCollection?.({
|
|
@@ -299,17 +294,11 @@ export function useBuildUserManagement<CONTROLLER extends AuthController<any> =
|
|
|
299
294
|
const userRoles = authController.user ? defineRolesFor(authController.user) : undefined;
|
|
300
295
|
const isAdmin = (userRoles ?? []).some(r => r.id === "admin");
|
|
301
296
|
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
// console.debug("Setting roles", {
|
|
308
|
-
// authController,
|
|
309
|
-
// userRoles
|
|
310
|
-
// });
|
|
311
|
-
// authController.setUserRoles?.(userRoles ?? []);
|
|
312
|
-
// }, [userRoles?.map(r => r.id)]);
|
|
297
|
+
const userRoleIds = userRoles?.map(r => r.id);
|
|
298
|
+
useEffect(() => {
|
|
299
|
+
console.debug("Setting roles", userRoles);
|
|
300
|
+
authController.setUserRoles?.(userRoles ?? []);
|
|
301
|
+
}, [userRoleIds]);
|
|
313
302
|
|
|
314
303
|
return {
|
|
315
304
|
loading,
|