chore: add storeKey to arrayfield to handle resources with same ids

marmelab · Dec 1, 2024 · bd5b4a4 · bd5b4a4
1 parent f35fb60
commit bd5b4a4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/packages/ra-core/src/controller/list/useList.ts b/packages/ra-core/src/controller/list/useList.ts
@@ -3,7 +3,7 @@ import get from 'lodash/get';
 import isEqual from 'lodash/isEqual';
 import { removeEmpty } from '../../util';
 import { FilterPayload, RaRecord, SortPayload } from '../../types';
-import { useResourceContext } from '../../core';
+import { ResourceContextValue, useResourceContext } from '../../core';
 import usePaginationState from '../usePaginationState';
 import useSortState from '../useSortState';
 import { useRecordSelection } from './useRecordSelection';
@@ -66,8 +66,8 @@ export const useList = <RecordType extends RaRecord = any>(
         sort: initialSort,
         filterCallback = (record: RecordType) => Boolean(record),
     } = props;
-    const resource = useResourceContext(props);
-
+    const resourceFromContext = useResourceContext(props);
+    const resource = props.storeKey ?? resourceFromContext;
     const [fetchingState, setFetchingState] = useState<boolean>(isFetching) as [
         boolean,
         (isFetching: boolean) => void,
@@ -287,7 +287,7 @@ export const useList = <RecordType extends RaRecord = any>(
         onUnselectItems: selectionModifiers.clearSelection,
         page,
         perPage,
-        resource: '',
+        resource: resource,
         refetch,
         selectedIds,
         setFilters,
@@ -310,6 +310,7 @@ export interface UseListOptions<RecordType extends RaRecord = any> {
     perPage?: number;
     sort?: SortPayload;
     resource?: string;
+    storeKey?: string;
     filterCallback?: (record: RecordType) => boolean;
 }
 

diff --git a/packages/ra-ui-materialui/src/field/ArrayField.tsx b/packages/ra-ui-materialui/src/field/ArrayField.tsx
@@ -79,9 +79,16 @@ const ArrayFieldImpl = <
 >(
     props: ArrayFieldProps<RecordType>
 ) => {
-    const { children, resource, perPage, sort, filter } = props;
+    const { children, resource, perPage, sort, filter, storeKey } = props;
     const data = useFieldValue(props) || emptyArray;
-    const listContext = useList({ data, resource, perPage, sort, filter });
+    const listContext = useList({
+        data,
+        resource,
+        perPage,
+        sort,
+        filter,
+        storeKey,
+    });
     return (
         <ListContextProvider value={listContext}>
             {children}
@@ -99,6 +106,7 @@ export interface ArrayFieldProps<
     perPage?: number;
     sort?: SortPayload;
     filter?: FilterPayload;
+    storeKey?: string;
 }
 
 const emptyArray = [];