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

Make possible to use a SimpleList as a child of an ArrayField #6975

Merged
merged 2 commits into from
Dec 15, 2021
Merged
Changes from all commits
Commits
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
45 changes: 38 additions & 7 deletions packages/ra-ui-materialui/src/field/ArrayField.spec.tsx
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@ import ArrayField from './ArrayField';
import NumberField from './NumberField';
import TextField from './TextField';
import Datagrid from '../list/datagrid/Datagrid';
import SimpleList from '../list/SimpleList';

describe('<ArrayField />', () => {
const currentSort = { field: 'id', order: 'ASC' };
@@ -27,7 +28,27 @@ describe('<ArrayField />', () => {
);
});

it('should render the underlying iterator component', () => {
it('should render the alternative empty component', () => {
const { queryByText } = render(
<TestContext>
<ArrayField
source="arr"
resource="posts"
record={{
id: 123,
arr: [],
}}
>
<Datagrid empty={<div>No posts</div>}>
<NumberField source="id" />
</Datagrid>
</ArrayField>
</TestContext>
);
expect(queryByText('No posts')).not.toBeNull();
});

it('should render the <Datagrid> iterator component', () => {
const { queryByText } = render(
<TestContext>
<ArrayField
@@ -58,23 +79,33 @@ describe('<ArrayField />', () => {
expect(queryByText('456')).not.toBeNull();
});

it('should render the alternative empty component', () => {
it('should render the <SimpleList> iterator component', () => {
const { queryByText } = render(
<TestContext>
<ArrayField
source="arr"
resource="posts"
record={{
id: 123,
arr: [],
arr: [
{ id: 123, foo: 'bar' },
{ id: 456, foo: 'baz' },
],
}}
>
<Datagrid empty={<div>No posts</div>}>
<NumberField source="id" />
</Datagrid>
<SimpleList
primaryText={record => record.foo}
secondaryText={record => record.id}
/>
</ArrayField>
</TestContext>
);
expect(queryByText('No posts')).not.toBeNull();

// Test the fields values
expect(queryByText('bar')).not.toBeNull();
expect(queryByText('123')).not.toBeNull();

expect(queryByText('baz')).not.toBeNull();
expect(queryByText('456')).not.toBeNull();
});
});
2 changes: 1 addition & 1 deletion packages/ra-ui-materialui/src/field/ArrayField.tsx
Original file line number Diff line number Diff line change
@@ -165,7 +165,7 @@ export const ArrayField: FC<ArrayFieldProps> = memo(props => {
setPerPage: null,
setSort: null,
showFilter: null,
total: null,
total: ids.length,
}}
>
{cloneElement(Children.only(children), {