Skip to content

feat: show dialog with a redirect if permissions are required #16661

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

Merged
merged 2 commits into from
Feb 21, 2025
Merged

feat: show dialog with a redirect if permissions are required #16661

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcaed9b
feat: show dialog if permissions required
brettkolodny Feb 21, 2025
4a1bcbd
fix: remove unused comment
brettkolodny Feb 21, 2025
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
30 changes: 28 additions & 2 deletions site/src/contexts/auth/RequirePermission.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
} from "components/Dialog/Dialog";
import { Link } from "components/Link/Link";
import type { FC, ReactNode } from "react";
import { Navigate } from "react-router-dom";

export interface RequirePermissionProps {
children?: ReactNode;
Expand All @@ -14,7 +22,25 @@ export const RequirePermission: FC<RequirePermissionProps> = ({
isFeatureVisible,
}) => {
if (!isFeatureVisible) {
return <Navigate to="/workspaces" />;
// return <Navigate to="/workspaces" />;
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
// return <Navigate to="/workspaces" />;

Copy link
Contributor Author

Choose a reason for hiding this comment

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

🤦

return (
<Dialog open={true}>
<DialogContent>
<DialogHeader>
<DialogTitle>
You don't have permission to view this page
</DialogTitle>
</DialogHeader>
<DialogDescription>
If you believe this is a mistake, please contact your administrator
or try signing in with different credentials.
</DialogDescription>
<DialogFooter>
<Link href="/">Go to workspaces</Link>
</DialogFooter>
</DialogContent>
</Dialog>
);
}

return <>{children}</>;
Expand Down
Loading