Skip to content

Commit

Permalink
Merge 5325db2 into da575d1
Browse files Browse the repository at this point in the history
  • Loading branch information
@akanshaaa19
akanshaaa19 authored Sep 9, 2024
2 parents da575d1 + 5325db2 commit 3f4435a
Show file tree
Hide file tree
Showing 3 changed files with 104 additions and 112 deletions.
10 changes: 8 additions & 2 deletions src/containers/Chat/ChatConversations/ConversationList/ConversationList.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,13 @@ export const ConversationList = ({

const filterVariables = () => {
if (groups && selectedCollectionId) {
return GROUP_COLLECTION_SEARCH_QUERY_VARIABLES;
return {
...GROUP_COLLECTION_SEARCH_QUERY_VARIABLES,
filter: {
groupLabel: searchVal,
searchGroup: true,
},
};
} else if (groups) {
if (phonenumber?.length === 0 || !phonenumber) {
return GROUP_QUERY_VARIABLES;
Expand Down Expand Up @@ -256,7 +262,7 @@ export const ConversationList = ({
getFilterSearch({
variables: filterSearch(),
});
} else if (hasSearchParams || savedSearchCriteria || phonenumber) {
} else if (hasSearchParams || savedSearchCriteria || phonenumber || selectedCollectionId) {
// This is used for filtering the searches, when you click on it, so only call it
// when user clicks and savedSearchCriteriaId is set.
addLogs(`filtering the searches`, filterVariables());
Expand Down
179 changes: 69 additions & 110 deletions src/containers/Chat/CollectionConversations/CollectionConversations.test.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,113 +1,83 @@
import { BrowserRouter as Router } from 'react-router-dom';
import { render, cleanup, waitFor, screen, fireEvent } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { ApolloClient, ApolloProvider, InMemoryCache } from '@apollo/client';

import { SEARCH_QUERY } from 'graphql/queries/Search';
import { DEFAULT_ENTITY_LIMIT, DEFAULT_MESSAGE_LIMIT } from 'common/constants';
import CollectionConversations from './CollectionConversations';
import { MockedProvider } from '@apollo/client/testing';
import { searchCollectionsQuery } from 'mocks/Chat';

const cache = new InMemoryCache({ addTypename: false });
cache.writeQuery({
query: SEARCH_QUERY,
variables: {
contactOpts: { limit: DEFAULT_ENTITY_LIMIT },
filter: { searchGroup: true },
messageOpts: { limit: DEFAULT_MESSAGE_LIMIT },
const searchQueryMock = {
request: {
query: SEARCH_QUERY,
variables: {
contactOpts: { limit: DEFAULT_ENTITY_LIMIT },
filter: { searchGroup: true },
messageOpts: { limit: DEFAULT_MESSAGE_LIMIT },
},
},
data: {
search: [
{
id: 'group_2',
group: {
id: '2',
label: 'Default Collection',
},
contact: null,
messages: [
{
id: '1',
body: 'Hey there whats up?',
insertedAt: '2020-06-25T13:36:43Z',
messageNumber: 0,
location: null,
receiver: {
result: {
data: {
search: [
{
id: 'group_2',
group: {
id: '2',
label: 'Default Collection',
},
contact: null,
messages: [
{
id: '1',
},
sender: {
id: '2',
},
type: 'TEXT',
media: null,
errors: null,
contextMessage: {
body: 'All good',
contextId: 1,
messageNumber: 10,
errors: '{}',
media: null,
type: 'TEXT',
insertedAt: '2021-04-26T06:13:03.832721Z',
body: 'Hey there whats up?',
insertedAt: '2020-06-25T13:36:43Z',
messageNumber: 0,
location: null,
receiver: {
id: '1',
},
sender: {
id: '2',
name: 'User',
},
type: 'TEXT',
media: null,
errors: null,
contextMessage: {
body: 'All good',
contextId: 1,
messageNumber: 10,
errors: '{}',
media: null,
type: 'TEXT',
insertedAt: '2021-04-26T06:13:03.832721Z',
location: null,
receiver: {
id: '1',
},
sender: {
id: '2',
name: 'User',
},
},
interactiveContent: '{}',
sendBy: 'test',
flowLabel: null,
},
interactiveContent: '{}',
sendBy: 'test',
flowLabel: null,
},
],
},
{
id: 'group_3',
group: {
id: '3',
label: 'Optin Collection',
},
contact: null,
messages: [],
},
{
id: 'group_4',
group: {
id: '4',
label: 'Optout Collection',
},
contact: null,
messages: [],
},
{
id: 'group_5',
group: {
id: '5',
label: 'Glific Collection',
],
},
contact: null,
messages: [],
},
{
id: 'group_1',
group: {
id: '1',
label: 'Test Collection',
{
id: 'group_3',
group: {
id: '3',
label: 'Optin Collection',
},
contact: null,
messages: [],
},
contact: null,
messages: [],
},
],
],
},
},
});

const client = new ApolloClient({
cache: cache,
uri: 'http://localhost:4000/',
assumeImmutableResults: true,
});
};

afterEach(cleanup);

Expand All @@ -118,11 +88,11 @@ const props = {
};

const collectionConversation = (
<ApolloProvider client={client}>
<MockedProvider mocks={[searchQueryMock, searchCollectionsQuery]}>
<Router>
<CollectionConversations collectionId={3} {...props} />
</Router>
</ApolloProvider>
</MockedProvider>
);

describe('<CollectionConversation />', () => {
Expand All @@ -139,27 +109,16 @@ describe('<CollectionConversation />', () => {
expect(container).toBeInTheDocument();
});

expect(screen.getByTestId('searchForm')).toBeInTheDocument();

await waitFor(() => {
const searchInput = screen.getByRole('textbox');
expect(searchInput).toBeInTheDocument();
userEvent.type(searchInput, 'opt');
fireEvent.submit(getByTestId('searchForm'));

// type optin then press enter
userEvent.type(searchInput, 'optin{enter}');

const resetButton = screen.getByTestId('resetButton');
expect(resetButton).toBeInTheDocument();
userEvent.click(resetButton);
expect(screen.getByTestId('searchForm')).toBeInTheDocument();
});

const listItems = screen.getAllByTestId('list');
expect(listItems.length).toBe(5);

userEvent.click(listItems[0]);
fireEvent.change(screen.getByRole('textbox'), { target: { value: 'optin' } });
fireEvent.keyDown(screen.getByRole('textbox'), { key: 'Enter', code: 'Enter' });

await waitFor(() => {});
await waitFor(() => {
expect(screen.getAllByRole('list')).toHaveLength(1);
expect(screen.getByText('New optin')).toBeInTheDocument();
});
});
});
27 changes: 27 additions & 0 deletions src/mocks/Chat.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1091,3 +1091,30 @@ export const markAsReadMock = (contactId: string) => ({
},
},
});

export const searchCollectionsQuery = {
request: {
query: SEARCH_QUERY,
variables: {
contactOpts: { limit: 25 },
messageOpts: { limit: 20 },
filter: { searchGroup: true, groupLabel: 'optin' },
},
},
result: {
data: {
search: [
{
__typename: 'Conversation',
contact: null,
group: {
id: '1',
label: 'New optin',
},
id: 'group_1',
messages: [],
},
],
},
},
};

1 comment on commit 3f4435a

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀 Deployed on https://deploy-preview-3075--glific-frontend.netlify.app

Please sign in to comment.