Skip to content

Commit

Permalink
Merge pull request #5335 from dfe-analytical-services/EES-5573-hide-d…
Browse files Browse the repository at this point in the history
…elete-user-button

EES-5573 Hide delete user button
  • Loading branch information
mmyoungman authored Oct 15, 2024
2 parents 7ec6480 + d6934a4 commit 0a93f98
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 29 deletions.
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
import Link from '@admin/components/Link';
import Page from '@admin/components/Page';
import userService from '@admin/services/userService';
import ButtonText from '@common/components/ButtonText';
import LoadingSpinner from '@common/components/LoadingSpinner';
import useAsyncRetry from '@common/hooks/useAsyncRetry';
import logger from '@common/services/logger';
import React from 'react';
import styles from './BauUsersPage.module.scss';

const BauUsersPage = () => {
const { value, isLoading } = useAsyncRetry(() => userService.getUsers());

const handleDeleteUser = async (userEmail: string) => {
await userService
.deleteUser(userEmail)
.then(() => {
window.location.reload();
})
.catch(error => {
logger.info(`Error encountered when deleting the user - ${error}`);
});
};
// const handleDeleteUser = async (userEmail: string) => { // EES-5573
// await userService
// .deleteUser(userEmail)
// .then(() => {
// window.location.reload();
// })
// .catch(error => {
// logger.info(`Error encountered when deleting the user - ${error}`);
// });
// };

return (
<Page
Expand Down Expand Up @@ -57,12 +55,13 @@ const BauUsersPage = () => {
>
Manage
</Link>
<ButtonText
onClick={() => handleDeleteUser(user.email)}
className={styles.deleteUserButton}
>
Delete
</ButtonText>
{/* EES-5573 */}
{/* <ButtonText */}
{/* onClick={() => handleDeleteUser(user.email)} */}
{/* className={styles.deleteUserButton} */}
{/* > */}
{/* Delete */}
{/* </ButtonText> */}
</td>
</tr>
))}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import _userService, {
} from '@admin/services/userService';
import { MemoryRouter } from 'react-router';
import { TestConfigContextProvider } from '@admin/contexts/ConfigContext';
import { render, screen, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { render } from '@testing-library/react';
import BauUsersPage from '../BauUsersPage';

jest.mock('@admin/services/userService');
Expand All @@ -31,9 +30,9 @@ describe('BauUsersPage', () => {

renderPage();

await waitFor(() => {
expect(screen.getByText('Delete')).toBeInTheDocument();
});
// await waitFor(() => { // EES-5573
// expect(screen.getByText('Delete')).toBeInTheDocument();
// });
});

test('calls user service when delete user button is clicked', async () => {
Expand All @@ -42,12 +41,12 @@ describe('BauUsersPage', () => {

renderPage();

await waitFor(() => {
expect(screen.getByText('Delete')).toBeInTheDocument();
});
await userEvent.click(screen.getByRole('button', { name: 'Delete' }));

expect(userService.deleteUser).toHaveBeenCalled();
// await waitFor(() => { // EES-5573
// expect(screen.getByText('Delete')).toBeInTheDocument();
// });
// await userEvent.click(screen.getByRole('button', { name: 'Delete' }));
//
// expect(userService.deleteUser).toHaveBeenCalled();
});

function renderPage() {
Expand Down

0 comments on commit 0a93f98

Please sign in to comment.