From d2767a0eb9b26a4d7d43018c8ffccf8c95b86290 Mon Sep 17 00:00:00 2001 From: Christopher Kolstad Date: Tue, 12 Mar 2024 11:01:10 +0100 Subject: [PATCH] task: Make Inactive users an enterprise feature (#6510) Ivar pointed out to me that this was intended as an enterprise only feature. So this PR makes it an enterprise only feature. Conditionally render the link in the normal user table, and use premium feature component if you happen to hit the route and not be running on the enterprise plan. --- .../src/component/admin/users/UsersAdmin.tsx | 62 ++++++++++++------- .../admin/users/UsersList/UsersList.tsx | 15 ++++- .../common/PremiumFeature/PremiumFeature.tsx | 5 ++ 3 files changed, 58 insertions(+), 24 deletions(-) diff --git a/frontend/src/component/admin/users/UsersAdmin.tsx b/frontend/src/component/admin/users/UsersAdmin.tsx index a049366ab8..c93c04bd46 100644 --- a/frontend/src/component/admin/users/UsersAdmin.tsx +++ b/frontend/src/component/admin/users/UsersAdmin.tsx @@ -7,27 +7,47 @@ import EditUser from './EditUser/EditUser'; import NotFound from 'component/common/NotFound/NotFound'; import { InactiveUsersList } from './InactiveUsersList/InactiveUsersList'; import { AccessMatrix } from './AccessMatrix/AccessMatrix'; +import { PremiumFeature } from '../../common/PremiumFeature/PremiumFeature'; +import { ConditionallyRender } from '../../common/ConditionallyRender/ConditionallyRender'; +import useUiConfig from '../../../hooks/api/getters/useUiConfig/useUiConfig'; -export const UsersAdmin = () => ( -
- - - - - - - } - /> - } /> - } /> - } /> - } /> - - -
-); +export const UsersAdmin = () => { + const { isEnterprise } = useUiConfig(); + return ( +
+ + + + + + + } + /> + } /> + } /> + } + elseShow={ + + } + /> + } + /> + } /> + + +
+ ); +}; export default UsersAdmin; diff --git a/frontend/src/component/admin/users/UsersList/UsersList.tsx b/frontend/src/component/admin/users/UsersList/UsersList.tsx index 8d30364b39..fe9547435b 100644 --- a/frontend/src/component/admin/users/UsersList/UsersList.tsx +++ b/frontend/src/component/admin/users/UsersList/UsersList.tsx @@ -36,9 +36,11 @@ import { useSearch } from 'hooks/useSearch'; import Download from '@mui/icons-material/Download'; import { StyledUsersLinkDiv } from '../Users.styles'; import { useUiFlag } from 'hooks/useUiFlag'; +import useUiConfig from '../../../../hooks/api/getters/useUiConfig/useUiConfig'; const UsersList = () => { const navigate = useNavigate(); + const { isEnterprise } = useUiConfig(); const { users, roles, refetch, loading } = useUsers(); const { setToastData, setToastApiError } = useToast(); const { removeUser, userLoading, userApiErrors } = useAdminUsersApi(); @@ -315,9 +317,16 @@ const UsersList = () => { } > - - View inactive users - + + + View inactive users + + + } + />