Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show Received on pledge modal to avoid confusion #1170

Merged
merged 2 commits into from
Nov 4, 2024
Merged

Show Received on pledge modal to avoid confusion #1170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6525d20
Show Received on pledge modal to avoid confusion
dr-bizz Nov 1, 2024
1d2e112
Fixing flaky test
dr-bizz Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 38 additions & 17 deletions src/components/Contacts/ContactsLeftPanel/ContactsLeftPanel.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
import { useContext, useEffect } from 'react';
import { ThemeProvider } from '@emotion/react';
import { render } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import TestRouter from '__tests__/util/TestRouter';
import { GqlMockedProvider } from '__tests__/util/graphqlMocking';
import { ContactsWrapper } from 'pages/accountLists/[accountListId]/contacts/ContactsWrapper';
import { coordinatesFromContacts } from 'pages/accountLists/[accountListId]/contacts/helpers';
import {
ContactsContext,
ContactsType,
} from 'src/components/Contacts/ContactsContext/ContactsContext';
import { TableViewModeEnum } from 'src/components/Shared/Header/ListHeader';
import { StatusEnum } from 'src/graphql/types.generated';
import { UserOptionQuery } from 'src/hooks/UserPreference.generated';
import theme from 'src/theme';
import { ContactRowFragment } from '../ContactRow/ContactRow.generated';
import { ContactsLeftPanel } from './ContactsLeftPanel';

const router = {
Expand Down Expand Up @@ -47,8 +49,9 @@ const mocks = {
status: StatusEnum.PartnerFinancial,
primaryAddress: {
geo: '10,20',
createdAt: '2021-01-01',
},
},
} as ContactRowFragment,
],
},
},
Expand All @@ -60,32 +63,50 @@ const mocks = {
},
};

const mapData = coordinatesFromContacts(
{
nodes: [...mocks.Contacts.contacts.nodes],
pageInfo: { endCursor: 'Mg', hasNextPage: false },
totalCount: 1,
},
'en-US',
);

describe('ContactsLeftPanel', () => {
it('pans to the selected contact', async () => {
const panTo = jest.fn();
const setZoom = jest.fn();
const Component = () => {
const { mapRef } = useContext(ContactsContext) as ContactsType;

useEffect(() => {
mapRef.current = {
panTo,
setZoom,
} as unknown as google.maps.Map;
}, []);

return null;
};

const { findByText } = render(
<ThemeProvider theme={theme}>
<TestRouter router={router}>
<GqlMockedProvider<{ UserOption: UserOptionQuery }> mocks={mocks}>
<ContactsWrapper>
<>
<Component />
<ContactsContext.Provider
value={
Copy link
Contributor

Choose a reason for hiding this comment

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

Do you know why this helps? ContactsWrapper already wraps its children in <ContactsContext.Provider>.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

My guess is that the viewMode was getting set randomly, but I could be wrong. I figured if I controlled all the properties, I would know for sure it would pass.

{
filterData: undefined,
filtersLoading: false,
savedFilters: [],
activeFilters: {},
toggleFilterPanel: jest.fn(),
setActiveFilters: jest.fn(),
mapRef: {
current: {
panTo,
setZoom,
} as unknown as google.maps.Map,
},
mapData,
panTo,
selected: null,
setSelected: jest.fn(),
viewMode: TableViewModeEnum.Map,
} as unknown as ContactsType
}
>
<ContactsLeftPanel />
</>
</ContactsContext.Provider>
</ContactsWrapper>
</GqlMockedProvider>
</TestRouter>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Tool/Appeal/Modals/PledgeModal/PledgeModal.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ describe('PledgeModal', () => {
);
});

it('can not select the status given or received if the pledge does not have one of those statuses already', async () => {
it('can not select the status given if the pledge does not have the status "given"', async () => {
const { getByRole, queryByRole } = render(
<Components
pledge={{
Expand All @@ -429,7 +429,7 @@ describe('PledgeModal', () => {
userEvent.click(getByRole('combobox', { name: 'Status' }));

expect(getByRole('option', { name: 'Committed' })).toBeInTheDocument();
expect(queryByRole('option', { name: 'Received' })).not.toBeInTheDocument();
expect(getByRole('option', { name: 'Received' })).toBeInTheDocument();
expect(queryByRole('option', { name: 'Given' })).not.toBeInTheDocument();
});
});
13 changes: 5 additions & 8 deletions src/components/Tool/Appeal/Modals/PledgeModal/PledgeModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,14 +410,11 @@ export const PledgeModal: React.FC<PledgeModalProps> = ({
<MenuItem value={PledgeStatusEnum.NotReceived}>
{t('Committed')}
</MenuItem>
{pledge?.status ===
PledgeStatusEnum.ReceivedNotProcessed && (
<MenuItem
value={PledgeStatusEnum.ReceivedNotProcessed}
>
{t('Received')}
</MenuItem>
)}
<MenuItem
value={PledgeStatusEnum.ReceivedNotProcessed}
>
{t('Received')}
</MenuItem>
{pledge?.status === PledgeStatusEnum.Processed && (
<MenuItem value={PledgeStatusEnum.Processed}>
{t('Given')}
Expand Down
Loading