feat: brought back workspace permission and made requested changes

This commit is contained in:
=
2024-08-03 14:55:30 +05:30
parent b97bbe5beb
commit b4a2a477d3
16 changed files with 1074 additions and 906 deletions
+5 -15
View File
@@ -59,7 +59,6 @@ import {
OrgPermissionActions,
OrgPermissionSubjects,
useOrganization,
useOrgPermission,
useSubscription,
useUser,
useWorkspace
@@ -132,8 +131,6 @@ export const AppLayout = ({ children }: LayoutProps) => {
const { workspaces, currentWorkspace } = useWorkspace();
const { orgs, currentOrg } = useOrganization();
const { membership } = useOrgPermission();
const isOrgAdmin = membership?.role === "admin";
const { data: projectFavorites } = useGetUserProjectFavorites(currentOrg?.id!);
const { mutateAsync: updateUserProjectFavorites } = useUpdateUserProjectFavorites();
@@ -483,6 +480,11 @@ export const AppLayout = ({ children }: LayoutProps) => {
</DropdownMenuItem>
</Link>
)}
<Link href={`/org/${currentOrg?.id}/admin`} legacyBehavior>
<DropdownMenuItem className="mt-1 border-t border-mineshaft-600">
Admin Panel
</DropdownMenuItem>
</Link>
<div className="mt-1 h-1 border-t border-mineshaft-600" />
<button type="button" onClick={logOutUser} className="w-full">
<DropdownMenuItem>Log Out</DropdownMenuItem>
@@ -751,18 +753,6 @@ export const AppLayout = ({ children }: LayoutProps) => {
</a>
</Link>
)}
{isOrgAdmin && (
<Link href={`/org/${currentOrg?.id}/admin`} passHref>
<a>
<MenuItem
isSelected={router.asPath === `/org/${currentOrg?.id}/admin`}
icon="system-outline-109-slider-toggle-settings"
>
Admin Panel
</MenuItem>
</a>
</Link>
)}
<Link href={`/org/${currentOrg?.id}/settings`} passHref>
<a>
<MenuItem