Skip to content

Update DataSummary messages object #7022

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

Merged
merged 3 commits into from
Nov 27, 2023
Merged

Update DataSummary messages object #7022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a4801e
Update DataSummary messages object
taysea Nov 17, 2023
c25625e
Merge branch 'master' into 6660-datasummary-messages
jcfilben Nov 21, 2023
fd7280b
Merge branch 'master' into 6660-datasummary-messages
jcfilben Nov 27, 2023
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
15 changes: 13 additions & 2 deletions src/js/components/DataSummary/DataSummary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,25 @@ export const DataSummary = ({ messages, ...rest }) => {
if (total !== filteredTotal) {
if (filteredTotal === 1) messageId = 'dataSummary.filteredSingle';
else messageId = 'dataSummary.filtered';
} else messageId = 'dataSummary.total';
} else if (total === 1) messageId = 'dataSummary.totalSingle';
else messageId = 'dataSummary.total';

// helps account for cases like 0 results of 1 item
const items = format({
id: total === 1 ? 'dataSummary.itemsSingle' : 'dataSummary.items',
messages: messages || dataMessages?.dataSummary,
});

return (
<Text margin={{ vertical: 'xsmall' }} {...rest}>
{format({
id: messageId,
messages: messages || dataMessages?.dataSummary,
values: { filteredTotal, total },
values: {
filteredTotal,
total,
items,
},
})}
</Text>
);
Expand Down
39 changes: 38 additions & 1 deletion src/js/components/DataSummary/__tests__/DataSummary-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { render } from '@testing-library/react';
import { render, screen } from '@testing-library/react';
import 'jest-styled-components';

import { Data } from '../../Data';
Expand All @@ -23,4 +23,41 @@ describe('DataSummary', () => {

expect(container.firstChild).toMatchSnapshot();
});

test('renders total message correctly when only 1 item', () => {
const { asFragment } = render(
<Grommet>
<Data data={[{ name: 'a' }]}>
<DataFilters>
<DataSummary />
</DataFilters>
</Data>
</Grommet>,
);

expect(screen.getByText('1 item')).toBeTruthy();
expect(asFragment()).toMatchSnapshot();
});

test('renders filtered message correctly when 0 results but only 1 item', () => {
const { asFragment } = render(
<Grommet>
<Data
data={[{ name: 'a' }]}
defaultView={{
properties: {
name: ['b'],
},
}}
>
<DataFilters>
<DataSummary />
</DataFilters>
</Data>
</Grommet>,
);

expect(screen.getByText('0 results of 1 item')).toBeTruthy();
expect(asFragment()).toMatchSnapshot();
});
});
Loading