Merge pull request #10389 from dricholm/fix/reference-field-query-opt…

…ions Align queryOptions type in reference components and controller
marmelab · Nov 27, 2024 · 77f7ed8 · 77f7ed8
2 parents bc4a1e0 + 2b0498f
commit 77f7ed8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/packages/ra-core/src/controller/field/useReferenceFieldController.ts b/packages/ra-core/src/controller/field/useReferenceFieldController.ts
@@ -52,10 +52,9 @@ export interface UseReferenceFieldControllerOptions<
     ReferenceRecordType extends RaRecord = RaRecord,
 > {
     source: string;
-    queryOptions?: Partial<
-        UseQueryOptions<ReferenceRecordType[], Error> & {
-            meta?: any;
-        }
+    queryOptions?: Omit<
+        UseQueryOptions<ReferenceRecordType[], Error>,
+        'queryFn' | 'queryKey'
     >;
     reference: string;
     link?: LinkToType<ReferenceRecordType>;

diff --git a/packages/ra-ui-materialui/src/field/ReferenceArrayField.tsx b/packages/ra-ui-materialui/src/field/ReferenceArrayField.tsx
@@ -126,7 +126,10 @@ export interface ReferenceArrayFieldProps<
     reference: string;
     sort?: SortPayload;
     sx?: SxProps;
-    queryOptions?: UseQueryOptions<ReferenceRecordType[], Error>;
+    queryOptions?: Omit<
+        UseQueryOptions<ReferenceRecordType[], Error>,
+        'queryFn' | 'queryKey'
+    >;
 }
 
 export interface ReferenceArrayFieldViewProps

diff --git a/packages/ra-ui-materialui/src/field/ReferenceField.tsx b/packages/ra-ui-materialui/src/field/ReferenceField.tsx
@@ -83,10 +83,9 @@ export interface ReferenceFieldProps<
     ReferenceRecordType extends RaRecord = RaRecord,
 > extends FieldProps<RecordType> {
     children?: ReactNode;
-    queryOptions?: Partial<
-        UseQueryOptions<ReferenceRecordType[], Error> & {
-            meta?: any;
-        }
+    queryOptions?: Omit<
+        UseQueryOptions<ReferenceRecordType[], Error>,
+        'queryFn' | 'queryKey'
     >;
     reference: string;
     translateChoice?: Function | boolean;