Skip to content

fix: add clear access vars and fix sandbox menu #8823

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 1 commit into from
Nov 11, 2025
Merged

fix: add clear access vars and fix sandbox menu #8823

Show file tree
Hide file tree
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
20 changes: 17 additions & 3 deletions packages/app/src/app/hooks/useWorkspaceAuthorization.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ type WorkspaceAuthorizationReturn =
isTeamEditor: undefined;
isTeamViewer: undefined;
userRole: undefined;
hasAdminAccess: undefined;
hasEditorAccess: undefined;
hasViewerAccess: undefined;
}
| {
isAdmin: boolean;
Expand All @@ -19,6 +22,9 @@ type WorkspaceAuthorizationReturn =
isTeamEditor: boolean;
isTeamViewer: boolean;
userRole: TeamMemberAuthorization;
hasAdminAccess: boolean;
hasEditorAccess: boolean;
hasViewerAccess: boolean;
};

export const useWorkspaceAuthorization = (): WorkspaceAuthorizationReturn => {
Expand All @@ -42,6 +48,9 @@ export const useWorkspaceAuthorization = (): WorkspaceAuthorizationReturn => {
isTeamEditor: undefined,
isTeamViewer: undefined,
userRole: undefined,
hasAdminAccess: undefined,
hasEditorAccess: undefined,
hasViewerAccess: undefined,
};
}

Expand All @@ -52,10 +61,12 @@ export const useWorkspaceAuthorization = (): WorkspaceAuthorizationReturn => {
const isAdmin = authorization === TeamMemberAuthorization.Admin;

const isTeamAdmin = isAdmin;
const isTeamEditor = authorization === TeamMemberAuthorization.Write;
const isTeamViewer = authorization === TeamMemberAuthorization.Read;

const isTeamEditor = authorization === TeamMemberAuthorization.Write || isTeamAdmin;

const isTeamViewer = authorization === TeamMemberAuthorization.Read || isTeamEditor || isTeamAdmin;
const hasAdminAccess = isTeamAdmin;
const hasEditorAccess = isTeamEditor || isTeamAdmin;
const hasViewerAccess = isTeamViewer || isTeamEditor || isTeamAdmin;

return {
isBillingManager: Boolean(teamManager) || isAdmin,
Expand All @@ -65,5 +76,8 @@ export const useWorkspaceAuthorization = (): WorkspaceAuthorizationReturn => {
isTeamEditor,
isTeamViewer,
userRole: authorization ?? undefined,
hasAdminAccess,
hasEditorAccess,
hasViewerAccess,
};
};
14 changes: 7 additions & 7 deletions packages/app/src/app/pages/Dashboard/Components/Selection/ContextMenus/SandboxMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const SandboxMenu: React.FC<SandboxMenuProps> = ({
const { visible, setVisibility, position } = React.useContext(Context);
const history = useHistory();
const location = useLocation();
const { userRole, isTeamAdmin, isTeamViewer } = useWorkspaceAuthorization();
const { userRole, hasAdminAccess, hasEditorAccess } = useWorkspaceAuthorization();
const { isFrozen } = useWorkspaceLimits();

const url = sandboxUrl(sandbox);
Expand All @@ -44,15 +44,15 @@ export const SandboxMenu: React.FC<SandboxMenuProps> = ({

const restrictedFork = isFrozen;

const hasAccess = React.useMemo(() => {
const isInActiveTeam = React.useMemo(() => {
if (item.sandbox.teamId === activeTeam) {
return true;
}

return false;
}, [item, activeTeam]);

const hasWriteAccess = hasAccess && !isTeamViewer;
const hasWriteAccess = isInActiveTeam && hasEditorAccess;

if (location.pathname.includes('deleted') && hasWriteAccess) {
return (
Expand Down Expand Up @@ -127,7 +127,7 @@ export const SandboxMenu: React.FC<SandboxMenuProps> = ({
>
Copy link
</MenuItem>
{hasAccess && location.pathname === '/dashboard/recent' ? (
{isInActiveTeam && location.pathname === '/dashboard/recent' ? (
<MenuItem
onSelect={() => {
history.push(folderUrl, { sandboxId: sandbox.id });
Expand Down Expand Up @@ -278,7 +278,7 @@ export const SandboxMenu: React.FC<SandboxMenuProps> = ({
</MenuItem>
)}

{hasAccess &&
{isInActiveTeam &&
(isTemplate ? (
<MenuItem
onSelect={() => {
Expand All @@ -303,7 +303,7 @@ export const SandboxMenu: React.FC<SandboxMenuProps> = ({
</MenuItem>
))}
{isPro &&
isTeamAdmin &&
hasAdminAccess &&
(sandbox.permissions.preventSandboxLeaving ? (
<MenuItem
onSelect={() => {
Expand All @@ -329,7 +329,7 @@ export const SandboxMenu: React.FC<SandboxMenuProps> = ({
))}
{!sandbox.isV2 &&
isPro &&
isTeamAdmin &&
hasAdminAccess &&
(sandbox.permissions.preventSandboxExport ? (
<MenuItem
onSelect={() => {
Expand Down
Loading