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 AutocompleteArrayInput inside ReferenceArrayInput #4042

Merged
merged 4 commits into from
Nov 26, 2019
Merged

Fix AutocompleteArrayInput inside ReferenceArrayInput #4042

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a786c52
Fix AutocompleteArrayInput inside ReferenceArrayInput
fzaninotto Nov 25, 2019
0444358
Silence warnings in tests
fzaninotto Nov 26, 2019
8547629
Fix unit tests
fzaninotto Nov 26, 2019
8dc6813
Fix defaultDataProvider doesn't respect the DataProvider type
fzaninotto Nov 26, 2019
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
27 changes: 19 additions & 8 deletions packages/ra-core/src/controller/input/useReferenceArrayInputController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { useMemo, useState, useEffect, useRef } from 'react';
import { useSelector } from 'react-redux';
import isEqual from 'lodash/isEqual';
import difference from 'lodash/difference';
import { Pagination, Record, Sort } from '../../types';
import { Pagination, Record, Sort, ReduxState } from '../../types';
import { useGetMany } from '../../dataProvider';
import { FieldInputProps } from 'react-final-form';
import useGetMatching from '../../dataProvider/useGetMatching';
Expand Down Expand Up @@ -49,12 +50,18 @@ const useReferenceArrayInputController = ({
// only the missing references when the input value changes
const inputValue = useRef(input.value);
const [idsToFetch, setIdsToFetch] = useState(input.value);
const [idsToGetFromStore, setIdsToGetFromStore] = useState([]);
const referenceRecordsFromStore = useSelector((state: ReduxState) =>
idsToGetFromStore.map(id => state.admin.resources[reference].data[id])
);

// optimization: we fetch selected items only once. When the user selects more items,
// as we already have the past selected items in the store, we don't fetch them.
useEffect(() => {
const newIdsToFetch = difference(input.value, inputValue.current);

if (newIdsToFetch.length > 0) {
setIdsToFetch(newIdsToFetch);
setIdsToGetFromStore(inputValue.current);
}
inputValue.current = input.value;
}, [input.value, setIdsToFetch]);
Expand Down Expand Up @@ -90,11 +97,20 @@ const useReferenceArrayInputController = ({
[defaultFilter, filter, filterToQuery]
);

const { data: referenceRecords, loaded } = useGetMany(
const { data: referenceRecordsFetched, loaded } = useGetMany(
reference,
idsToFetch || []
);

const referenceRecords = referenceRecordsFetched.concat(
referenceRecordsFromStore
);

// filter out not found references - happens when the dataProvider doesn't guarantee referential integrity
const finalReferenceRecords = referenceRecords
? referenceRecords.filter(Boolean)
: [];

const { data: matchingReferences } = useGetMatching(
reference,
pagination,
Expand All @@ -105,11 +121,6 @@ const useReferenceArrayInputController = ({
options
);

// filter out not found references - happens when the dataProvider doesn't guarantee referential integrity
const finalReferenceRecords = referenceRecords
? referenceRecords.filter(Boolean)
: [];

// We merge the currently selected records with the matching ones, otherwise
// the component displaying the currently selected records may fail
const finalMatchingReferences =
Expand Down