chore: Rename for consistency
This commit is contained in:
@@ -38,8 +38,8 @@ const StepTypes = {
|
||||
const ActionsStep = React.memo(({ userId, onClose }) => {
|
||||
const selectUserById = useMemo(() => selectors.makeSelectUserById(), []);
|
||||
|
||||
const activeUsersLimit = useSelector(selectors.selectActiveUsersLimit);
|
||||
const activeUsersTotal = useSelector(selectors.selectActiveUsersTotal);
|
||||
const activeUserLimit = useSelector(selectors.selectActiveUserLimit);
|
||||
const activeUserTotal = useSelector(selectors.selectActiveUserTotal);
|
||||
const user = useSelector((state) => selectUserById(state, userId));
|
||||
const isCurrentUser = useSelector((state) => user.id === selectors.selectCurrentUserId(state));
|
||||
|
||||
@@ -237,8 +237,8 @@ const ActionsStep = React.memo(({ userId, onClose }) => {
|
||||
<Menu.Item
|
||||
disabled={
|
||||
user.isDeactivated &&
|
||||
activeUsersLimit !== null &&
|
||||
activeUsersTotal >= activeUsersLimit
|
||||
activeUserLimit !== null &&
|
||||
activeUserTotal >= activeUserLimit
|
||||
}
|
||||
className={styles.menuItem}
|
||||
onClick={user.isDeactivated ? handleActivateClick : handleDeactivateClick}
|
||||
|
||||
@@ -17,8 +17,8 @@ import AddStep from './AddStep';
|
||||
import styles from './UsersPane.module.scss';
|
||||
|
||||
const UsersPane = React.memo(() => {
|
||||
const activeUsersTotal = useSelector(selectors.selectActiveUsersTotal);
|
||||
const activeUsersLimit = useSelector(selectors.selectActiveUsersLimit);
|
||||
const activeUserTotal = useSelector(selectors.selectActiveUserTotal);
|
||||
const activeUserLimit = useSelector(selectors.selectActiveUserLimit);
|
||||
const users = useSelector(selectors.selectUsers);
|
||||
|
||||
const canAdd = useSelector((state) => {
|
||||
@@ -106,13 +106,13 @@ const UsersPane = React.memo(() => {
|
||||
<AddPopup>
|
||||
<Button
|
||||
positive
|
||||
disabled={activeUsersLimit !== null && activeUsersTotal >= activeUsersLimit}
|
||||
disabled={activeUserLimit !== null && activeUserTotal >= activeUserLimit}
|
||||
className={styles.addButton}
|
||||
>
|
||||
{t('action.addUser')}
|
||||
{activeUsersLimit !== null && (
|
||||
{activeUserLimit !== null && (
|
||||
<span className={styles.addButtonCounter}>
|
||||
{activeUsersTotal}/{activeUsersLimit}
|
||||
{activeUserTotal}/{activeUserLimit}
|
||||
</span>
|
||||
)}
|
||||
</Button>
|
||||
|
||||
@@ -64,10 +64,10 @@ const createMessage = (error) => {
|
||||
type: 'error',
|
||||
content: 'common.usernameAlreadyInUse',
|
||||
};
|
||||
case 'Active users limit reached':
|
||||
case 'Active user limit reached':
|
||||
return {
|
||||
type: 'error',
|
||||
content: 'common.activeUsersLimitReached',
|
||||
content: 'common.activeUserLimitReached',
|
||||
};
|
||||
case 'Failed to fetch':
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user