Skip to content

Restrict workspace file deletion to managers #467

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

Closed
sara2398 wants to merge 1 commit into from
+26 −12
Closed

Restrict workspace file deletion to managers #467

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
13 changes: 12 additions & 1 deletion frontend/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,17 @@ function ProtectedRoute({ children }: { children: React.ReactNode }) {
return <>{children}</>;
}

function EnterpriseAdminRoute({ children }: { children: React.ReactNode }) {
const user = useAuthStore((s) => s.user);
const canAccessEnterpriseSettings =
user?.role === 'org_admin' ||
user?.role === 'platform_admin' ||
!!user?.is_platform_admin;

if (!canAccessEnterpriseSettings) return <Navigate to="/plaza" replace />;
return <>{children}</>;
}

/* ─── Notification Bar ─── */
type NotificationBarConfig = { enabled: boolean; text: string };
type NotificationBarUpdateEvent = CustomEvent<NotificationBarConfig>;
Expand Down Expand Up @@ -213,7 +224,7 @@ export default function App() {
<Route path="agents/:id/chat" element={<AgentDetail />} />
<Route path="agents/:id/settings" element={<AgentDetail />} />
<Route path="messages" element={<Messages />} />
<Route path="enterprise" element={<EnterpriseSettings />} />
<Route path="enterprise" element={<EnterpriseAdminRoute><EnterpriseSettings /></EnterpriseAdminRoute>} />
<Route path="okr" element={<OKR />} />
<Route path="invitations" element={<InvitationCodes />} />
<Route path="admin/platform-settings" element={<AdminCompanies />} />
Expand Down
25 changes: 14 additions & 11 deletions frontend/src/pages/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ export default function Layout() {
const activeAgentRootMatch = useMatch('/agents/:id');
const activeAgentId = activeAgentNestedMatch?.params.id || activeAgentRootMatch?.params.id;
const canAccessPlatformSettings = user?.role === 'platform_admin' || !!(user as any)?.is_platform_admin;
const canAccessEnterpriseSettings = user?.role === 'org_admin' || user?.role === 'platform_admin' || !!(user as any)?.is_platform_admin;

const [showAccountSettings, setShowAccountSettings] = useState(false);
const [showAccountMenu, setShowAccountMenu] = useState(false);
Expand Down Expand Up @@ -810,17 +811,19 @@ export default function Layout() {
<IconPlus size={17} stroke={1.6} />
<span>{isChinese ? '创建或加入新公司' : 'Create or join company'}</span>
</button>
<button
type="button"
className="tenant-switcher-action"
onClick={() => {
setShowTenantMenu(false);
navigate('/enterprise');
}}
>
<IconSettings size={16} stroke={1.6} />
<span>{isChinese ? '公司信息设置' : 'Company settings'}</span>
</button>
{canAccessEnterpriseSettings && (
<button
type="button"
className="tenant-switcher-action"
onClick={() => {
setShowTenantMenu(false);
navigate('/enterprise');
}}
>
<IconSettings size={16} stroke={1.6} />
<span>{isChinese ? '公司信息设置' : 'Company settings'}</span>
</button>
)}
</div>
)}
</div>
Expand Down