Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

fix: workspace roles for settings and members button (#6574)

Akshita Goyala2328d0cbea3
diff --git a/apiserver/plane/app/serializers/workspace.py b/apiserver/plane/app/serializers/workspace.py
index a3ada8d0d3..7105302d3b 100644
--- a/apiserver/plane/app/serializers/workspace.py
+++ b/apiserver/plane/app/serializers/workspace.py
@@ -33,7 +33,6 @@ from django.core.exceptions import ValidationError
class WorkSpaceSerializer(DynamicBaseSerializer):
total_members = serializers.IntegerField(read_only=True)
- total_issues = serializers.IntegerField(read_only=True)
logo_url = serializers.CharField(read_only=True)
role = serializers.IntegerField(read_only=True)
diff --git a/apiserver/plane/app/views/workspace/base.py b/apiserver/plane/app/views/workspace/base.py
index 4d81eb1607..5be9a7558c 100644
--- a/apiserver/plane/app/views/workspace/base.py
+++ b/apiserver/plane/app/views/workspace/base.py
@@ -64,12 +64,6 @@ class WorkSpaceViewSet(BaseViewSet):
.values("count")
)
- issue_count = (
- Issue.issue_objects.filter(workspace=OuterRef("id"))
- .order_by()
- .annotate(count=Func(F("id"), function="Count"))
- .values("count")
- )
return (
self.filter_queryset(super().get_queryset().select_related("owner"))
.order_by("name")
@@ -78,8 +72,6 @@ class WorkSpaceViewSet(BaseViewSet):
workspace_member__is_active=True,
)
.annotate(total_members=member_count)
- .annotate(total_issues=issue_count)
- .select_related("owner")
)
def create(self, request):
@@ -125,7 +117,14 @@ class WorkSpaceViewSet(BaseViewSet):
role=20,
company_role=request.data.get("company_role", ""),
)
- return Response(serializer.data, status=status.HTTP_201_CREATED)
+
+ # Get total members and role
+ total_members=WorkspaceMember.objects.filter(workspace_id=serializer.data["id"]).count()
+ data = serializer.data
+ data["total_members"] = total_members
+ data["role"] = 20
+
+ return Response(data, status=status.HTTP_201_CREATED)
return Response(
[serializer.errors[error][0] for error in serializer.errors],
status=status.HTTP_400_BAD_REQUEST,
@@ -168,13 +167,6 @@ class UserWorkSpacesEndpoint(BaseAPIView):
.values("count")
)
- issue_count = (
- Issue.issue_objects.filter(workspace=OuterRef("id"))
- .order_by()
- .annotate(count=Func(F("id"), function="Count"))
- .values("count")
- )
-
role = (
WorkspaceMember.objects.filter(workspace=OuterRef("id"), member=request.user, is_active=True)
.values("role")
@@ -189,9 +181,7 @@ class UserWorkSpacesEndpoint(BaseAPIView):
),
)
)
- .select_related("owner")
- .annotate(total_members=member_count)
- .annotate(total_issues=issue_count, role=role)
+ .annotate(role=role, total_members=member_count)
.filter(
workspace_member__member=request.user, workspace_member__is_active=True
)
diff --git a/packages/types/src/workspace.d.ts b/packages/types/src/workspace.d.ts
index b68cddd7d0..9320f9b594 100644
--- a/packages/types/src/workspace.d.ts
+++ b/packages/types/src/workspace.d.ts
@@ -21,7 +21,6 @@ export interface IWorkspace {
readonly created_by: string;
readonly updated_by: string;
organization_size: string;
- total_issues: number;
total_projects?: number;
current_plan?: string;
role: number;
diff --git a/web/app/layout.tsx b/web/app/layout.tsx
index 71b7b71d28..6024753df8 100644
--- a/web/app/layout.tsx
+++ b/web/app/layout.tsx
@@ -67,7 +67,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
<link rel="preload" href={`${API_BASE_URL}/api/users/me/settings/ `} as="fetch" crossOrigin="use-credentials" />
<link
rel="preload"
- href={`${API_BASE_URL}/api/users/me/workspaces/`}
+ href={`${API_BASE_URL}/api/users/me/workspaces/?v=${Date.now()}`}
as="fetch"
crossOrigin="use-credentials"
/>
diff --git a/web/core/components/workspace/sidebar/dropdown-item.tsx b/web/core/components/workspace/sidebar/dropdown-item.tsx
index 1b8ace7c21..183a8fdb39 100644
--- a/web/core/components/workspace/sidebar/dropdown-item.tsx
+++ b/web/core/components/workspace/sidebar/dropdown-item.tsx
@@ -85,7 +85,7 @@ const SidebarDropdownItem = observer((props: TProps) => {
</div>
{workspace.id === activeWorkspace?.id && (
<>
- {workspace?.role > EUserPermissions.GUEST && (
+ {workspace?.role === EUserPermissions.ADMIN && (
<div className="mt-2 mb-1 flex gap-2">
<Link
href={`/${workspace.slug}/settings`}