@firecms/user_management 3.0.0-canary.183 → 3.0.0-canary.186

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.
@@ -8,14 +8,6 @@ export type UserManagement<USER extends User = User> = {
8
8
  roles: Role[];
9
9
  saveRole: (role: Role) => Promise<void>;
10
10
  deleteRole: (role: Role) => Promise<void>;
11
- /**
12
- * Maximum number of users that can be created.
13
- */
14
- usersLimit?: number;
15
- /**
16
- * Can the logged user edit roles?
17
- */
18
- canEditRoles?: boolean;
19
11
  /**
20
12
  * Is the logged user Admin?
21
13
  */
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.183",
4
+ "version": "3.0.0-canary.186",
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.183",
33
- "@firecms/formex": "^3.0.0-canary.183",
34
- "@firecms/ui": "^3.0.0-canary.183",
32
+ "@firecms/core": "^3.0.0-canary.186",
33
+ "@firecms/formex": "^3.0.0-canary.186",
34
+ "@firecms/ui": "^3.0.0-canary.186",
35
35
  "date-fns": "^3.6.0"
36
36
  },
37
37
  "peerDependencies": {
@@ -57,5 +57,5 @@
57
57
  "src",
58
58
  "bin"
59
59
  ],
60
- "gitHead": "6f579e56efa2e2e93683e74f42aad1ca6702ac40"
60
+ "gitHead": "968beff28cddecbacc6740dc5e75288bf423746e"
61
61
  }
@@ -1,10 +1,9 @@
1
1
  import React, { useCallback, useState } from "react";
2
2
 
3
3
  import { Role, useNavigationController } from "@firecms/core";
4
- import { AddIcon, Button, Container, Tooltip, Typography } from "@firecms/ui";
4
+ import { AddIcon, Button, Container, Typography } from "@firecms/ui";
5
5
  import { RolesTable } from "./RolesTable";
6
6
  import { RolesDetailsForm } from "./RolesDetailsForm";
7
- import { useUserManagement } from "../../hooks";
8
7
 
9
8
  export const RolesView = React.memo(
10
9
  function RolesView({ children }: { children?: React.ReactNode }) {
@@ -13,8 +12,6 @@ export const RolesView = React.memo(
13
12
  const [dialogOpen, setDialogOpen] = useState(false);
14
13
  const [selectedRole, setSelectedRole] = useState<Role | undefined>();
15
14
 
16
- const { canEditRoles } = useUserManagement();
17
-
18
15
  const onRoleClicked = useCallback((user: Role) => {
19
16
  setDialogOpen(true);
20
17
  setSelectedRole(user);
@@ -36,26 +33,21 @@ export const RolesView = React.memo(
36
33
  component="h4">
37
34
  Roles
38
35
  </Typography>
39
- <Tooltip
40
- asChild={true}
41
- title={!canEditRoles ? "Update plans to customise roles" : undefined}>
42
- <Button
43
- size={"large"}
44
- disabled={!canEditRoles}
45
- startIcon={<AddIcon/>}
46
- onClick={() => setDialogOpen(true)}>
47
- Add role
48
- </Button>
49
- </Tooltip>
36
+ <Button
37
+ size={"large"}
38
+ startIcon={<AddIcon/>}
39
+ onClick={() => setDialogOpen(true)}>
40
+ Add role
41
+ </Button>
50
42
  </div>
51
43
 
52
- <RolesTable onRoleClicked={onRoleClicked} editable={Boolean(canEditRoles)}/>
44
+ <RolesTable onRoleClicked={onRoleClicked} editable={true}/>
53
45
 
54
46
  <RolesDetailsForm
55
47
  key={selectedRole?.id ?? "new"}
56
48
  open={dialogOpen}
57
49
  role={selectedRole}
58
- editable={canEditRoles}
50
+ editable={true}
59
51
  collections={collections}
60
52
  handleClose={handleClose}/>
61
53
 
@@ -11,9 +11,7 @@ export const UsersView = function UsersView({ children }: { children?: React.Rea
11
11
  const [dialogOpen, setDialogOpen] = useState<boolean>();
12
12
  const [selectedUser, setSelectedUser] = useState<User | undefined>();
13
13
 
14
- const { users, usersLimit } = useUserManagement();
15
-
16
- const reachedUsersLimit = usersLimit !== undefined && (users && users.length >= usersLimit);
14
+ const { users } = useUserManagement();
17
15
 
18
16
  const onUserClicked = useCallback((user: User) => {
19
17
  setSelectedUser(user);
@@ -39,7 +37,6 @@ export const UsersView = function UsersView({ children }: { children?: React.Rea
39
37
  </Typography>
40
38
  <Button
41
39
  size={"large"}
42
- disabled={reachedUsersLimit}
43
40
  startIcon={<AddIcon/>}
44
41
  onClick={() => setDialogOpen(true)}>
45
42
  Add user
@@ -40,16 +40,6 @@ export interface UserManagementParams<CONTROLLER extends AuthController<any> = A
40
40
  */
41
41
  rolesPath?: string;
42
42
 
43
- /**
44
- * Maximum number of users that can be created.
45
- */
46
- usersLimit?: number;
47
-
48
- /**
49
- * Can the logged user edit roles
50
- */
51
- canEditRoles?: boolean;
52
-
53
43
  /**
54
44
  * If there are no roles in the database, provide a button to create the default roles.
55
45
  */
@@ -69,8 +59,6 @@ export interface UserManagementParams<CONTROLLER extends AuthController<any> = A
69
59
  * @param dataSourceDelegate
70
60
  * @param usersPath
71
61
  * @param rolesPath
72
- * @param usersLimit
73
- * @param canEditRoles
74
62
  * @param allowDefaultRolesCreation
75
63
  * @param includeCollectionConfigPermissions
76
64
  */
@@ -81,8 +69,6 @@ export function useBuildUserManagement<CONTROLLER extends AuthController<any> =
81
69
  dataSourceDelegate,
82
70
  usersPath = "__FIRECMS/config/users",
83
71
  rolesPath = "__FIRECMS/config/roles",
84
- usersLimit,
85
- canEditRoles = true,
86
72
  allowDefaultRolesCreation,
87
73
  includeCollectionConfigPermissions
88
74
  }: UserManagementParams<CONTROLLER>): UserManagement<USER> & CONTROLLER {
@@ -309,10 +295,8 @@ export function useBuildUserManagement<CONTROLLER extends AuthController<any> =
309
295
  rolesError,
310
296
  deleteUser,
311
297
  deleteRole,
312
- usersLimit,
313
298
  usersError,
314
299
  isAdmin,
315
- canEditRoles: canEditRoles === undefined ? true : canEditRoles,
316
300
  allowDefaultRolesCreation: allowDefaultRolesCreation === undefined ? true : allowDefaultRolesCreation,
317
301
  includeCollectionConfigPermissions: Boolean(includeCollectionConfigPermissions),
318
302
  collectionPermissions,
@@ -14,16 +14,6 @@ export type UserManagement<USER extends User = User> = {
14
14
  saveRole: (role: Role) => Promise<void>;
15
15
  deleteRole: (role: Role) => Promise<void>;
16
16
 
17
- /**
18
- * Maximum number of users that can be created.
19
- */
20
- usersLimit?: number;
21
-
22
- /**
23
- * Can the logged user edit roles?
24
- */
25
- canEditRoles?: boolean;
26
-
27
17
  /**
28
18
  * Is the logged user Admin?
29
19
  */