Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify useConfigureAdminRouterFromChildren permissions #7642

Merged
merged 1 commit into from
May 5, 2022
+2 −21
Merged

Simplify useConfigureAdminRouterFromChildren permissions #7642

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 2 additions & 21 deletions packages/ra-core/src/core/useConfigureAdminRouterFromChildren.tsx
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ import {
useEffect,
useState,
} from 'react';
import { useLogout, useGetPermissions, useAuthState } from '../auth';
import { useLogout, usePermissions, useAuthState } from '../auth';
import { useSafeSetState } from '../util';
import {
AdminChildren,
@@ -43,7 +43,7 @@ import { useResourceDefinitionContext } from './useResourceDefinitionContext';
export const useConfigureAdminRouterFromChildren = (
children: AdminChildren
): RoutesAndResources & { status: AdminRouterStatus } => {
const permissions = usePermissionsWithLogout();
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

usePermissions already handle the case when there is no authProvider

const { permissions } = usePermissions();

// Whenever children are updated, update our custom routes and resources
const [routesAndResources, status] = useRoutesAndResourcesFromChildren(
@@ -62,25 +62,6 @@ export const useConfigureAdminRouterFromChildren = (
};
};

const usePermissionsWithLogout = () => {
const getPermissions = useGetPermissions();
const doLogout = useLogout();
const [permissions, setPermissions] = useState<any>();

useEffect(() => {
getPermissions()
.then(newPermissions => {
setPermissions(newPermissions);
})
.catch(error => {
console.error(error);
doLogout();
});
}, [doLogout, getPermissions]);

return permissions;
};

/**
* A hook that determine the routes and resources from React nodes and permissions.
* Returns a tuple with the routes and resources as a single object, and the status.