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.

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

Updated to Design System 1.1.0 #504

Merged
merged 9 commits into from
May 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 15 additions & 15 deletions cypress/e2e/common/filters.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ describe('Filter Panel', () => {
cy.get('#date_received-from').should('be.visible');

cy.log('collapse it');
cy.get('.date-filter button.a-btn__link:first').click({ force: true });
cy.get('.date-filter button.a-btn--link:first').click({ force: true });

cy.get('#date-received-agg #start_date').should('not.exist');

cy.log('open it');
cy.get('.date-filter button.a-btn__link:first').click({ force: true });
cy.get('.date-filter button.a-btn--link:first').click({ force: true });
cy.log('apply dates');

cy.get('#date_received-from').clear();
Expand Down Expand Up @@ -101,34 +101,34 @@ describe('Filter Panel', () => {
cy.wait(750);

cy.log('open simple filter');
cy.get('.timely > .o-expandable_header').click();
cy.get('.timely > .o-expandable__header').click();
// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(750);
cy.get(
'.timely > .o-expandable_content > ul > :nth-child(1) > .a-label',
'.timely > .o-expandable__content > ul > :nth-child(1) > .a-label',
).should('be.visible');

cy.log('close it');

// Close it after opening it
cy.get('.timely > .o-expandable_header').should('be.visible').click();
cy.get('.timely > .o-expandable__header').should('be.visible').click();
cy.get(
'.timely > .o-expandable_content > ul > :nth-child(1) > .a-label',
'.timely > .o-expandable__content > ul > :nth-child(1) > .a-label',
).should('not.exist');

cy.log('open it again');
cy.get('.timely > .o-expandable_header').click();
cy.get('.timely > .o-expandable__header').click();
// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(750);

cy.get(
'.timely > .o-expandable_content > ul > :nth-child(1) > .a-label',
'.timely > .o-expandable__content > ul > :nth-child(1) > .a-label',
).should('be.visible');

cy.log('apply filter');

cy.get(
'.timely > .o-expandable_content > ul > :nth-child(1) > .a-label',
'.timely > .o-expandable__content > ul > :nth-child(1) > .a-label',
).click();

cy.url().should('include', 'timely=Yes');
Expand All @@ -148,14 +148,14 @@ describe('Filter Panel', () => {
);

// close it
cy.get('.filter-panel .product .o-expandable_cue-close').click();
cy.get('.filter-panel .product .o-expandable__cue-close').click();
cy.get('.filter-panel .product .aggregation-branch').should(
'have.length',
0,
);

// open it
cy.get('.filter-panel .product .o-expandable_cue-open').click();
cy.get('.filter-panel .product .o-expandable__cue-open').click();

cy.get('.filter-panel .product .aggregation-branch').should(
'have.length.gt',
Expand All @@ -167,11 +167,11 @@ describe('Filter Panel', () => {
cy.get('.filter-panel .product .children').should('not.exist');
// Open sub-filter
cy.get(
'.filter-panel .product .aggregation-branch:first .a-btn__link',
'.filter-panel .product .aggregation-branch:first .a-btn--link',
).click();
cy.get('.filter-panel .product .children').should('exist');
cy.get(
'.filter-panel .product .aggregation-branch:first .a-btn__link',
'.filter-panel .product .aggregation-branch:first .a-btn--link',
).click();
cy.get('.filter-panel .product .children').should('not.exist');

Expand Down Expand Up @@ -234,12 +234,12 @@ describe('Filter Panel', () => {
cy.get('.state input').should('be.visible');

cy.log('close it');
cy.get('.state .o-expandable_cues').click();
cy.get('.state .o-expandable__cues').click();

cy.get('.state input').should('not.exist');

cy.log('open again');
cy.get('.state .o-expandable_cues').click();
cy.get('.state .o-expandable__cues').click();
cy.log('searches a typeahead filter');
cy.findByPlaceholderText('Enter state name or abbreviation').clear();
cy.findByPlaceholderText('Enter state name or abbreviation').type(
Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/export/export.cy.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
describe('Complaint export', () => {
const currentPage = '.m-pagination_label';
const nextButton = '.m-pagination .m-pagination_btn-next';
const currentPage = '.m-pagination__label';
const nextButton = '.m-pagination .m-pagination__btn-next';

const exportButton = '.export-btn';
const filteredDataset = 'label[for=dataset_filtered]';
Expand Down
6 changes: 3 additions & 3 deletions cypress/e2e/list/list.cy.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
describe('List View', () => {
const cardContainers = '.cards-panel .card-container';
const currentPage = '.m-pagination_label';
const nextButton = '.m-pagination .m-pagination_btn-next';
const prevButton = '.m-pagination .m-pagination_btn-prev';
const currentPage = '.m-pagination__label';
const nextButton = '.m-pagination .m-pagination__btn-next';
const prevButton = '.m-pagination .m-pagination__btn-prev';
const addNarrativesButton = '#btn-add-narratives';
const removeNarrativesButton = '#btn-remove-narratives';
const filterHasNarrative = '#filterHasNarrative';
Expand Down
6 changes: 3 additions & 3 deletions dist/ccdb5.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ccdb5.css.map

Large diffs are not rendered by default.

152 changes: 74 additions & 78 deletions dist/ccdb5.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ccdb5.js.map

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,19 @@
"@babel/eslint-parser": "^7.24.1",
"@babel/preset-react": "^7.24.1",
"@babel/runtime": "^7.24.4",
"@cfpb/cfpb-atomic-component": "0.43.1",
"@cfpb/cfpb-buttons": "0.43.0",
"@cfpb/cfpb-core": "0.43.0",
"@cfpb/cfpb-design-system": "^0.43.1",
"@cfpb/cfpb-expandables": "^0.43.1",
"@cfpb/cfpb-forms": "0.43.0",
"@cfpb/cfpb-grid": "0.43.0",
"@cfpb/cfpb-icons": "^0.43.0",
"@cfpb/cfpb-layout": "0.43.1",
"@cfpb/cfpb-notifications": "0.43.1",
"@cfpb/cfpb-pagination": "0.43.0",
"@cfpb/cfpb-tables": "0.43.1",
"@cfpb/cfpb-typography": "0.43.0",
"@cfpb/cfpb-atomic-component": "1.0.0",
"@cfpb/cfpb-buttons": "1.1.0",
"@cfpb/cfpb-core": "1.1.0",
"@cfpb/cfpb-design-system": "^1.1.0",
"@cfpb/cfpb-expandables": "^1.1.0",
"@cfpb/cfpb-forms": "1.1.0",
"@cfpb/cfpb-grid": "1.0.1",
"@cfpb/cfpb-icons": "^1.1.0",
"@cfpb/cfpb-layout": "1.1.0",
"@cfpb/cfpb-notifications": "1.1.0",
"@cfpb/cfpb-pagination": "1.1.0",
"@cfpb/cfpb-tables": "1.1.0",
"@cfpb/cfpb-typography": "1.1.0",
"@craco/craco": "^7.1.0",
"@reduxjs/toolkit": "^2.1.0",
"@testing-library/cypress": "^10.0.1",
Expand All @@ -74,7 +74,7 @@
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-cypress": "^2.15.1",
"eslint-plugin-cypress": "^2.15.2",
"eslint-plugin-jsdoc": "^48.2.3",
"eslint-plugin-react-redux": "^4.1.0",
"highcharts": "9.2.2",
Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/App.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ describe('initial state', () => {
</Provider>,
);

expect(updateLocationHookSpy).toBeCalledTimes(1);
expect(updateLocationHookSpy).toBeCalled();
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This hook will correctly be called twice when we update index.js to use strict mode. This test will be rewritten in the future to remove redux-mock-store and use a real redux store.


expect(screen.getByText(/Consumer Complaint Database/)).toBeDefined();
expect(screen.getByText(/Search within/)).toBeDefined();
Expand Down
4 changes: 2 additions & 2 deletions src/components/ActionBar/ActionBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const ActionBar = () => {
<div>
<h3 className="h4 flex-all export-results">
<button
className="a-btn a-btn__link export-btn"
className="a-btn a-btn--link export-btn"
data-gtm_ignore="true"
onClick={() => {
sendAnalyticsEvent('Export', tab + ':User Opens Export Modal');
Expand All @@ -57,7 +57,7 @@ export const ActionBar = () => {
Export data
</button>
<button
className="a-btn a-btn__link print-preview"
className="a-btn a-btn--link print-preview"
onClick={() => {
showPrintView(tab);
}}
Expand Down
2 changes: 1 addition & 1 deletion src/components/ComplaintDetail/ComplaintDetail.less
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}
}

.a-btn__link {
.a-btn--link {
border: 0;

span {
Expand Down
8 changes: 4 additions & 4 deletions src/components/Dialogs/DataExport/DataExport.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export const DataExport = () => {
<div className="header layout-row">
<h3 className="flex-all">Export complaints</h3>
<button
className="a-btn a-btn__link"
className="a-btn a-btn--link"
data-gtm_ignore="true"
onClick={() => {
dispatch(hideModal());
Expand Down Expand Up @@ -198,13 +198,13 @@ export const DataExport = () => {
>
{!copied && (
<div>
<span className="a-btn_icon">{getIcon('copy')}</span>
<span className="a-btn__icon">{getIcon('copy')}</span>
Copy
</div>
)}
{!!copied && (
<div>
<span className="a-btn_icon">
<span className="a-btn__icon">
{getIcon('checkmark-round')}
</span>
Copied
Expand All @@ -229,7 +229,7 @@ export const DataExport = () => {
Start export
</button>
<button
className="a-btn a-btn__link a-btn__warning"
className="a-btn a-btn--link a-btn__warning"
data-gtm_ignore="true"
onClick={() => {
dispatch(hideModal());
Expand Down
2 changes: 1 addition & 1 deletion src/components/Dialogs/DataExport/DataExport.less
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.export-modal {
.body {
.a-btn_icon {
.a-btn__icon {
padding-right: @gutter-minimum;
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/Dialogs/DataExport/ExportConfirmation.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const ExportConfirmation = () => {
<div className="header layout-row">
<h3 className="flex-all">Export complaints</h3>
<button
className="a-btn a-btn__link"
className="a-btn a-btn--link"
data-gtm_ignore="true"
onClick={() => {
dispatch(hideModal());
Expand Down
4 changes: 2 additions & 2 deletions src/components/Dialogs/RootModal.less
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

align-items: flex-start;

.a-btn__link {
.a-btn--link {
border: 0;
}

Expand All @@ -61,7 +61,7 @@
button {
margin-right: @gutter-normal;

&.a-btn__link {
&.a-btn--link {
height: @size-iv;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/Filters/AggregationBranch.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export class AggregationBranch extends React.Component {
);
}

const liStyle = 'parent m-form-field m-form-field__checkbox body-copy';
const liStyle = 'parent m-form-field m-form-field--checkbox body-copy';
const id = sanitizeHtmlId(fieldName + '-' + item.key);

let chevronIcon;
Expand All @@ -97,7 +97,7 @@ export class AggregationBranch extends React.Component {
<span className="u-visually-hidden">{item.key}</span>
</label>
<button
className="flex-all a-btn a-btn__link"
className="flex-all a-btn a-btn--link"
onClick={this._toggleChildDisplay}
>
<span>{item.key}</span>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Filters/AggregationBranch.less
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
}
}

.a-btn__link {
.a-btn--link {
border: 0;
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/Filters/AggregationItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export class AggregationItem extends React.Component {
render() {
const { isActive, item, fieldName } = this.props;
const value = item.value || item.key;
const liStyle = 'layout-row m-form-field m-form-field__checkbox';
const liStyle = 'layout-row m-form-field m-form-field--checkbox';
const id = sanitizeHtmlId(fieldName + '-' + item.key);
return (
<li className={liStyle}>
Expand Down
12 changes: 6 additions & 6 deletions src/components/Filters/CollapsibleFilter.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,33 +40,33 @@ export default class CollapsibleFilter extends React.Component {

const opened = (
<>
<span className="o-expandable_cue-close" role="img" aria-label="Hide">
<span className="o-expandable__cue-close" role="img" aria-label="Hide">
{getIcon('minus-round')}
</span>
</>
);
const closed = (
<>
<span className="o-expandable_cue-open" role="img" aria-label="Show">
<span className="o-expandable__cue-open" role="img" aria-label="Show">
{getIcon('plus-round')}
</span>
</>
);
return (
<section className={composeClasses}>
<button
className="o-expandable_header"
className="o-expandable__header"
aria-expanded={buttonAttr}
aria-label={`Hide ${this.props.title} filter`}
onClick={this._toggleChildDisplay}
>
<h3 className="o-expandable_label">{this.props.title}</h3>
<span className="o-expandable_cues">
<h3 className="o-expandable__label">{this.props.title}</h3>
<span className="o-expandable__cues">
{this.state.hasChildren ? opened : closed}
</span>
</button>
{this.state.hasChildren ? (
<div className="o-expandable_content">
<div className="o-expandable__content">
<p>{this.props.desc}</p>
{this.props.children}
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Filters/CompanyReceivedFilter.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export const CompanyReceivedFilter = () => {
value={fromDate}
/>
<button
className="a-btn a-btn__link"
className="a-btn a-btn--link"
onClick={() => handleClear('from')}
>
{getIcon('delete')}
Expand Down Expand Up @@ -189,7 +189,7 @@ export const CompanyReceivedFilter = () => {
value={throughDate}
/>
<button
className="a-btn a-btn__link"
className="a-btn a-btn--link"
onClick={() => handleClear('through')}
>
{getIcon('delete')}
Expand Down
6 changes: 3 additions & 3 deletions src/components/Filters/DateFilter.js
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ export const DateFilter = () => {
value={fromDate}
/>
<button
className="a-btn a-btn__link"
className="a-btn a-btn--link"
onClick={() => handleClear('from')}
>
{getIcon('delete')}
Expand Down Expand Up @@ -206,7 +206,7 @@ export const DateFilter = () => {
value={throughDate}
/>
<button
className="a-btn a-btn__link"
className="a-btn a-btn--link"
onClick={() => handleClear('through')}
>
{getIcon('delete')}
Expand All @@ -223,7 +223,7 @@ export const DateFilter = () => {
<span aria-hidden="true">
{getIcon('delete-round', 'cf-icon-delete-round')}
</span>
<span className="a-form-alert_text">{errors + ' '}</span>
<span className="a-form-alert__text">{errors + ' '}</span>
</div>
) : null}
</div>
Expand Down