UI : Added Flag to exclude bot from user search (#9766)

* Added Flag to exclude bot from user search

* added cypress and remove unwanted code

* changes as per comments

* remove unwanted code
This commit is contained in:
Ashish Gupta 2023-01-18 12:22:11 +05:30 committed by GitHub
parent 001e567bb3
commit e14d06503e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 197 additions and 2 deletions

View File

@ -27,6 +27,28 @@ const userEmail = `${userName}@gmail.com`;
const adminName = `Admincttest${uuid()}`;
const adminEmail = `${adminName}@gmail.com`;
const searchBotText = 'bot';
const searchBotUser = () => {
// Search the bot user
interceptURL(
'GET',
`/api/v1/search/query?q=*${searchBotText}***(isBot:false)&from=0&size=15&index=user_search_index`,
'searchUser'
);
cy.get('[data-testid="searchbar"]')
.should('exist')
.should('be.visible')
.type(searchBotText);
verifyResponseStatusCode('@searchUser', 200);
cy.get('.ant-table-placeholder > .ant-table-cell').should(
'not.contain',
searchBotText
);
};
describe('Users flow should work properly', () => {
beforeEach(() => {
cy.login();
@ -75,6 +97,10 @@ describe('Users flow should work properly', () => {
softDeleteUser(userName);
deleteSoftDeletedUser(userName);
});
it('Search bot user', () => {
searchBotUser();
});
});
describe('Admin flow should work properly', () => {

View File

@ -0,0 +1,165 @@
/*
* Copyright 2022 Collate.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { cleanup, render, screen } from '@testing-library/react';
import { MOCK_USER_DATA } from 'pages/UserListPage/mockUserData';
import React from 'react';
import { MemoryRouter } from 'react-router-dom';
import { act } from 'react-test-renderer';
import UserListV1 from './UserListV1';
jest.mock('rest/userAPI', () => ({
updateUser: jest.fn().mockImplementation(() => Promise.resolve()),
}));
jest.mock('../../generated/api/teams/createUser', () => ({
CreateUser: jest.fn().mockImplementation(() => Promise.resolve()),
}));
jest.mock('../../utils/ToastUtils', () => ({
showErrorToast: jest.fn(),
showSuccessToast: jest.fn(),
}));
jest.mock('../common/DeleteWidget/DeleteWidgetModal', () => {
return jest.fn().mockImplementation(() => <div>DeleteWidgetModal</div>);
});
jest.mock('../common/error-with-placeholder/ErrorPlaceHolder', () => {
return jest.fn().mockImplementation(() => <div>ErrorPlaceHolder</div>);
});
jest.mock('../common/next-previous/NextPrevious', () => {
return jest.fn().mockImplementation(() => <div>NextPrevious</div>);
});
jest.mock('../header/PageHeader.component', () => {
return jest.fn().mockImplementation(() => <div>PageHeader</div>);
});
jest.mock('../Loader/Loader', () => {
return jest.fn().mockImplementation(() => <div>Loader</div>);
});
jest.mock('../common/searchbar/Searchbar', () => {
return jest
.fn()
.mockImplementation((prop) => (
<input
data-testid="search-input"
type="text"
onChange={(e) => prop.onSearch(e.target.value)}
/>
));
});
const mockFunction = jest.fn();
const MOCK_PROPS_DATA = {
data: MOCK_USER_DATA.data,
paging: MOCK_USER_DATA.paging,
searchTerm: '',
currentPage: 1,
isDataLoading: false,
showDeletedUser: false,
onSearch: mockFunction,
onShowDeletedUserChange: mockFunction,
onPagingChange: mockFunction,
afterDeleteAction: mockFunction,
isAdminPage: false,
};
describe('Test UserListV1 component', () => {
beforeEach(() => {
cleanup();
});
it('should render component', async () => {
await act(async () => {
render(<UserListV1 {...MOCK_PROPS_DATA} />, {
wrapper: MemoryRouter,
});
});
const userListComponent = await screen.findByTestId(
'user-list-v1-component'
);
const pageHeader = await screen.findByText('PageHeader');
expect(userListComponent).toBeInTheDocument();
expect(pageHeader).toBeInTheDocument();
});
it('should render ErrorPlaceHolder', async () => {
await act(async () => {
render(<UserListV1 {...MOCK_PROPS_DATA} data={[]} />, {
wrapper: MemoryRouter,
});
});
const emptyComponent = await screen.findByText('ErrorPlaceHolder');
expect(emptyComponent).toBeInTheDocument();
});
it('should render Users table', async () => {
await act(async () => {
render(<UserListV1 {...MOCK_PROPS_DATA} />, {
wrapper: MemoryRouter,
});
});
const userListComponent = await screen.findByTestId(
'user-list-v1-component'
);
expect(userListComponent).toBeInTheDocument();
const table = await screen.findByTestId('user-list-table');
expect(table).toBeInTheDocument();
const userName = await screen.findByText('label.username');
const teams = await screen.findByText('label.team-plural');
const role = await screen.findByText('label.role-plural');
expect(userName).toBeInTheDocument();
expect(teams).toBeInTheDocument();
expect(role).toBeInTheDocument();
const rows = await screen.findAllByRole('row');
expect(rows).toHaveLength(MOCK_PROPS_DATA.data.length + 1);
});
it('Should not render data when bot is search', async () => {
await act(async () => {
render(<UserListV1 {...MOCK_PROPS_DATA} data={[]} searchTerm="bot" />, {
wrapper: MemoryRouter,
});
});
const userListComponent = await screen.findByTestId(
'user-list-v1-component'
);
expect(userListComponent).toBeInTheDocument();
const table = await screen.findByTestId('user-list-table');
const noDataTable = await screen.findByText('No data');
expect(table).toBeInTheDocument();
expect(noDataTable).toBeInTheDocument();
});
});

View File

@ -220,7 +220,10 @@ const UserListV1: FC<UserListV1Props> = ({
}
return (
<Row className="user-listing" gutter={[16, 16]}>
<Row
className="user-listing"
data-testid="user-list-v1-component"
gutter={[16, 16]}>
<Col span={12}>
<PageHeader
data={isAdminPage ? PAGE_HEADERS.ADMIN : PAGE_HEADERS.USERS}
@ -266,6 +269,7 @@ const UserListV1: FC<UserListV1Props> = ({
bordered
className="user-list-table"
columns={columns}
data-testid="user-list-table"
dataSource={data}
loading={{
spinning: isDataLoading,

View File

@ -102,7 +102,7 @@ const UserListPageV1 = () => {
isAdmin = false,
isDeleted = false
) => {
let filters = '';
let filters = '(isBot:false)';
if (isAdmin) {
filters = '(isAdmin:true)';
}