diff --git a/apiserver/plane/ee/views/app/teamspace/base.py b/apiserver/plane/ee/views/app/teamspace/base.py index c05734db0d..40007e1395 100644 --- a/apiserver/plane/ee/views/app/teamspace/base.py +++ b/apiserver/plane/ee/views/app/teamspace/base.py @@ -70,7 +70,9 @@ class TeamspaceEndpoint(TeamspaceBaseEndpoint): """ return ( Teamspace.objects.filter( - workspace__slug=slug, members__member_id=self.request.user.id + workspace__slug=slug, + members__member_id=self.request.user.id, + members__deleted_at__isnull=True, ) .annotate( project_ids=Coalesce( diff --git a/web/ee/components/teamspaces/list/teamspaces-list.tsx b/web/ee/components/teamspaces/list/teamspaces-list.tsx index 5551ccddde..46dfe93a57 100644 --- a/web/ee/components/teamspaces/list/teamspaces-list.tsx +++ b/web/ee/components/teamspaces/list/teamspaces-list.tsx @@ -35,7 +35,7 @@ export const TeamspacesList = observer((props: TTeamspacesListProps) => { const { searchQuery } = useTeamspaceFilter(); // derived values const hasWorkspaceAdminLevelPermissions = allowPermissions( - [EUserWorkspaceRoles.ADMIN, EUserWorkspaceRoles.MEMBER], + [EUserWorkspaceRoles.ADMIN], EUserPermissionsLevel.WORKSPACE ); const resolvedPath = useResolvedAssetPath({ basePath: "/empty-state/teams/teams" });