Merge pull request #8546 from marmelab/fix-listguesser-show-link

Fix `ListGuesser` links to Edit view even though there is only a ShowView
marmelab · Jan 4, 2023 · a2c4b0f · a2c4b0f
2 parents d412153 + 2e58707
commit a2c4b0f
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 4 deletions.
diff --git a/packages/ra-ui-materialui/src/list/ListGuesser.stories.tsx b/packages/ra-ui-materialui/src/list/ListGuesser.stories.tsx
@@ -5,6 +5,7 @@ import defaultMessages from 'ra-language-english';
 import polyglotI18nProvider from 'ra-i18n-polyglot';
 
 import { ListGuesser } from './ListGuesser';
+import { ShowGuesser } from '../detail';
 import { AdminUI } from '../AdminUI';
 import { AdminContext } from '../AdminContext';
 
@@ -93,3 +94,21 @@ export const Basic = () => (
         </AdminUI>
     </AdminContext>
 );
+
+export const LinkedShow = () => (
+    <AdminContext
+        dataProvider={dataProvider}
+        i18nProvider={polyglotI18nProvider(() => defaultMessages, 'en')}
+    >
+        <AdminUI>
+            <Resource
+                name="products"
+                list={ListGuesser}
+                show={ShowGuesser}
+                recordRepresentation="name"
+            />
+            <Resource name="categories" recordRepresentation="name" />
+            <Resource name="tags" recordRepresentation="name" />
+        </AdminUI>
+    </AdminContext>
+);
diff --git a/packages/ra-ui-materialui/src/list/ListGuesser.tsx b/packages/ra-ui-materialui/src/list/ListGuesser.tsx
@@ -8,6 +8,7 @@ import {
     useListContext,
     useResourceContext,
     RaRecord,
+    useResourceDefinition,
 } from 'ra-core';
 
 import { ListProps } from './List';
@@ -71,6 +72,7 @@ export const ListGuesser = <RecordType extends RaRecord = any>(
 const ListViewGuesser = (props: Omit<ListViewProps, 'children'>) => {
     const { data } = useListContext(props);
     const resource = useResourceContext();
+    const { hasEdit, hasShow } = useResourceDefinition(props);
     const [child, setChild] = useState(null);
 
     useEffect(() => {
@@ -85,7 +87,7 @@ const ListViewGuesser = (props: Omit<ListViewProps, 'children'>) => {
             );
             const inferredChild = new InferredElement(
                 listFieldTypes.table,
-                null,
+                { hasEdit, hasShow },
                 inferredElements
             );
             setChild(inferredChild.getElement());
@@ -120,7 +122,7 @@ ${inferredChild.getRepresentation()}
 );`
             );
         }
-    }, [data, child, resource]);
+    }, [data, child, resource, hasEdit, hasShow]);
 
     return <ListView {...props}>{child}</ListView>;
 };

diff --git a/packages/ra-ui-materialui/src/list/listFieldTypes.tsx b/packages/ra-ui-materialui/src/list/listFieldTypes.tsx
@@ -16,8 +16,18 @@ import {
 
 export const listFieldTypes = {
     table: {
-        component: props => <Datagrid rowClick="edit" {...props} />, // eslint-disable-line react/display-name
-        representation: (_, children) => `        <Datagrid rowClick="edit">
+        component: props => {
+            const { hasEdit, hasShow, ...rest } = props;
+            return (
+                <Datagrid
+                    rowClick={!hasEdit && hasShow ? 'show' : 'edit'}
+                    {...rest}
+                />
+            );
+        }, // eslint-disable-line react/display-name
+        representation: (props, children) => `        <Datagrid rowClick="${
+            !props.hasEdit && props.hasShow ? 'show' : 'edit'
+        }">
 ${children.map(child => `            ${child.getRepresentation()}`).join('\n')}
         </Datagrid>`,
     },