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

Ww datap 874 svg icons #471

Merged
merged 10 commits into from
Oct 27, 2023
Merged

Ww datap 874 svg icons #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5ed514f
Got svgr working correctly with iconMap
Oct 3, 2023
e420a30
Refactors iconMap to use CRA's ReactComponent to import svg files as …
Oct 4, 2023
3281fe9
Updated snapshots
Oct 4, 2023
a515e6c
Merge remote-tracking branch 'origin/main' into ww-DATAP-874-svg-icons
Oct 4, 2023
056fd1a
Merge branch 'main' into ww-DATAP-874-svg-icons
wwhorton Oct 11, 2023
4d1e992
Merge branch 'main' into ww-DATAP-874-svg-icons
wwhorton Oct 11, 2023
1ecf22c
Fixes remaining tests, changes iconMap and test to use console error
Oct 17, 2023
9200746
Merge branch 'ww-DATAP-874-svg-icons' of https://github.com/cfpb/ccdb…
Oct 17, 2023
9b5a473
Merge branch 'main' into ww-DATAP-874-svg-icons
wwhorton Oct 17, 2023
7e1c852
Built for prod
Oct 17, 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
4 changes: 4 additions & 0 deletions craco.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ const {
addAfterLoader,
addAfterLoaders,
addBeforeLoader,
addAfterAssetModule,
assetModuleByName,
getLoader,
getLoaders,
removeLoader,
Expand Down Expand Up @@ -47,8 +49,10 @@ module.exports = {
strReplaceLoader
);


//
return webpackConfig;

},
},
plugins: [
Expand Down
4 changes: 2 additions & 2 deletions dist/ccdb5.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ccdb5.css.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/ccdb5.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/ccdb5.js.LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ object-assign
*/

/**
* @remix-run/router v1.9.0
* @remix-run/router v1.8.0
*
* Copyright (c) Remix Software Inc.
*
Expand All @@ -114,7 +114,7 @@ object-assign
*/

/**
* React Router DOM v6.16.0
* React Router DOM v6.15.0
*
* Copyright (c) Remix Software Inc.
*
Expand All @@ -125,7 +125,7 @@ object-assign
*/

/**
* React Router v6.16.0
* React Router v6.15.0
*
* Copyright (c) Remix Software Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion dist/ccdb5.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@
"@cfpb/cfpb-expandables": "^0.17.12",
"@cfpb/cfpb-forms": "0.27.0",
"@cfpb/cfpb-grid": "0.27.0",
"@cfpb/cfpb-icons": "0.27.0",
"@cfpb/cfpb-icons": "^0.31.0",
"@cfpb/cfpb-layout": "0.27.1",
"@cfpb/cfpb-notifications": "0.27.0",
"@cfpb/cfpb-pagination": "0.27.0",
"@cfpb/cfpb-tables": "0.27.0",
"@cfpb/cfpb-typography": "0.27.0",
"@craco/craco": "^6.4.3",
"@craco/craco": "^7.1.0",
"@reduxjs/toolkit": "^1.8.5",
"@testing-library/cypress": "^8.0.3",
"@testing-library/jest-dom": "^5.16.5",
Expand Down
4 changes: 2 additions & 2 deletions src/components/ActionBar/ActionBar.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ describe('ActionBar', () => {
expect(
screen.getByText('Showing 10 matches out of 100 total complaints')
).toBeInTheDocument();
const buttonExport = screen.getByRole('button', { name: 'Export data' });
const buttonExport = screen.getByRole('button', { name: /Export data/ });
expect(buttonExport).toBeInTheDocument();
fireEvent.click(buttonExport);
expect(dataExportSpy).toHaveBeenCalledTimes(1);

const buttonPrint = screen.getByRole('button', { name: 'Print' });
const buttonPrint = screen.getByRole('button', { name: /Print/ });
expect(buttonPrint).toBeInTheDocument();
fireEvent.click(buttonPrint);
expect(gaSpy).toHaveBeenCalledWith('Print', 'tab:Map');
Expand Down
26 changes: 13 additions & 13 deletions src/components/Dialogs/DataExport/DataExport.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,19 @@ describe('DataExport', () => {
).toBeInTheDocument();

expect(
screen.getByRole('button', { name: 'Start export' })
screen.getByRole('button', { name: /Start export/ })
).toBeInTheDocument();
expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
const buttonCopy = screen.getByRole('button', { name: 'Copy' });
expect(screen.getByRole('button', { name: /Cancel/ })).toBeInTheDocument();
const buttonCopy = screen.getByRole('button', { name: /Copy/ });
expect(buttonCopy).toBeInTheDocument();
expect(buttonCopy).toHaveClass('a-btn__secondary');
fireEvent.click(buttonCopy);
await waitFor(() => {
expect(buttonCopy).toHaveClass('export-url-copied');
});

expect(screen.getByRole('button', { name: 'Close' })).toBeInTheDocument();
fireEvent.click(screen.getByRole('button', { name: 'Close' }));
expect(screen.getByRole('button', { name: /Close/ })).toBeInTheDocument();
fireEvent.click(screen.getByRole('button', { name: /Close/ }));
expect(hideModalSpy).toHaveBeenCalled();
});

Expand All @@ -76,8 +76,8 @@ describe('DataExport', () => {
.mockImplementation(() => jest.fn());
renderComponent({}, {});
expect(screen.getByText('Export complaints')).toBeInTheDocument();
expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
fireEvent.click(screen.getByRole('button', { name: 'Cancel' }));
expect(screen.getByRole('button', { name: /Cancel/ })).toBeInTheDocument();
fireEvent.click(screen.getByRole('button', { name: /Cancel/ }));
expect(hideModalSpy).toHaveBeenCalled();
});

Expand All @@ -91,12 +91,12 @@ describe('DataExport', () => {
renderComponent({}, {});
expect(screen.getByText('Export complaints')).toBeInTheDocument();
expect(
screen.getByRole('button', { name: 'Start export' })
screen.getByRole('button', { name: /Start export/ })
).toBeInTheDocument();
expect(screen.getByRole('textbox')).toHaveValue(
'https://files.consumerfinance.gov/ccdb/complaints.csv.zip'
);
fireEvent.click(screen.getByRole('button', { name: 'Start export' }));
fireEvent.click(screen.getByRole('button', { name: /Start export/ }));
expect(sendAnalyticsSpy).toHaveBeenCalledWith(
'Export All Data',
'Trends:csv'
Expand All @@ -114,7 +114,7 @@ describe('DataExport', () => {
renderComponent({}, {});
expect(screen.getByText('Export complaints')).toBeInTheDocument();
expect(
screen.getByRole('button', { name: 'Start export' })
screen.getByRole('button', { name: /Start export/ })
).toBeInTheDocument();
expect(screen.getByRole('textbox')).toHaveValue(
'https://files.consumerfinance.gov/ccdb/complaints.csv.zip'
Expand All @@ -137,7 +137,7 @@ describe('DataExport', () => {
);
});

fireEvent.click(screen.getByRole('button', { name: 'Start export' }));
fireEvent.click(screen.getByRole('button', { name: /Start export/ }));
expect(sendAnalyticsSpy).toHaveBeenCalledWith(
'Export All Data',
'Trends:json'
Expand Down Expand Up @@ -181,9 +181,9 @@ describe('DataExport', () => {
);

expect(
screen.getByRole('button', { name: 'Start export' })
screen.getByRole('button', { name: /Start export/ })
).toBeInTheDocument();
fireEvent.click(screen.getByRole('button', { name: 'Start export' }));
fireEvent.click(screen.getByRole('button', { name: /Start export/ }));

expect(sendAnalyticsSpy).toHaveBeenCalledWith(
'Export Some Data',
Expand Down
4 changes: 2 additions & 2 deletions src/components/Dialogs/DataExport/ExportConfirmation.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ describe('ExportConfirmation', () => {
.mockImplementation(() => jest.fn());
renderComponent();
expect(screen.getByText('Export complaints')).toBeInTheDocument();
expect(screen.getByRole('button', { name: 'Close' })).toBeInTheDocument();
fireEvent.click(screen.getByRole('button', { name: 'Close' }));
expect(screen.getByRole('button', { name: /Close/ })).toBeInTheDocument();
fireEvent.click(screen.getByRole('button', { name: /Close/ }));
expect(hideModalSpy).toHaveBeenCalled();
});
});
4 changes: 2 additions & 2 deletions src/components/Dialogs/RootModal.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ describe('RootModal', () => {
});
Modal.setAppElement(container);
expect(screen.getByText('Export complaints')).toBeInTheDocument();
fireEvent.click(screen.getByRole('button', { name: 'Close' }));
fireEvent.click(screen.getByRole('button', { name: /Close/ }));
expect(closeSpy).toHaveBeenCalled();
});

Expand Down Expand Up @@ -74,7 +74,7 @@ describe('RootModal', () => {
expect(
screen.getByText('Things you should know before you use this database')
).toBeInTheDocument();
fireEvent.click(screen.getByRole('button', { name: 'Close' }));
fireEvent.click(screen.getByRole('button', { name: /Close/ }));
expect(closeSpy).toHaveBeenCalled();
});
});
30 changes: 6 additions & 24 deletions src/components/Filters/__tests__/__snapshots__/AggregationBranch.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,8 @@ exports[`component::AggregationBranch snapshots renders with all checked 1`] = `
<span>
foo
</span>
<svg
className="cf-icon-svg"
viewBox="0 0 988.7 1200"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M923.6 967.6c-17.3 0-33.8-6.8-46-19L494.1 565 110.5 948.5c-25.6 25.1-66.8 24.8-91.9-.8-24.8-25.3-24.8-65.8 0-91.1l429.5-429.5c25.4-25.4 66.5-25.4 91.9 0l429.6 429.5c25.4 25.4 25.4 66.5.1 91.9-12.3 12.3-28.8 19.1-46.1 19.1z"
/>
<svg>
up.svg
</svg>
</button>
<span
Expand Down Expand Up @@ -156,14 +150,8 @@ exports[`component::AggregationBranch snapshots renders with indeterminate 1`] =
<span>
foo
</span>
<svg
className="cf-icon-svg"
viewBox="0 0 988.7 1200"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M923.6 967.6c-17.3 0-33.8-6.8-46-19L494.1 565 110.5 948.5c-25.6 25.1-66.8 24.8-91.9-.8-24.8-25.3-24.8-65.8 0-91.1l429.5-429.5c25.4-25.4 66.5-25.4 91.9 0l429.6 429.5c25.4 25.4 25.4 66.5.1 91.9-12.3 12.3-28.8 19.1-46.1 19.1z"
/>
<svg>
up.svg
</svg>
</button>
<span
Expand Down Expand Up @@ -280,14 +268,8 @@ exports[`component::AggregationBranch snapshots renders with none checked 1`] =
<span>
foo
</span>
<svg
className="cf-icon-svg"
viewBox="0 0 988.2 1200"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M494.1 967.2c-17.3 0-33.8-6.8-46-19L18.6 518.6c-25.1-25.6-24.8-66.8.8-91.9 25.3-24.8 65.8-24.8 91.1 0l383.6 383.6 383.6-383.6c25.6-25.1 66.8-24.8 91.9.8 24.8 25.3 24.8 65.8 0 91.1L540.1 948.1c-12.2 12.2-28.7 19.1-46 19.1z"
/>
<svg>
down.svg
</svg>
</button>
<span
Expand Down
10 changes: 2 additions & 8 deletions src/components/Filters/__tests__/__snapshots__/CollapsibleFilter.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,8 @@ exports[`component:CollapsibleFilter initial state renders without crashing 1`]
>
Hide
</span>
<svg
className="cf-icon-svg"
viewBox="0 0 1000 1200"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M500 105.2c-276.1 0-500 223.9-500 500s223.9 500 500 500 500-223.9 500-500-223.9-500-500-500zm263.1 550.7H236c-27.6 0-50-22.4-50-50s22.4-50 50-50h527.1c27.6 0 50 22.4 50 50s-22.4 50-50 50z"
/>
<svg>
minus-round.svg
</svg>
</span>
</span>
Expand Down
66 changes: 13 additions & 53 deletions src/components/Filters/__tests__/__snapshots__/CompanyReceivedFilter.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,8 @@ exports[`component::CompanyReceivedFilter snapshot shows errors 1`] = `
>
Hide
</span>
<svg
className="cf-icon-svg"
viewBox="0 0 1000 1200"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M500 105.2c-276.1 0-500 223.9-500 500s223.9 500 500 500 500-223.9 500-500-223.9-500-500-500zm263.1 550.7H236c-27.6 0-50-22.4-50-50s22.4-50 50-50h527.1c27.6 0 50 22.4 50 50s-22.4 50-50 50z"
/>
<svg>
minus-round.svg
</svg>
</span>
</span>
Expand Down Expand Up @@ -71,14 +65,8 @@ exports[`component::CompanyReceivedFilter snapshot shows errors 1`] = `
className="a-btn a-btn__link"
onClick={[Function]}
>
<svg
className="cf-icon-svg"
viewBox="0 0 718.9 1200"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M451.4 613.7l248.1-248.1c25.6-25.1 26-66.3.8-91.9s-66.3-26-91.9-.8l-.8.8-248.1 248.1-248.1-248.1c-25.4-25.4-66.5-25.4-91.9 0s-25.4 66.5 0 91.9l248.1 248.1L19.5 861.8c-25.6 25.1-26 66.3-.8 91.9s66.3 26 91.9.8l.8-.8 248.1-248.1 248.1 248.1c25.4 25.4 66.5 25.4 91.9 0s25.4-66.5 0-91.9L451.4 613.7z"
/>
<svg>
error.svg
</svg>
<span
className="u-visually-hidden"
Expand Down Expand Up @@ -114,14 +102,8 @@ exports[`component::CompanyReceivedFilter snapshot shows errors 1`] = `
className="a-btn a-btn__link"
onClick={[Function]}
>
<svg
className="cf-icon-svg"
viewBox="0 0 718.9 1200"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M451.4 613.7l248.1-248.1c25.6-25.1 26-66.3.8-91.9s-66.3-26-91.9-.8l-.8.8-248.1 248.1-248.1-248.1c-25.4-25.4-66.5-25.4-91.9 0s-25.4 66.5 0 91.9l248.1 248.1L19.5 861.8c-25.6 25.1-26 66.3-.8 91.9s66.3 26 91.9.8l.8-.8 248.1-248.1 248.1 248.1c25.4 25.4 66.5 25.4 91.9 0s25.4-66.5 0-91.9L451.4 613.7z"
/>
<svg>
error.svg
</svg>
<span
className="u-visually-hidden"
Expand All @@ -139,12 +121,8 @@ exports[`component::CompanyReceivedFilter snapshot shows errors 1`] = `
>
<svg
className="cf-icon-svg cf-icon-delete-round"
viewBox="0 0 1000 1200"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M500 105.2c-276.1 0-500 223.9-500 500s223.9 500 500 500 500-223.9 500-500-223.9-500-500-500zm261.8 692.2c19.4 19.6 19.3 51.3-.3 70.7-19.5 19.3-50.9 19.3-70.4 0L499.6 676.6 308 868.1c-19.6 19.4-51.3 19.3-70.7-.3-19.3-19.5-19.3-50.9 0-70.4l191.6-191.5-191.6-191.6c-19.3-19.8-18.9-51.4.9-70.7 19.4-18.9 50.4-18.9 69.8 0l191.6 191.5 191.5-191.5c19.6-19.4 51.3-19.3 70.7.3 19.3 19.5 19.3 50.9 0 70.4L570.3 605.9l191.5 191.5z"
/>
error-round.svg
</svg>
</span>
</div>
Expand Down Expand Up @@ -178,14 +156,8 @@ exports[`component::CompanyReceivedFilter snapshot supports no dates in the Redu
>
Hide
</span>
<svg
className="cf-icon-svg"
viewBox="0 0 1000 1200"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M500 105.2c-276.1 0-500 223.9-500 500s223.9 500 500 500 500-223.9 500-500-223.9-500-500-500zm263.1 550.7H236c-27.6 0-50-22.4-50-50s22.4-50 50-50h527.1c27.6 0 50 22.4 50 50s-22.4 50-50 50z"
/>
<svg>
minus-round.svg
</svg>
</span>
</span>
Expand Down Expand Up @@ -224,14 +196,8 @@ exports[`component::CompanyReceivedFilter snapshot supports no dates in the Redu
className="a-btn a-btn__link"
onClick={[Function]}
>
<svg
className="cf-icon-svg"
viewBox="0 0 718.9 1200"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M451.4 613.7l248.1-248.1c25.6-25.1 26-66.3.8-91.9s-66.3-26-91.9-.8l-.8.8-248.1 248.1-248.1-248.1c-25.4-25.4-66.5-25.4-91.9 0s-25.4 66.5 0 91.9l248.1 248.1L19.5 861.8c-25.6 25.1-26 66.3-.8 91.9s66.3 26 91.9.8l.8-.8 248.1-248.1 248.1 248.1c25.4 25.4 66.5 25.4 91.9 0s25.4-66.5 0-91.9L451.4 613.7z"
/>
<svg>
error.svg
</svg>
<span
className="u-visually-hidden"
Expand Down Expand Up @@ -267,14 +233,8 @@ exports[`component::CompanyReceivedFilter snapshot supports no dates in the Redu
className="a-btn a-btn__link"
onClick={[Function]}
>
<svg
className="cf-icon-svg"
viewBox="0 0 718.9 1200"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M451.4 613.7l248.1-248.1c25.6-25.1 26-66.3.8-91.9s-66.3-26-91.9-.8l-.8.8-248.1 248.1-248.1-248.1c-25.4-25.4-66.5-25.4-91.9 0s-25.4 66.5 0 91.9l248.1 248.1L19.5 861.8c-25.6 25.1-26 66.3-.8 91.9s66.3 26 91.9.8l.8-.8 248.1-248.1 248.1 248.1c25.4 25.4 66.5 25.4 91.9 0s25.4-66.5 0-91.9L451.4 613.7z"
/>
<svg>
error.svg
</svg>
<span
className="u-visually-hidden"
Expand Down
Loading