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

package/dist/types/user_management.d.ts

@@ -8,14 +8,6 @@ export type UserManagement<USER extends User = User> = {
     roles: Role[];
     saveRole: (role: Role) => Promise<void>;
     deleteRole: (role: Role) => Promise<void>;
-    /**
-     * Maximum number of users that can be created.
-     */
-    usersLimit?: number;
-    /**
-     * Can the logged user edit roles?
-     */
-    canEditRoles?: boolean;
     /**
      * Is the logged user Admin?
      */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@firecms/user_management",
   "type": "module",
-  "version": "3.0.0-canary.183",
+  "version": "3.0.0-canary.184",
   "publishConfig": {
     "access": "public"
   },
@@ -29,9 +29,9 @@
   "types": "dist/index.d.ts",
   "source": "src/index.ts",
   "dependencies": {
-    "@firecms/core": "^3.0.0-canary.183",
-    "@firecms/formex": "^3.0.0-canary.183",
-    "@firecms/ui": "^3.0.0-canary.183",
+    "@firecms/core": "^3.0.0-canary.184",
+    "@firecms/formex": "^3.0.0-canary.184",
+    "@firecms/ui": "^3.0.0-canary.184",
     "date-fns": "^3.6.0"
   },
   "peerDependencies": {
@@ -57,5 +57,5 @@
     "src",
     "bin"
   ],
-  "gitHead": "6f579e56efa2e2e93683e74f42aad1ca6702ac40"
+  "gitHead": "ece7ace38466826a58d560fcebd154e74ecedd6b"
 }

package/src/components/roles/RolesView.tsx

@@ -1,10 +1,9 @@
 import React, { useCallback, useState } from "react";
 
 import { Role, useNavigationController } from "@firecms/core";
-import { AddIcon, Button, Container, Tooltip, Typography } from "@firecms/ui";
+import { AddIcon, Button, Container, Typography } from "@firecms/ui";
 import { RolesTable } from "./RolesTable";
 import { RolesDetailsForm } from "./RolesDetailsForm";
-import { useUserManagement } from "../../hooks";
 
 export const RolesView = React.memo(
     function RolesView({ children }: { children?: React.ReactNode }) {
@@ -13,8 +12,6 @@ export const RolesView = React.memo(
         const [dialogOpen, setDialogOpen] = useState(false);
         const [selectedRole, setSelectedRole] = useState<Role | undefined>();
 
-        const { canEditRoles } = useUserManagement();
-
         const onRoleClicked = useCallback((user: Role) => {
             setDialogOpen(true);
             setSelectedRole(user);
@@ -36,26 +33,21 @@ export const RolesView = React.memo(
                                 component="h4">
                         Roles
                     </Typography>
-                    <Tooltip
-                        asChild={true}
-                        title={!canEditRoles ? "Update plans to customise roles" : undefined}>
-                        <Button
-                            size={"large"}
-                            disabled={!canEditRoles}
-                            startIcon={<AddIcon/>}
-                            onClick={() => setDialogOpen(true)}>
-                            Add role
-                        </Button>
-                    </Tooltip>
+                    <Button
+                        size={"large"}
+                        startIcon={<AddIcon/>}
+                        onClick={() => setDialogOpen(true)}>
+                        Add role
+                    </Button>
                 </div>
 
-                <RolesTable onRoleClicked={onRoleClicked} editable={Boolean(canEditRoles)}/>
+                <RolesTable onRoleClicked={onRoleClicked} editable={true}/>
 
                 <RolesDetailsForm
                     key={selectedRole?.id ?? "new"}
                     open={dialogOpen}
                     role={selectedRole}
-                    editable={canEditRoles}
+                    editable={true}
                     collections={collections}
                     handleClose={handleClose}/>
 

package/src/components/users/UsersView.tsx

@@ -11,9 +11,7 @@ export const UsersView = function UsersView({ children }: { children?: React.Rea
     const [dialogOpen, setDialogOpen] = useState<boolean>();
     const [selectedUser, setSelectedUser] = useState<User | undefined>();
 
-    const { users, usersLimit } = useUserManagement();
-
-    const reachedUsersLimit = usersLimit !== undefined && (users && users.length >= usersLimit);
+    const { users } = useUserManagement();
 
     const onUserClicked = useCallback((user: User) => {
         setSelectedUser(user);
@@ -39,7 +37,6 @@ export const UsersView = function UsersView({ children }: { children?: React.Rea
                 </Typography>
                 <Button
                     size={"large"}
-                    disabled={reachedUsersLimit}
                     startIcon={<AddIcon/>}
                     onClick={() => setDialogOpen(true)}>
                     Add user

package/src/hooks/useBuildUserManagement.tsx

@@ -40,16 +40,6 @@ export interface UserManagementParams<CONTROLLER extends AuthController<any> = A
      */
     rolesPath?: string;
 
-    /**
-     * Maximum number of users that can be created.
-     */
-    usersLimit?: number;
-
-    /**
-     * Can the logged user edit roles
-     */
-    canEditRoles?: boolean;
-
     /**
      * If there are no roles in the database, provide a button to create the default roles.
      */
@@ -69,8 +59,6 @@ export interface UserManagementParams<CONTROLLER extends AuthController<any> = A
  * @param dataSourceDelegate
  * @param usersPath
  * @param rolesPath
- * @param usersLimit
- * @param canEditRoles
  * @param allowDefaultRolesCreation
  * @param includeCollectionConfigPermissions
  */
@@ -81,8 +69,6 @@ export function useBuildUserManagement<CONTROLLER extends AuthController<any> =
      dataSourceDelegate,
      usersPath = "__FIRECMS/config/users",
      rolesPath = "__FIRECMS/config/roles",
-     usersLimit,
-     canEditRoles = true,
      allowDefaultRolesCreation,
      includeCollectionConfigPermissions
  }: UserManagementParams<CONTROLLER>): UserManagement<USER> & CONTROLLER {
@@ -309,10 +295,8 @@ export function useBuildUserManagement<CONTROLLER extends AuthController<any> =
         rolesError,
         deleteUser,
         deleteRole,
-        usersLimit,
         usersError,
         isAdmin,
-        canEditRoles: canEditRoles === undefined ? true : canEditRoles,
         allowDefaultRolesCreation: allowDefaultRolesCreation === undefined ? true : allowDefaultRolesCreation,
         includeCollectionConfigPermissions: Boolean(includeCollectionConfigPermissions),
         collectionPermissions,

package/src/types/user_management.tsx

@@ -14,16 +14,6 @@ export type UserManagement<USER extends User = User> = {
     saveRole: (role: Role) => Promise<void>;
     deleteRole: (role: Role) => Promise<void>;
 
-    /**
-     * Maximum number of users that can be created.
-     */
-    usersLimit?: number;
-
-    /**
-     * Can the logged user edit roles?
-     */
-    canEditRoles?: boolean;
-
     /**
      * Is the logged user Admin?
      */