Merge pull request #7731 from marmelab/fix-use-configure-admin-router…

…-from-children Fix useConfigureAdminRouterFromChildren when child function return null
marmelab · May 23, 2022 · a8bea15 · a8bea15
2 parents b1c1236 + 8799e72
commit a8bea15
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/packages/ra-core/src/core/useConfigureAdminRouterFromChildren.spec.tsx b/packages/ra-core/src/core/useConfigureAdminRouterFromChildren.spec.tsx
@@ -56,6 +56,30 @@ const TestedComponent = ({ role }) => {
     );
 };
 
+const TestedComponentReturningNull = ({ role }) => {
+    const history = createMemoryHistory();
+
+    return (
+        <CoreAdminContext history={history}>
+            <CoreAdminRoutes
+                layout={MyLayout}
+                catchAll={CatchAll}
+                loading={Loading}
+            >
+                <Resource name="posts" />
+                <Resource name="comments" />
+                {() =>
+                    role === 'admin'
+                        ? [<Resource name="user" />, <Resource name="admin" />]
+                        : role === 'user'
+                        ? [<Resource name="user" />]
+                        : null
+                }
+            </CoreAdminRoutes>
+        </CoreAdminContext>
+    );
+};
+
 const ResourceWithPermissions = (props: ResourceProps) => (
     <Resource {...props} />
 );
@@ -168,6 +192,12 @@ describe('useConfigureAdminRouterFromChildren', () => {
         expectResource('user').not.toBeNull();
         expectResource('admin').not.toBeNull();
     });
+    it('should accept function returning null', async () => {
+        render(<TestedComponentReturningNull role="admin" />);
+        await waitFor(() => expect(screen.queryByText('Loading')).toBeNull());
+        expectResource('user').not.toBeNull();
+        expectResource('admin').not.toBeNull();
+    });
     it('should call registerResource with the permissions', async () => {
         render(<TestedComponentWithPermissions />);
         await waitFor(() => expect(screen.queryByText('Loading')).toBeNull());

diff --git a/packages/ra-core/src/core/useConfigureAdminRouterFromChildren.tsx b/packages/ra-core/src/core/useConfigureAdminRouterFromChildren.tsx
@@ -97,7 +97,7 @@ const useRoutesAndResourcesFromChildren = (
         ) => {
             try {
                 const childrenFuncResult = childFunc(permissions);
-                if ((childrenFuncResult as Promise<ReactNode>).then) {
+                if ((childrenFuncResult as Promise<ReactNode>)?.then) {
                     (childrenFuncResult as Promise<ReactNode>).then(
                         resolvedChildren => {
                             mergeRoutesAndResources(