Fix: incomplete typing for reference input (#562)

api-platform · Jun 24, 2024 · a7827cb · a7827cb
1 parent e0c087f
commit a7827cb
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 8 deletions.
diff --git a/src/InputGuesser.test.tsx b/src/InputGuesser.test.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import type { SortPayload } from 'react-admin';
 import {
   AdminContext,
   Edit,
@@ -243,6 +244,29 @@ describe('<InputGuesser />', () => {
     });
   });
 
+  test('renders reference input', async () => {
+    render(
+      <AdminContext dataProvider={dataProvider}>
+        <SchemaAnalyzerContext.Provider value={hydraSchemaAnalyzer}>
+          <ResourceContextProvider value="users">
+            <Edit id="/users/123" mutationMode="pessimistic">
+              <SimpleForm>
+                <InputGuesser
+                  source="owner"
+                  sort={{ field: 'id', order: 'DESC' } as SortPayload}
+                />
+              </SimpleForm>
+            </Edit>
+          </ResourceContextProvider>
+        </SchemaAnalyzerContext.Provider>
+      </AdminContext>,
+    );
+
+    expect(
+      await screen.findAllByText('resources.users.fields.owner'),
+    ).toHaveLength(1);
+  });
+
   test.each([
     // Default enum names.
     {

diff --git a/src/InputGuesser.tsx b/src/InputGuesser.tsx
@@ -59,7 +59,7 @@ export const IntrospectedInputGuesser = ({
 
   if (field.reference !== null && typeof field.reference === 'object') {
     if (field.maxCardinality === 1) {
-      const { filter, page, perPage, sort, enableGetChoices } =
+      const { filter, page, perPage, sort, enableGetChoices, ...rest } =
         props as ReferenceInputProps;
 
       return (
@@ -75,13 +75,13 @@ export const IntrospectedInputGuesser = ({
           <SelectInput
             optionText={schemaAnalyzer.getFieldNameFromSchema(field.reference)}
             validate={guessedValidate}
-            {...(props as SelectInputProps)}
+            {...(rest as SelectInputProps)}
           />
         </ReferenceInput>
       );
     }
 
-    const { filter, page, perPage, sort, enableGetChoices } =
+    const { filter, page, perPage, sort, enableGetChoices, ...rest } =
       props as ReferenceArrayInputProps;
 
     return (
@@ -97,7 +97,7 @@ export const IntrospectedInputGuesser = ({
         <SelectArrayInput
           optionText={schemaAnalyzer.getFieldNameFromSchema(field.reference)}
           validate={guessedValidate}
-          {...(props as SelectArrayInputProps)}
+          {...(rest as SelectArrayInputProps)}
         />
       </ReferenceArrayInput>
     );

diff --git a/src/__fixtures__/parsedData.ts b/src/__fixtures__/parsedData.ts
@@ -111,4 +111,17 @@ export const API_FIELDS_DATA = [
     enum: { Epic: 'EPIC', 'Fairy tale': 'FAIRY_TALE', Myth: 'MYTH' },
     required: false,
   }),
+  new Field('owner', {
+    id: 'http://localhost/owner',
+    range: 'https://schema.org/Person',
+    reference: {
+      id: 'https://schema.org/Person',
+      name: 'users',
+      url: 'http://localhost/users',
+      fields: [],
+    },
+    embedded: null,
+    maxCardinality: 1,
+    required: false,
+  }),
 ];
diff --git a/src/types.ts b/src/types.ts
@@ -45,6 +45,8 @@ import type {
   ReferenceFieldProps,
   ReferenceInputProps,
   ResourceProps,
+  SelectArrayInputProps,
+  SelectInputProps,
   ShowProps,
   SimpleFormProps,
   SingleFieldListProps,
@@ -479,20 +481,26 @@ type InputProps =
   | BooleanInputProps
   | NumberInputProps
   | ArrayInputProps
-  | ReferenceArrayInputProps
-  | ReferenceInputProps;
+  | SelectArrayInputProps
+  | SelectInputProps;
 
 export type IntrospectedInputGuesserProps = Partial<InputProps> &
   IntrospectedGuesserProps & {
     transformEnum?: (value: string | number) => string | number;
-  };
+  } & Pick<
+    ReferenceInputProps | ReferenceArrayInputProps,
+    'filter' | 'page' | 'perPage' | 'sort' | 'enableGetChoices'
+  >;
 
 export type InputGuesserProps = Omit<
   InputProps & Omit<BaseIntrospecterProps, 'resource'>,
   'component'
 > & {
   transformEnum?: (value: string | number) => string | number;
-};
+} & Pick<
+    ReferenceInputProps | ReferenceArrayInputProps,
+    'filter' | 'page' | 'perPage' | 'sort' | 'enableGetChoices'
+  >;
 
 export type IntrospecterProps = (
   | CreateGuesserProps