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

Jump to bottom

Fix <ArrayInput> does not work in <FilterForm> #9521

Merged
merged 1 commit into from
Dec 13, 2023
Merged

Fix <ArrayInput> does not work in <FilterForm> #9521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
117 changes: 83 additions & 34 deletions packages/ra-ui-materialui/src/list/filter/FilterButton.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { ListBase } from 'ra-core';
import { ListBase, memoryStore } from 'ra-core';
import {
Admin,
Resource,
Expand All @@ -14,7 +14,12 @@ import {
SearchInput,
} from 'react-admin';
import fakerestDataProvider from 'ra-data-fakerest';
import { AutocompleteArrayInput } from '../../input';
import {
ArrayInput,
AutocompleteArrayInput,
SimpleFormIterator,
} from '../../input';
import { MemoryRouter } from 'react-router';

export default {
title: 'ra-ui-materialui/list/filter/FilterButton',
Expand Down Expand Up @@ -197,12 +202,43 @@ export const Basic = (args: { disableSaveQuery?: boolean }) => {
<TextInput label="Nested" source="nested.foo" defaultValue="bar" />,
];
return (
<Admin dataProvider={fakerestDataProvider(data)}>
<Resource
name="posts"
list={<PostList postFilters={postFilters} args={args} />}
/>
</Admin>
<MemoryRouter>
<Admin
dataProvider={fakerestDataProvider(data)}
store={memoryStore()}
>
<Resource
name="posts"
list={<PostList postFilters={postFilters} args={args} />}
/>
</Admin>
</MemoryRouter>
);
};

export const WithArrayInput = (args: { disableSaveQuery?: boolean }) => {
const postFilters: React.ReactElement[] = [
<ArrayInput source="title" label="Title include" alwaysOn>
<SimpleFormIterator disableReordering>
<TextInput source="" label="Title" helperText={false} />
</SimpleFormIterator>
</ArrayInput>,
];
return (
<MemoryRouter>
<Admin
dataProvider={fakerestDataProvider(
data,
process.env.NODE_ENV !== 'test'
)}
store={memoryStore()}
>
<Resource
name="posts"
list={<PostList postFilters={postFilters} args={args} />}
/>
</Admin>
</MemoryRouter>
);
};

Expand All @@ -211,12 +247,17 @@ export const DisabledFilters = (args: { disableSaveQuery?: boolean }) => {
<TextInput label="Title" source="title" disabled={true} />,
];
return (
<Admin dataProvider={fakerestDataProvider(data)}>
<Resource
name="posts"
list={<PostList postFilters={postFilters} args={args} />}
/>
</Admin>
<MemoryRouter>
<Admin
dataProvider={fakerestDataProvider(data)}
store={memoryStore()}
>
<Resource
name="posts"
list={<PostList postFilters={postFilters} args={args} />}
/>
</Admin>
</MemoryRouter>
);
};

Expand All @@ -242,12 +283,17 @@ export const WithSearchInput = (args: {
/>,
];
return (
<Admin dataProvider={fakerestDataProvider(data)}>
<Resource
name="posts"
list={<PostList postFilters={postFilters} args={args} />}
/>
</Admin>
<MemoryRouter>
<Admin
dataProvider={fakerestDataProvider(data)}
store={memoryStore()}
>
<Resource
name="posts"
list={<PostList postFilters={postFilters} args={args} />}
/>
</Admin>
</MemoryRouter>
);
};

Expand Down Expand Up @@ -307,19 +353,22 @@ export const WithAutoCompleteArrayInput = (args: {
/>,
];
return (
<Admin
dataProvider={withNestedFiltersSupportDataProvider()}
dashboard={Dashboard}
>
<Resource
name="posts"
list={
<PostList
postFilters={postFilters}
args={{ disableSaveQuery: args.disableSaveQuery }}
/>
}
/>
</Admin>
<MemoryRouter>
<Admin
dataProvider={withNestedFiltersSupportDataProvider()}
dashboard={Dashboard}
store={memoryStore()}
>
<Resource
name="posts"
list={
<PostList
postFilters={postFilters}
args={{ disableSaveQuery: args.disableSaveQuery }}
/>
}
/>
</Admin>
</MemoryRouter>
);
};
25 changes: 24 additions & 1 deletion packages/ra-ui-materialui/src/list/filter/FilterForm.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ import * as React from 'react';
import { AdminContext } from '../../AdminContext';
import { ReferenceInput, SelectInput, TextInput } from '../../input';
import { Filter } from './Filter';
import { Basic, WithAutoCompleteArrayInput } from './FilterButton.stories';
import {
Basic,
WithAutoCompleteArrayInput,
WithArrayInput,
} from './FilterButton.stories';
import {
FilterForm,
getFilterFormValues,
Expand Down Expand Up @@ -194,6 +198,25 @@ describe('<FilterForm />', () => {
expect(screen.queryByLabelText('Nested')).toBeNull();
});

it('should provide a FormGroupContext', async () => {
render(<WithArrayInput />);

fireEvent.click(await screen.findByLabelText('Add'));
fireEvent.change((await screen.findAllByLabelText('Title'))[0], {
target: { value: 'Sint dignissimos in architecto aut' },
});
fireEvent.click(await screen.findByLabelText('Add'));

await waitFor(() => {
expect(screen.getAllByText('Title')).toHaveLength(3);
});
fireEvent.change((await screen.findAllByLabelText('Title'))[1], {
target: { value: 'Sed quo et et fugiat modi' },
});

await screen.findByText('1-2 of 2');
});

describe('mergeInitialValuesWithDefaultValues', () => {
it('should correctly merge initial values with the default values of the alwaysOn filters', () => {
const initialValues = {
Expand Down
13 changes: 8 additions & 5 deletions packages/ra-ui-materialui/src/list/filter/FilterForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
import PropTypes from 'prop-types';
import { styled } from '@mui/material/styles';
import {
FormGroupsProvider,
LabelPrefixContextProvider,
ListFilterContextValue,
useListContext,
Expand Down Expand Up @@ -84,11 +85,13 @@ export const FilterForm = (props: FilterFormProps) => {

return (
<FormProvider {...form}>
<FilterFormBase
onSubmit={handleFormSubmit}
filters={filters}
{...rest}
/>
<FormGroupsProvider>
<FilterFormBase
onSubmit={handleFormSubmit}
filters={filters}
{...rest}
/>
</FormGroupsProvider>
</FormProvider>
);
};
Expand Down
Loading