yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-16 17:53:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix review comments

Browse Source
This commit is contained in:
mfrachet 2021-06-30 08:52:49 +02:00
parent e144a50af8
commit 2671d3fab0
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/core/admin/admin/src/content-manager/components/AttributeFilter/GenericInput.js
View File

@ -17,7 +17,11 @@ function GenericInput({ type, onChange, value, ...rest }) {
return ( return (
<DateWrapper type={type}> <DateWrapper type={type}>
<DatePicker onChange={e => onChange(e.target.value._d)} value={momentValue} {...rest} /> <DatePicker
onChange={e => onChange(e.target.value.format('YYYY-MM-DD'))}
value={momentValue}
{...rest}
/>
</DateWrapper> </DateWrapper>
); );
} }
@ -27,7 +31,11 @@ function GenericInput({ type, onChange, value, ...rest }) {
return ( return (
<DateWrapper type={type}> <DateWrapper type={type}>
<DateTime onChange={e => onChange(e.target.value)} value={momentValue} {...rest} /> <DateTime
onChange={e => onChange(e.target.value.format('YYYY-MM-DD'))}
value={momentValue}
{...rest}
/>
</DateWrapper> </DateWrapper>
); );
} }

20
packages/core/admin/admin/src/content-manager/components/AttributeFilter/tests/AttributeFilter.test.js
View File

@ -1,11 +1,16 @@
import React from 'react'; import React from 'react';
import { render, fireEvent } from '@testing-library/react'; import { render, fireEvent } from '@testing-library/react';
import { BrowserRouter } from 'react-router-dom'; import { BrowserRouter } from 'react-router-dom';
import AttributeFilter from '..'; import AttributeFilter from '..';
import addressCt from '../../../../../../../../admin-test-utils/lib/fixtures/collectionTypes/address'; import addressCt from '../../../../../../../../admin-test-utils/lib/fixtures/collectionTypes/address';
import addressMetaData from '../../../../../../../../admin-test-utils/lib/fixtures/metaData/address'; import addressMetaData from '../../../../../../../../admin-test-utils/lib/fixtures/metaData/address';
class MockDate extends Date {
constructor() {
super(1992, 5, 21);
}
}
jest.mock('react-intl', () => ({ jest.mock('react-intl', () => ({
// eslint-disable-next-line react/prop-types // eslint-disable-next-line react/prop-types
FormattedMessage: ({ id }) => <option value={id}>{id}</option>, FormattedMessage: ({ id }) => <option value={id}>{id}</option>,
@ -111,6 +116,17 @@ const renderComponent = () =>
); );
describe('AttributeFilter', () => { describe('AttributeFilter', () => {
let realDate;
beforeEach(() => {
realDate = global.Date;
global.Date = MockDate;
});
afterEach(() => {
global.Date = realDate;
});
it('snapshots the filter dropdown with a set of valid fields', () => { it('snapshots the filter dropdown with a set of valid fields', () => {
const { container } = renderComponent(); const { container } = renderComponent();
@ -339,7 +355,7 @@ describe('AttributeFilter', () => {
name="start_date" name="start_date"
tabindex="0" tabindex="0"
type="text" type="text"
value="June 29, 2021" value="June 21, 1992"
/> />
`); `);
}); });