π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[WEB-2126] chore: guest and viewer role permission (#5347)
Anmol Singh Bhatia0a1c65686553
diff --git a/apiserver/plane/app/permissions/__init__.py b/apiserver/plane/app/permissions/__init__.pyindex 8e87935047..e453881441 100644--- a/apiserver/plane/app/permissions/__init__.py+++ b/apiserver/plane/app/permissions/__init__.py@@ -12,3 +12,4 @@ from .project import (ProjectMemberPermission,ProjectLitePermission,)+from .base import allow_permission, ROLE\ No newline at end of filediff --git a/apiserver/plane/app/permissions/base.py b/apiserver/plane/app/permissions/base.pynew file mode 100644index 0000000000..bb4f867a79--- /dev/null+++ b/apiserver/plane/app/permissions/base.py@@ -0,0 +1,61 @@+from plane.db.models import WorkspaceMember, ProjectMember+from functools import wraps+from rest_framework.response import Response+from rest_framework import status++from enum import Enum++class ROLE(Enum):+ ADMIN = 20+ MEMBER = 15+ VIEWER = 10+ GUEST = 5+++def allow_permission(allowed_roles, level="PROJECT", creator=False, model=None):+ def decorator(view_func):+ @wraps(view_func)+ def _wrapped_view(instance, request, *args, **kwargs):++ # Check for creator if required+ if creator and model:+ obj = model.objects.filter(+ id=kwargs["pk"], created_by=request.user+ ).exists()+ if obj:+ return view_func(instance, request, *args, **kwargs)++ # Convert allowed_roles to their values if they are enum members+ allowed_role_values = [+ role.value if isinstance(role, ROLE) else role+ for role in allowed_roles+ ]++ # Check role permissions+ if level == "WORKSPACE":+ if WorkspaceMember.objects.filter(+ member=request.user,+ workspace__slug=kwargs["slug"],+ role__in=allowed_role_values,+ is_active=True,+ ).exists():+ return view_func(instance, request, *args, **kwargs)+ else:+ if ProjectMember.objects.filter(+ member=request.user,+ workspace__slug=kwargs["slug"],+ project_id=kwargs["project_id"],+ role__in=allowed_role_values,+ is_active=True,+ ).exists():+ return view_func(instance, request, *args, **kwargs)++ # Return permission denied if no conditions are met+ return Response(+ {"error": "You don't have the required permissions."},+ status=status.HTTP_401_UNAUTHORIZED,+ )++ return _wrapped_view++ return decoratordiff --git a/apiserver/plane/app/urls/inbox.py b/apiserver/plane/app/urls/inbox.pyindex b6848244ba..6508c001d3 100644--- a/apiserver/plane/app/urls/inbox.py+++ b/apiserver/plane/app/urls/inbox.py@@ -40,7 +40,7 @@ urlpatterns = [name="inbox-issue",),path(- "workspaces/<str:slug>/projects/<uuid:project_id>/inbox-issues/<uuid:issue_id>/",+ "workspaces/<str:slug>/projects/<uuid:project_id>/inbox-issues/<uuid:pk>/",InboxIssueViewSet.as_view({"get": "retrieve",diff --git a/apiserver/plane/app/views/analytic/base.py b/apiserver/plane/app/views/analytic/base.pyindex 3d27641e3c..b72935fc25 100644--- a/apiserver/plane/app/views/analytic/base.py+++ b/apiserver/plane/app/views/analytic/base.py@@ -7,22 +7,22 @@ from django.utils import timezonefrom rest_framework import statusfrom rest_framework.response import Response+# Module importsfrom plane.app.permissions import WorkSpaceAdminPermissionfrom plane.app.serializers import AnalyticViewSerializer--# Module importsfrom plane.app.views.base import BaseAPIView, BaseViewSetfrom plane.bgtasks.analytic_plot_export import analytic_export_taskfrom plane.db.models import AnalyticView, Issue, Workspacefrom plane.utils.analytics_plot import build_graph_plotfrom plane.utils.issue_filters import issue_filters+from plane.app.permissions import allow_permission, ROLEclass AnalyticsEndpoint(BaseAPIView):- permission_classes = [- WorkSpaceAdminPermission,- ]+ @allow_permission(+ [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER], level="WORKSPACE"+ )def get(self, request, slug):x_axis = request.GET.get("x_axis", False)y_axis = request.GET.get("y_axis", False)@@ -201,10 +201,10 @@ class AnalyticViewViewset(BaseViewSet):class SavedAnalyticEndpoint(BaseAPIView):- permission_classes = [- WorkSpaceAdminPermission,- ]+ @allow_permission(+ [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER], level="WORKSPACE"+ )def get(self, request, slug, analytic_id):analytic_view = AnalyticView.objects.get(pk=analytic_id, workspace__slug=slug@@ -234,10 +234,10 @@ class SavedAnalyticEndpoint(BaseAPIView):class ExportAnalyticsEndpoint(BaseAPIView):- permission_classes = [- WorkSpaceAdminPermission,- ]+ @allow_permission(+ [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER], level="WORKSPACE"+ )def post(self, request, slug):x_axis = request.data.get("x_axis", False)y_axis = request.data.get("y_axis", False)@@ -301,10 +301,10 @@ class ExportAnalyticsEndpoint(BaseAPIView):class DefaultAnalyticsEndpoint(BaseAPIView):- permission_classes = [- WorkSpaceAdminPermission,- ]+ @allow_permission(+ [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST], level="WORKSPACE"+ )def get(self, request, slug):filters = issue_filters(request.GET, "GET")base_issues = Issue.issue_objects.filter(@@ -380,12 +380,10 @@ class DefaultAnalyticsEndpoint(BaseAPIView):.order_by("-count"))- open_estimate_sum = open_issues_queryset.aggregate(- sum=Sum("point")- )["sum"]- total_estimate_sum = base_issues.aggregate(sum=Sum("point"))[+ open_estimate_sum = open_issues_queryset.aggregate(sum=Sum("point"))["sum"]+ total_estimate_sum = base_issues.aggregate(sum=Sum("point"))["sum"]return Response({diff --git a/apiserver/plane/app/views/cycle/archive.py b/apiserver/plane/app/views/cycle/archive.pyindex 947f43a5f8..5f7f143473 100644--- a/apiserver/plane/app/views/cycle/archive.py+++ b/apiserver/plane/app/views/cycle/archive.py@@ -24,7 +24,7 @@ from django.utils import timezone# Third party importsfrom rest_framework import statusfrom rest_framework.response import Response-from plane.app.permissions import ProjectEntityPermission+from plane.app.permissions import allow_permission, ROLEfrom plane.db.models import Cycle, UserFavorite, Issue, Label, User, Projectfrom plane.utils.analytics_plot import burndown_plot@@ -34,10 +34,6 @@ from .. import BaseAPIViewclass CycleArchiveUnarchiveEndpoint(BaseAPIView):- permission_classes = [- ProjectEntityPermission,- ]-def get_queryset(self):favorite_subquery = UserFavorite.objects.filter(user=self.request.user,@@ -292,6 +288,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):.distinct())+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])def get(self, request, slug, project_id, pk=None):if pk is None:queryset = (@@ -596,6 +593,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):status=status.HTTP_200_OK,)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def post(self, request, slug, project_id, cycle_id):cycle = Cycle.objects.get(pk=cycle_id, project_id=project_id, workspace__slug=slug@@ -614,6 +612,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):status=status.HTTP_200_OK,)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def delete(self, request, slug, project_id, cycle_id):cycle = Cycle.objects.get(pk=cycle_id, project_id=project_id, workspace__slug=slugdiff --git a/apiserver/plane/app/views/cycle/base.py b/apiserver/plane/app/views/cycle/base.pyindex 8e1ed5f115..55cb24b85b 100644--- a/apiserver/plane/app/views/cycle/base.py+++ b/apiserver/plane/app/views/cycle/base.py@@ -29,8 +29,7 @@ from django.core.serializers.json import DjangoJSONEncoderfrom rest_framework import statusfrom rest_framework.response import Responsefrom plane.app.permissions import (- ProjectEntityPermission,- ProjectLitePermission,+ allow_permission, ROLE)from plane.app.serializers import (CycleSerializer,@@ -60,15 +59,6 @@ class CycleViewSet(BaseViewSet):serializer_class = CycleSerializermodel = Cyclewebhook_event = "cycle"- permission_classes = [- ProjectEntityPermission,- ]-- def perform_create(self, serializer):- serializer.save(- project_id=self.kwargs.get("project_id"),- owned_by=self.request.user,- )def get_queryset(self):favorite_subquery = UserFavorite.objects.filter(@@ -325,6 +315,7 @@ class CycleViewSet(BaseViewSet):.distinct())+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])def list(self, request, slug, project_id):queryset = self.get_queryset().filter(archived_at__isnull=True)cycle_view = request.GET.get("cycle_view", "all")@@ -611,6 +602,7 @@ class CycleViewSet(BaseViewSet):)return Response(data, status=status.HTTP_200_OK)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def create(self, request, slug, project_id):if (request.data.get("start_date", None) is None@@ -684,6 +676,7 @@ class CycleViewSet(BaseViewSet):status=status.HTTP_400_BAD_REQUEST,)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def partial_update(self, request, slug, project_id, pk):queryset = self.get_queryset().filter(workspace__slug=slug, project_id=project_id, pk=pk@@ -771,6 +764,7 @@ class CycleViewSet(BaseViewSet):return Response(cycle, status=status.HTTP_200_OK)return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])def retrieve(self, request, slug, project_id, pk):queryset = (self.get_queryset().filter(archived_at__isnull=True).filter(pk=pk)@@ -1039,6 +1033,7 @@ class CycleViewSet(BaseViewSet):status=status.HTTP_200_OK,)+ @allow_permission([ROLE.ADMIN], creator=True, model=Cycle)def destroy(self, request, slug, project_id, pk):cycle = Cycle.objects.get(workspace__slug=slug, project_id=project_id, pk=pk@@ -1097,10 +1092,8 @@ class CycleViewSet(BaseViewSet):class CycleDateCheckEndpoint(BaseAPIView):- permission_classes = [- ProjectEntityPermission,- ]+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def post(self, request, slug, project_id):start_date = request.data.get("start_date", False)end_date = request.data.get("end_date", False)@@ -1144,6 +1137,7 @@ class CycleFavoriteViewSet(BaseViewSet):.select_related("cycle", "cycle__owned_by"))+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def create(self, request, slug, project_id):_ = UserFavorite.objects.create(project_id=project_id,@@ -1153,6 +1147,7 @@ class CycleFavoriteViewSet(BaseViewSet):)return Response(status=status.HTTP_204_NO_CONTENT)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def destroy(self, request, slug, project_id, cycle_id):cycle_favorite = UserFavorite.objects.get(project=project_id,@@ -1166,10 +1161,8 @@ class CycleFavoriteViewSet(BaseViewSet):class TransferCycleIssueEndpoint(BaseAPIView):- permission_classes = [- ProjectEntityPermission,- ]+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def post(self, request, slug, project_id, cycle_id):new_cycle_id = request.data.get("new_cycle_id", False)@@ -1579,10 +1572,8 @@ class TransferCycleIssueEndpoint(BaseAPIView):class CycleUserPropertiesEndpoint(BaseAPIView):- permission_classes = [- ProjectLitePermission,- ]+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])def patch(self, request, slug, project_id, cycle_id):cycle_properties = CycleUserProperties.objects.get(user=request.user,@@ -1605,6 +1596,7 @@ class CycleUserPropertiesEndpoint(BaseAPIView):serializer = CycleUserPropertiesSerializer(cycle_properties)return Response(serializer.data, status=status.HTTP_201_CREATED)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])def get(self, request, slug, project_id, cycle_id):cycle_properties, _ = CycleUserProperties.objects.get_or_create(user=request.user,diff --git a/apiserver/plane/app/views/cycle/issue.py b/apiserver/plane/app/views/cycle/issue.pyindex b45c2ecc65..e8e9230c02 100644--- a/apiserver/plane/app/views/cycle/issue.py+++ b/apiserver/plane/app/views/cycle/issue.py@@ -3,12 +3,7 @@ import json# Django importsfrom django.core import serializers-from django.db.models import (- F,- Func,- OuterRef,- Q,-)+from django.db.models import F, Func, OuterRef, Qfrom django.utils import timezonefrom django.utils.decorators import method_decoratorfrom django.views.decorators.gzip import gzip_page@@ -17,10 +12,6 @@ from django.views.decorators.gzip import gzip_pagefrom rest_framework import statusfrom rest_framework.response import Response-from plane.app.permissions import (- ProjectEntityPermission,-)-# Module importsfrom .. import BaseViewSetfrom plane.app.serializers import (@@ -45,6 +36,7 @@ from plane.utils.paginator import (GroupedOffsetPaginator,SubGroupedOffsetPaginator,)+from plane.app.permissions import allow_permission, ROLEclass CycleIssueViewSet(BaseViewSet):@@ -54,10 +46,6 @@ class CycleIssueViewSet(BaseViewSet):webhook_event = "cycle_issue"bulk = True- permission_classes = [- ProjectEntityPermission,- ]-filterset_fields = ["issue__labels__id","issue__assignees__id",@@ -92,6 +80,7 @@ class CycleIssueViewSet(BaseViewSet):)@method_decorator(gzip_page)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])def list(self, request, slug, project_id, cycle_id):order_by_param = request.GET.get("order_by", "created_at")filters = issue_filters(request.query_params, "GET")@@ -238,6 +227,7 @@ class CycleIssueViewSet(BaseViewSet):),)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def create(self, request, slug, project_id, cycle_id):issues = request.data.get("issues", [])@@ -333,6 +323,7 @@ class CycleIssueViewSet(BaseViewSet):)return Response({"message": "success"}, status=status.HTTP_201_CREATED)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def destroy(self, request, slug, project_id, cycle_id, issue_id):cycle_issue = CycleIssue.objects.filter(issue_id=issue_id,diff --git a/apiserver/plane/app/views/dashboard/base.py b/apiserver/plane/app/views/dashboard/base.pyindex fe9eb50ecb..5dc1cf1b6e 100644--- a/apiserver/plane/app/views/dashboard/base.py+++ b/apiserver/plane/app/views/dashboard/base.py@@ -43,6 +43,7 @@ from plane.db.models import (ProjectMember,User,Widget,+ WorkspaceMember,)from plane.utils.issue_filters import issue_filters@@ -51,36 +52,61 @@ from .. import BaseAPIViewdef dashboard_overview_stats(self, request, slug):- assigned_issues = Issue.issue_objects.filter(- project__project_projectmember__is_active=True,- project__project_projectmember__member=request.user,+ extra_filters = {}+ if WorkspaceMember.objects.filter(workspace__slug=slug,- assignees__in=[request.user],- ).count()+ member=request.user,+ role=5,+ is_active=True,+ ).exists():+ extra_filters = {"created_by": request.user}- pending_issues_count = Issue.issue_objects.filter(- ~Q(state__group__in=["completed", "cancelled"]),- target_date__lt=timezone.now().date(),- project__project_projectmember__is_active=True,- project__project_projectmember__member=request.user,- workspace__slug=slug,- assignees__in=[request.user],- ).count()+ assigned_issues = (+ Issue.issue_objects.filter(+ project__project_projectmember__is_active=True,+ project__project_projectmember__member=request.user,+ workspace__slug=slug,+ assignees__in=[request.user],+ )+ .filter(**extra_filters)+ .count()+ )- created_issues_count = Issue.issue_objects.filter(- workspace__slug=slug,- project__project_projectmember__is_active=True,- project__project_projectmember__member=request.user,- created_by_id=request.user.id,- ).count()+ pending_issues_count = (+ Issue.issue_objects.filter(+ ~Q(state__group__in=["completed", "cancelled"]),+ target_date__lt=timezone.now().date(),+ project__project_projectmember__is_active=True,+ project__project_projectmember__member=request.user,+ workspace__slug=slug,+ assignees__in=[request.user],+ )+ .filter(**extra_filters)+ .count()+ )- completed_issues_count = Issue.issue_objects.filter(- workspace__slug=slug,- project__project_projectmember__is_active=True,- project__project_projectmember__member=request.user,- assignees__in=[request.user],- state__group="completed",- ).count()+ created_issues_count = (+ Issue.issue_objects.filter(+ workspace__slug=slug,+ project__project_projectmember__is_active=True,+ project__project_projectmember__member=request.user,+ created_by_id=request.user.id,+ )+ .filter(**extra_filters)+ .count()+ )++ completed_issues_count = (+ Issue.issue_objects.filter(+ workspace__slug=slug,+ project__project_projectmember__is_active=True,+ project__project_projectmember__member=request.user,+ assignees__in=[request.user],+ state__group="completed",+ )+ .filter(**extra_filters)+ .count()+ )return Response({@@ -166,6 +192,14 @@ def dashboard_assigned_issues(self, request, slug):))+ if WorkspaceMember.objects.filter(+ workspace__slug=slug,+ member=request.user,+ role=5,+ is_active=True,+ ).exists():+ assigned_issues = assigned_issues.filter(created_by=request.user)+# Priority Orderingpriority_order = ["urgent", "high", "medium", "low", "none"]assigned_issues = assigned_issues.annotate(@@ -409,6 +443,16 @@ def dashboard_created_issues(self, request, slug):def dashboard_issues_by_state_groups(self, request, slug):filters = issue_filters(request.query_params, "GET")state_order = ["backlog", "unstarted", "started", "completed", "cancelled"]+ extra_filters = {}++ if WorkspaceMember.objects.filter(+ workspace__slug=slug,+ member=request.user,+ role=5,+ is_active=True,+ ).exists():+ extra_filters = {"created_by": request.user}+issues_by_state_groups = (Issue.issue_objects.filter(workspace__slug=slug,@@ -416,7 +460,7 @@ def dashboard_issues_by_state_groups(self, request, slug):project__project_projectmember__member=request.user,assignees__in=[request.user],)- .filter(**filters)+ .filter(**filters, **extra_filters).values("state__group").annotate(count=Count("id")))@@ -439,6 +483,15 @@ def dashboard_issues_by_state_groups(self, request, slug):def dashboard_issues_by_priority(self, request, slug):filters = issue_filters(request.query_params, "GET")priority_order = ["urgent", "high", "medium", "low", "none"]+ extra_filters = {}++ if WorkspaceMember.objects.filter(+ workspace__slug=slug,+ member=request.user,+ role=5,+ is_active=True,+ ).exists():+ extra_filters = {"created_by": request.user}issues_by_priority = (Issue.issue_objects.filter(@@ -447,7 +500,7 @@ def dashboard_issues_by_priority(self, request, slug):project__project_projectmember__member=request.user,assignees__in=[request.user],)- .filter(**filters)+ .filter(**filters, **extra_filters).values("priority").annotate(count=Count("id")))diff --git a/apiserver/plane/app/views/estimate/base.py b/apiserver/plane/app/views/estimate/base.pyindex d70d4b8693..cd80c62999 100644--- a/apiserver/plane/app/views/estimate/base.py+++ b/apiserver/plane/app/views/estimate/base.py@@ -7,7 +7,11 @@ from rest_framework import status# Module importsfrom ..base import BaseViewSet, BaseAPIView-from plane.app.permissions import ProjectEntityPermission+from plane.app.permissions import (+ ProjectEntityPermission,+ allow_permission,+ ROLE,+)from plane.db.models import Project, Estimate, EstimatePoint, Issuefrom plane.app.serializers import (EstimateSerializer,@@ -23,10 +27,8 @@ def generate_random_name(length=10):class ProjectEstimatePointEndpoint(BaseAPIView):- permission_classes = [- ProjectEntityPermission,- ]+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])def get(self, request, slug, project_id):project = Project.objects.get(workspace__slug=slug, pk=project_id)if project.estimate_id is not None:@@ -189,10 +191,8 @@ class BulkEstimatePointEndpoint(BaseViewSet):class EstimatePointEndpoint(BaseViewSet):- permission_classes = [- ProjectEntityPermission,- ]+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def create(self, request, slug, project_id, estimate_id):# TODO: add a key validation if the same key already existsif not request.data.get("key") or not request.data.get("value"):@@ -211,6 +211,7 @@ class EstimatePointEndpoint(BaseViewSet):serializer = EstimatePointSerializer(estimate_point).datareturn Response(serializer, status=status.HTTP_200_OK)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def partial_update(self, request, slug, project_id, estimate_id, estimate_point_id):@@ -231,6 +232,7 @@ class EstimatePointEndpoint(BaseViewSet):serializer.save()return Response(serializer.data, status=status.HTTP_200_OK)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def destroy(self, request, slug, project_id, estimate_id, estimate_point_id):diff --git a/apiserver/plane/app/views/exporter/base.py b/apiserver/plane/app/views/exporter/base.pyindex 5649581dc8..50f9870d09 100644--- a/apiserver/plane/app/views/exporter/base.py+++ b/apiserver/plane/app/views/exporter/base.py@@ -2,7 +2,7 @@from rest_framework import statusfrom rest_framework.response import Response-from plane.app.permissions import WorkSpaceAdminPermission+from plane.app.permissions import allow_permission, ROLEfrom plane.app.serializers import ExporterHistorySerializerfrom plane.bgtasks.export_task import issue_export_taskfrom plane.db.models import ExporterHistory, Project, Workspace@@ -12,12 +12,10 @@ from .. import BaseAPIViewclass ExportIssuesEndpoint(BaseAPIView):- permission_classes = [- WorkSpaceAdminPermission,- ]model = ExporterHistoryserializer_class = ExporterHistorySerializer+ @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")def post(self, request, slug):# Get the workspaceworkspace = Workspace.objects.get(slug=slug)@@ -64,6 +62,7 @@ class ExportIssuesEndpoint(BaseAPIView):status=status.HTTP_400_BAD_REQUEST,)+ @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")def get(self, request, slug):exporter_history = ExporterHistory.objects.filter(workspace__slug=slug,diff --git a/apiserver/plane/app/views/external/base.py b/apiserver/plane/app/views/external/base.pyindex d9a66b8506..6ae3f37ba8 100644--- a/apiserver/plane/app/views/external/base.py+++ b/apiserver/plane/app/views/external/base.py@@ -11,7 +11,7 @@ from rest_framework import status# Module importsfrom ..base import BaseAPIView-from plane.app.permissions import ProjectEntityPermission, WorkspaceEntityPermission+from plane.app.permissions import allow_permission, ROLEfrom plane.db.models import Workspace, Projectfrom plane.app.serializers import (ProjectLiteSerializer,@@ -21,10 +21,8 @@ from plane.license.utils.instance_value import get_configuration_valueclass GPTIntegrationEndpoint(BaseAPIView):- permission_classes = [- ProjectEntityPermission,- ]+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def post(self, request, slug, project_id):OPENAI_API_KEY, GPT_ENGINE = get_configuration_value([@@ -84,10 +82,10 @@ class GPTIntegrationEndpoint(BaseAPIView):class WorkspaceGPTIntegrationEndpoint(BaseAPIView):- permission_classes = [- WorkspaceEntityPermission,- ]+ @allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"+ )def post(self, request, slug):OPENAI_API_KEY, GPT_ENGINE = get_configuration_value([diff --git a/apiserver/plane/app/views/inbox/base.py b/apiserver/plane/app/views/inbox/base.pyindex b66dcbde23..b99c44f1d9 100644--- a/apiserver/plane/app/views/inbox/base.py+++ b/apiserver/plane/app/views/inbox/base.py@@ -16,7 +16,9 @@ from rest_framework.response import Response# Module importsfrom ..base import BaseViewSet-from plane.app.permissions import ProjectBasePermission, ProjectLitePermission+from plane.app.permissions import (+ allow_permission, ROLE+)from plane.db.models import (Inbox,InboxIssue,@@ -39,9 +41,6 @@ from plane.bgtasks.issue_activities_task import issue_activityclass InboxViewSet(BaseViewSet):- permission_classes = [- ProjectBasePermission,- ]serializer_class = InboxSerializermodel = Inbox@@ -63,6 +62,7 @@ class InboxViewSet(BaseViewSet):.select_related("workspace", "project"))+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def list(self, request, slug, project_id):inbox = self.get_queryset().first()return Response(@@ -70,9 +70,11 @@ class InboxViewSet(BaseViewSet):status=status.HTTP_200_OK,)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def perform_create(self, serializer):serializer.save(project_id=self.kwargs.get("project_id"))+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def destroy(self, request, slug, project_id, pk):inbox = Inbox.objects.filter(workspace__slug=slug, project_id=project_id, pk=pk@@ -88,9 +90,6 @@ class InboxViewSet(BaseViewSet):class InboxIssueViewSet(BaseViewSet):- permission_classes = [- ProjectLitePermission,- ]serializer_class = InboxIssueSerializermodel = InboxIssue@@ -168,6 +167,7 @@ class InboxIssueViewSet(BaseViewSet):)).distinct()+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])def list(self, request, slug, project_id):inbox_id = Inbox.objects.filter(workspace__slug=slug, project_id=project_id@@ -201,6 +201,14 @@ class InboxIssueViewSet(BaseViewSet):if inbox_status:inbox_issue = inbox_issue.filter(status__in=inbox_status)+ if ProjectMember.objects.filter(+ workspace__slug=slug,+ project_id=project_id,+ member=request.user,+ role=5,+ is_active=True,+ ).exists():+ inbox_issue = inbox_issue.filter(created_by=request.user)return self.paginate(request=request,queryset=(inbox_issue),@@ -210,6 +218,7 @@ class InboxIssueViewSet(BaseViewSet):).data,)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])def create(self, request, slug, project_id):if not request.data.get("issue", {}).get("name", False):return Response(@@ -312,12 +321,13 @@ class InboxIssueViewSet(BaseViewSet):serializer.errors, status=status.HTTP_400_BAD_REQUEST)- def partial_update(self, request, slug, project_id, issue_id):+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])+ def partial_update(self, request, slug, project_id, pk):inbox_id = Inbox.objects.filter(workspace__slug=slug, project_id=project_id).first()inbox_issue = InboxIssue.objects.get(- issue_id=issue_id,+ issue_id=pk,workspace__slug=slug,project_id=project_id,inbox_id=inbox_id,@@ -458,7 +468,7 @@ class InboxIssueViewSet(BaseViewSet):request.data, cls=DjangoJSONEncoder),actor_id=str(request.user.id),- issue_id=str(issue_id),+ issue_id=str(pk),project_id=str(project_id),current_instance=current_instance,epoch=int(timezone.now().timestamp()),@@ -493,7 +503,7 @@ class InboxIssueViewSet(BaseViewSet):).get(inbox_id=inbox_id.id,- issue_id=issue_id,+ issue_id=pk,project_id=project_id,))@@ -506,7 +516,12 @@ class InboxIssueViewSet(BaseViewSet):serializer = InboxIssueDetailSerializer(inbox_issue).datareturn Response(serializer, status=status.HTTP_200_OK)- def retrieve(self, request, slug, project_id, issue_id):+ @allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER],+ creator=True,+ model=Issue,+ )+ def retrieve(self, request, slug, project_id, pk):inbox_id = Inbox.objects.filter(workspace__slug=slug, project_id=project_id).first()@@ -534,9 +549,7 @@ class InboxIssueViewSet(BaseViewSet):Value([], output_field=ArrayField(UUIDField())),),)- .get(- inbox_id=inbox_id.id, issue_id=issue_id, project_id=project_id- )+ .get(inbox_id=inbox_id.id, issue_id=pk, project_id=project_id))issue = InboxIssueDetailSerializer(inbox_issue).datareturn Response(@@ -544,12 +557,13 @@ class InboxIssueViewSet(BaseViewSet):status=status.HTTP_200_OK,)- def destroy(self, request, slug, project_id, issue_id):+ @allow_permission(allowed_roles=[ROLE.ADMIN], creator=True, model=Issue)+ def destroy(self, request, slug, project_id, pk):inbox_id = Inbox.objects.filter(workspace__slug=slug, project_id=project_id).first()inbox_issue = InboxIssue.objects.get(- issue_id=issue_id,+ issue_id=pk,workspace__slug=slug,project_id=project_id,inbox_id=inbox_id,@@ -559,21 +573,8 @@ class InboxIssueViewSet(BaseViewSet):if inbox_issue.status in [-2, -1, 0, 2]:# Delete the issue alsoissue = Issue.objects.filter(- workspace__slug=slug, project_id=project_id, pk=issue_id+ workspace__slug=slug, project_id=project_id, pk=pk).first()- if issue.created_by_id != request.user.id and (- not ProjectMember.objects.filter(- workspace__slug=slug,- member=request.user,- role=20,- project_id=project_id,- is_active=True,- ).exists()- ):- return Response(- {"error": "Only admin or creator can delete the issue"},- status=status.HTTP_403_FORBIDDEN,- )issue.delete()inbox_issue.delete()diff --git a/apiserver/plane/app/views/issue/activity.py b/apiserver/plane/app/views/issue/activity.pyindex 6815b254ed..0475cb9ec9 100644--- a/apiserver/plane/app/views/issue/activity.py+++ b/apiserver/plane/app/views/issue/activity.py@@ -19,7 +19,7 @@ from plane.app.serializers import (IssueActivitySerializer,IssueCommentSerializer,)-from plane.app.permissions import ProjectEntityPermission+from plane.app.permissions import ProjectEntityPermission, allow_permission, ROLEfrom plane.db.models import (IssueActivity,IssueComment,@@ -33,6 +33,7 @@ class IssueActivityEndpoint(BaseAPIView):]@method_decorator(gzip_page)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST, ROLE.VIEWER])def get(self, request, slug, project_id, issue_id):filters = {}if request.GET.get("created_at__gt", None) is not None:diff --git a/apiserver/plane/app/views/issue/archive.py b/apiserver/plane/app/views/issue/archive.pyindex 90258d3251..53dec68981 100644--- a/apiserver/plane/app/views/issue/archive.py+++ b/apiserver/plane/app/views/issue/archive.py@@ -46,15 +46,13 @@ from plane.utils.paginator import (GroupedOffsetPaginator,SubGroupedOffsetPaginator,)+from plane.app.permissions import allow_permission, ROLE# Module importsfrom .. import BaseViewSet, BaseAPIViewclass IssueArchiveViewSet(BaseViewSet):- permission_classes = [- ProjectEntityPermission,- ]serializer_class = IssueFlatSerializermodel = Issue@@ -98,6 +96,7 @@ class IssueArchiveViewSet(BaseViewSet):)@method_decorator(gzip_page)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])def list(self, request, slug, project_id):filters = issue_filters(request.query_params, "GET")show_sub_issues = request.GET.get("show_sub_issues", "true")@@ -213,6 +212,7 @@ class IssueArchiveViewSet(BaseViewSet):),)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])def retrieve(self, request, slug, project_id, pk=None):issue = (self.get_queryset()@@ -256,6 +256,7 @@ class IssueArchiveViewSet(BaseViewSet):serializer = IssueDetailSerializer(issue, expand=self.expand)return Response(serializer.data, status=status.HTTP_200_OK)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def archive(self, request, slug, project_id, pk=None):issue = Issue.issue_objects.get(workspace__slug=slug,@@ -294,6 +295,7 @@ class IssueArchiveViewSet(BaseViewSet):{"archived_at": str(issue.archived_at)}, status=status.HTTP_200_OK)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def unarchive(self, request, slug, project_id, pk=None):issue = Issue.objects.get(workspace__slug=slug,@@ -325,6 +327,7 @@ class BulkArchiveIssuesEndpoint(BaseAPIView):ProjectEntityPermission,]+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def post(self, request, slug, project_id):issue_ids = request.data.get("issue_ids", [])diff --git a/apiserver/plane/app/views/issue/attachment.py b/apiserver/plane/app/views/issue/attachment.pyindex c642294c86..1e955f18b2 100644--- a/apiserver/plane/app/views/issue/attachment.py+++ b/apiserver/plane/app/views/issue/attachment.py@@ -13,19 +13,16 @@ from rest_framework.parsers import MultiPartParser, FormParser# Module importsfrom .. import BaseAPIViewfrom plane.app.serializers import IssueAttachmentSerializer-from plane.app.permissions import ProjectEntityPermission-from plane.db.models import IssueAttachment, ProjectMember+from plane.db.models import IssueAttachmentfrom plane.bgtasks.issue_activities_task import issue_activityclass IssueAttachmentEndpoint(BaseAPIView):serializer_class = IssueAttachmentSerializer- permission_classes = [- ProjectEntityPermission,- ]model = IssueAttachmentparser_classes = (MultiPartParser, FormParser)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])def post(self, request, slug, project_id, issue_id):serializer = IssueAttachmentSerializer(data=request.data)if serializer.is_valid():@@ -47,21 +44,9 @@ class IssueAttachmentEndpoint(BaseAPIView):return Response(serializer.data, status=status.HTTP_201_CREATED)return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)+ @allow_permission([ROLE.ADMIN], creator=True, model=IssueAttachment)def delete(self, request, slug, project_id, issue_id, pk):issue_attachment = IssueAttachment.objects.get(pk=pk)- if issue_attachment.created_by_id != request.user.id and (- not ProjectMember.objects.filter(- workspace__slug=slug,- member=request.user,- role=20,- project_id=project_id,- is_active=True,- ).exists()- ):- return Response(- {"error": "Only admin or creator can delete the attachment"},- status=status.HTTP_403_FORBIDDEN,- )issue_attachment.asset.delete(save=False)issue_attachment.delete()issue_activity.delay(@@ -78,6 +63,7 @@ class IssueAttachmentEndpoint(BaseAPIView):return Response(status=status.HTTP_204_NO_CONTENT)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST, ROLE.VIEWER])def get(self, request, slug, project_id, issue_id):issue_attachments = IssueAttachment.objects.filter(issue_id=issue_id, workspace__slug=slug, project_id=project_iddiff --git a/apiserver/plane/app/views/issue/base.py b/apiserver/plane/app/views/issue/base.pyindex a1db50b443..6a4f3ce2b7 100644--- a/apiserver/plane/app/views/issue/base.py+++ b/apiserver/plane/app/views/issue/base.py@@ -25,10 +25,7 @@ from rest_framework import statusfrom rest_framework.response import Response# Module imports-from plane.app.permissions import (- ProjectEntityPermission,- ProjectLitePermission,-)+from plane.app.permissions import allow_permission, ROLEfrom plane.app.serializers import (IssueCreateSerializer,IssueDetailSerializer,@@ -60,14 +57,10 @@ from plane.utils.paginator import (from .. import BaseAPIView, BaseViewSetfrom plane.utils.user_timezone_converter import user_timezone_converter-# Module imports-class IssueListEndpoint(BaseAPIView):- permission_classes = [- ProjectEntityPermission,- ]+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])def get(self, request, slug, project_id):issue_ids = request.GET.get("issues", False)@@ -184,9 +177,6 @@ class IssueViewSet(BaseViewSet):model = Issuewebhook_event = "issue"- permission_classes = [- ProjectEntityPermission,- ]search_fields = ["name",@@ -232,6 +222,7 @@ class IssueViewSet(BaseViewSet):).distinct()@method_decorator(gzip_page)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])def list(self, request, slug, project_id):filters = issue_filters(request.query_params, "GET")order_by_param = request.GET.get("order_by", "-created_at")@@ -256,6 +247,15 @@ class IssueViewSet(BaseViewSet):sub_group_by=sub_group_by,)+ if ProjectMember.objects.filter(+ workspace__slug=slug,+ project_id=project_id,+ member=request.user,+ role=5,+ is_active=True,+ ).exists():+ issue_queryset = issue_queryset.filter(created_by=request.user)+if group_by:if sub_group_by:if group_by == sub_group_by:@@ -337,6 +337,7 @@ class IssueViewSet(BaseViewSet):),)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def create(self, request, slug, project_id):project = Project.objects.get(pk=project_id)@@ -411,6 +412,9 @@ class IssueViewSet(BaseViewSet):return Response(issue, status=status.HTTP_201_CREATED)return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)+ @allow_permission(+ [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER], creator=True, model=Issue+ )def retrieve(self, request, slug, project_id, pk=None):issue = (self.get_queryset()@@ -483,6 +487,7 @@ class IssueViewSet(BaseViewSet):serializer = IssueDetailSerializer(issue, expand=self.expand)return Response(serializer.data, status=status.HTTP_200_OK)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])def partial_update(self, request, slug, project_id, pk=None):issue = (self.get_queryset()@@ -548,23 +553,11 @@ class IssueViewSet(BaseViewSet):return Response(status=status.HTTP_204_NO_CONTENT)return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)+ @allow_permission([ROLE.ADMIN], creator=True, model=Issue)def destroy(self, request, slug, project_id, pk=None):issue = Issue.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)- if issue.created_by_id != request.user.id and (- not ProjectMember.objects.filter(- workspace__slug=slug,- member=request.user,- role=20,- project_id=project_id,- is_active=True,- ).exists()- ):- return Response(- {"error": "Only admin or creator can delete the issue"},- status=status.HTTP_403_FORBIDDEN,- )issue.delete()issue_activity.delay(@@ -582,10 +575,8 @@ class IssueViewSet(BaseViewSet):class IssueUserDisplayPropertyEndpoint(BaseAPIView):- permission_classes = [- ProjectLitePermission,- ]+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST, ROLE.VIEWER])def patch(self, request, slug, project_id):issue_property = IssueUserProperty.objects.get(user=request.user,@@ -605,6 +596,7 @@ class IssueUserDisplayPropertyEndpoint(BaseAPIView):serializer = IssueUserPropertySerializer(issue_property)return Response(serializer.data, status=status.HTTP_201_CREATED)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST, ROLE.VIEWER])def get(self, request, slug, project_id):issue_property, _ = IssueUserProperty.objects.get_or_create(user=request.user, project_id=project_id@@ -614,22 +606,9 @@ class IssueUserDisplayPropertyEndpoint(BaseAPIView):class BulkDeleteIssuesEndpoint(BaseAPIView):- permission_classes = [- ProjectEntityPermission,- ]+ @allow_permission([ROLE.ADMIN])def delete(self, request, slug, project_id):- if ProjectMember.objects.filter(- workspace__slug=slug,- member=request.user,- role__in=[15, 10, 5],- project_id=project_id,- is_active=True,- ).exists():- return Response(- {"error": "Only admin can perform this action"},- status=status.HTTP_403_FORBIDDEN,- )issue_ids = request.data.get("issue_ids", [])diff --git a/apiserver/plane/app/views/issue/comment.py b/apiserver/plane/app/views/issue/comment.pyindex 8a8f3d6ada..418ec2682a 100644--- a/apiserver/plane/app/views/issue/comment.py+++ b/apiserver/plane/app/views/issue/comment.py@@ -16,7 +16,7 @@ from plane.app.serializers import (IssueCommentSerializer,CommentReactionSerializer,)-from plane.app.permissions import ProjectLitePermission+from plane.app.permissions import ProjectLitePermission, allow_permission, ROLEfrom plane.db.models import (IssueComment,ProjectMember,@@ -29,9 +29,6 @@ class IssueCommentViewSet(BaseViewSet):serializer_class = IssueCommentSerializermodel = IssueCommentwebhook_event = "issue_comment"- permission_classes = [- ProjectLitePermission,- ]filterset_fields = ["issue__id",@@ -66,6 +63,7 @@ class IssueCommentViewSet(BaseViewSet):.distinct())+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST, ROLE.VIEWER])def create(self, request, slug, project_id, issue_id):serializer = IssueCommentSerializer(data=request.data)if serializer.is_valid():@@ -90,6 +88,11 @@ class IssueCommentViewSet(BaseViewSet):return Response(serializer.data, status=status.HTTP_201_CREATED)return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)+ @allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER],+ creator=True,+ model=IssueComment,+ )def partial_update(self, request, slug, project_id, issue_id, pk):issue_comment = IssueComment.objects.get(workspace__slug=slug,@@ -121,6 +124,9 @@ class IssueCommentViewSet(BaseViewSet):return Response(serializer.data, status=status.HTTP_200_OK)return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)+ @allow_permission(+ allowed_roles=[ROLE.ADMIN], creator=True, model=IssueComment+ )def destroy(self, request, slug, project_id, issue_id, pk):issue_comment = IssueComment.objects.get(workspace__slug=slug,diff --git a/apiserver/plane/app/views/issue/label.py b/apiserver/plane/app/views/issue/label.pyindex c5dc35809e..95ee2a8471 100644--- a/apiserver/plane/app/views/issue/label.py+++ b/apiserver/plane/app/views/issue/label.py@@ -11,9 +11,7 @@ from rest_framework import status# Module importsfrom .. import BaseViewSet, BaseAPIViewfrom plane.app.serializers import LabelSerializer-from plane.app.permissions import (- ProjectMemberPermission,-)+from plane.app.permissions import allow_permission, ProjectBasePermission, ROLEfrom plane.db.models import (Project,Label,@@ -25,7 +23,7 @@ class LabelViewSet(BaseViewSet):serializer_class = LabelSerializermodel = Labelpermission_classes = [- ProjectMemberPermission,+ ProjectBasePermission,]def get_queryset(self):@@ -45,6 +43,7 @@ class LabelViewSet(BaseViewSet):@invalidate_cache(path="/api/workspaces/:slug/labels/", url_params=True, user=False)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def create(self, request, slug, project_id):try:serializer = LabelSerializer(data=request.data)@@ -67,17 +66,20 @@ class LabelViewSet(BaseViewSet):@invalidate_cache(path="/api/workspaces/:slug/labels/", url_params=True, user=False)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def partial_update(self, request, *args, **kwargs):return super().partial_update(request, *args, **kwargs)@invalidate_cache(path="/api/workspaces/:slug/labels/", url_params=True, user=False)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def destroy(self, request, *args, **kwargs):return super().destroy(request, *args, **kwargs)class BulkCreateIssueLabelsEndpoint(BaseAPIView):+ @allow_permission([ROLE.ADMIN])def post(self, request, slug, project_id):label_data = request.data.get("label_data", [])project = Project.objects.get(pk=project_id)diff --git a/apiserver/plane/app/views/module/base.py b/apiserver/plane/app/views/module/base.pyindex 330170f09e..6f19de6c2a 100644--- a/apiserver/plane/app/views/module/base.py+++ b/apiserver/plane/app/views/module/base.py@@ -30,8 +30,10 @@ from rest_framework.response import Response# Module importsfrom plane.app.permissions import (ProjectEntityPermission,- ProjectLitePermission,+ allow_permission,+ ROLE,)+from plane.app.serializers import (ModuleDetailSerializer,ModuleLinkSerializer,@@ -48,7 +50,6 @@ from plane.db.models import (ModuleLink,ModuleUserProperties,Project,- ProjectMember,)from plane.utils.analytics_plot import burndown_plotfrom plane.utils.user_timezone_converter import user_timezone_converter@@ -58,9 +59,6 @@ from .. import BaseAPIView, BaseViewSetclass ModuleViewSet(BaseViewSet):model = Module- permission_classes = [- ProjectEntityPermission,- ]webhook_event = "module"def get_serializer_class(self):@@ -318,6 +316,8 @@ class ModuleViewSet(BaseViewSet):.order_by("-is_favorite", "-created_at"))+ allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])+def create(self, request, slug, project_id):project = Project.objects.get(workspace__slug=slug, pk=project_id)serializer = ModuleWriteSerializer(@@ -380,6 +380,8 @@ class ModuleViewSet(BaseViewSet):return Response(module, status=status.HTTP_201_CREATED)return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)+ allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])+def list(self, request, slug, project_id):queryset = self.get_queryset().filter(archived_at__isnull=True)if self.fields:@@ -427,6 +429,8 @@ class ModuleViewSet(BaseViewSet):)return Response(modules, status=status.HTTP_200_OK)+ allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])+def retrieve(self, request, slug, project_id, pk):queryset = (self.get_queryset()@@ -671,6 +675,7 @@ class ModuleViewSet(BaseViewSet):status=status.HTTP_200_OK,)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def partial_update(self, request, slug, project_id, pk):module = self.get_queryset().filter(pk=pk)@@ -740,25 +745,12 @@ class ModuleViewSet(BaseViewSet):return Response(module, status=status.HTTP_200_OK)return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)+ @allow_permission([ROLE.ADMIN], creator=True, model=Module)def destroy(self, request, slug, project_id, pk):module = Module.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)- if module.created_by_id != request.user.id and (- not ProjectMember.objects.filter(- workspace__slug=slug,- member=request.user,- role=20,- project_id=project_id,- is_active=True,- ).exists()- ):- return Response(- {"error": "Only admin or creator can delete the module"},- status=status.HTTP_403_FORBIDDEN,- )-module_issues = list(ModuleIssue.objects.filter(module_id=pk).values_list("issue", flat=True@@ -859,10 +851,8 @@ class ModuleFavoriteViewSet(BaseViewSet):class ModuleUserPropertiesEndpoint(BaseAPIView):- permission_classes = [- ProjectLitePermission,- ]+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])def patch(self, request, slug, project_id, module_id):module_properties = ModuleUserProperties.objects.get(user=request.user,@@ -885,6 +875,7 @@ class ModuleUserPropertiesEndpoint(BaseAPIView):serializer = ModuleUserPropertiesSerializer(module_properties)return Response(serializer.data, status=status.HTTP_201_CREATED)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])def get(self, request, slug, project_id, module_id):module_properties, _ = ModuleUserProperties.objects.get_or_create(user=request.user,diff --git a/apiserver/plane/app/views/module/issue.py b/apiserver/plane/app/views/module/issue.pyindex 8e70a5bd6d..0f800431d8 100644--- a/apiserver/plane/app/views/module/issue.py+++ b/apiserver/plane/app/views/module/issue.py@@ -17,9 +17,7 @@ from django.views.decorators.gzip import gzip_pagefrom rest_framework import statusfrom rest_framework.response import Response-from plane.app.permissions import (- ProjectEntityPermission,-)+from plane.app.permissions import allow_permission, ROLEfrom plane.app.serializers import (ModuleIssueSerializer,)@@ -58,10 +56,6 @@ class ModuleIssueViewSet(BaseViewSet):"issue__assignees__id",]- permission_classes = [- ProjectEntityPermission,- ]-def get_queryset(self):return (Issue.issue_objects.filter(@@ -97,6 +91,7 @@ class ModuleIssueViewSet(BaseViewSet):).distinct()@method_decorator(gzip_page)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])def list(self, request, slug, project_id, module_id):filters = issue_filters(request.query_params, "GET")issue_queryset = self.get_queryset().filter(**filters)@@ -204,6 +199,7 @@ class ModuleIssueViewSet(BaseViewSet):),)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])# create multiple issues inside a moduledef create_module_issues(self, request, slug, project_id, module_id):issues = request.data.get("issues", [])@@ -245,6 +241,7 @@ class ModuleIssueViewSet(BaseViewSet):]return Response({"message": "success"}, status=status.HTTP_201_CREATED)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])# add multiple module inside an issue and remove multiple modules from an issuedef create_issue_modules(self, request, slug, project_id, issue_id):modules = request.data.get("modules", [])@@ -307,6 +304,7 @@ class ModuleIssueViewSet(BaseViewSet):return Response({"message": "success"}, status=status.HTTP_201_CREATED)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def destroy(self, request, slug, project_id, module_id, issue_id):module_issue = ModuleIssue.objects.filter(workspace__slug=slug,diff --git a/apiserver/plane/app/views/notification/base.py b/apiserver/plane/app/views/notification/base.pyindex 6cae9d02a7..9d664c6c42 100644--- a/apiserver/plane/app/views/notification/base.py+++ b/apiserver/plane/app/views/notification/base.py@@ -19,6 +19,7 @@ from plane.db.models import (WorkspaceMember,)from plane.utils.paginator import BasePaginator+from plane.app.permissions import allow_permission, ROLE# Module importsfrom ..base import BaseAPIView, BaseViewSet@@ -39,6 +40,10 @@ class NotificationViewSet(BaseViewSet, BasePaginator):.select_related("workspace", "project," "triggered_by", "receiver"))+ @allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],+ level="WORKSPACE",+ )def list(self, request, slug):# Get query parameterssnoozed = request.GET.get("snoozed", "false")@@ -168,6 +173,10 @@ class NotificationViewSet(BaseViewSet, BasePaginator):serializer = NotificationSerializer(notifications, many=True)return Response(serializer.data, status=status.HTTP_200_OK)+ @allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],+ level="WORKSPACE",+ )def partial_update(self, request, slug, pk):notification = Notification.objects.get(workspace__slug=slug, pk=pk, receiver=request.user@@ -185,6 +194,9 @@ class NotificationViewSet(BaseViewSet, BasePaginator):return Response(serializer.data, status=status.HTTP_200_OK)return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)+ @allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"+ )def mark_read(self, request, slug, pk):notification = Notification.objects.get(receiver=request.user, workspace__slug=slug, pk=pk@@ -194,6 +206,9 @@ class NotificationViewSet(BaseViewSet, BasePaginator):serializer = NotificationSerializer(notification)return Response(serializer.data, status=status.HTTP_200_OK)+ @allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"+ )def mark_unread(self, request, slug, pk):notification = Notification.objects.get(receiver=request.user, workspace__slug=slug, pk=pk@@ -203,6 +218,9 @@ class NotificationViewSet(BaseViewSet, BasePaginator):serializer = NotificationSerializer(notification)return Response(serializer.data, status=status.HTTP_200_OK)+ @allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"+ )def archive(self, request, slug, pk):notification = Notification.objects.get(receiver=request.user, workspace__slug=slug, pk=pk@@ -212,6 +230,9 @@ class NotificationViewSet(BaseViewSet, BasePaginator):serializer = NotificationSerializer(notification)return Response(serializer.data, status=status.HTTP_200_OK)+ @allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"+ )def unarchive(self, request, slug, pk):notification = Notification.objects.get(receiver=request.user, workspace__slug=slug, pk=pk@@ -223,6 +244,11 @@ class NotificationViewSet(BaseViewSet, BasePaginator):class UnreadNotificationEndpoint(BaseAPIView):++ @allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],+ level="WORKSPACE",+ )def get(self, request, slug):# Watching Issues Countunread_notifications_count = (@@ -260,6 +286,10 @@ class UnreadNotificationEndpoint(BaseAPIView):class MarkAllReadNotificationViewSet(BaseViewSet):++ @allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"+ )def create(self, request, slug):snoozed = request.data.get("snoozed", False)archived = request.data.get("archived", False)@@ -343,6 +373,9 @@ class UserNotificationPreferenceEndpoint(BaseAPIView):serializer_class = UserNotificationPreferenceSerializer# request the object+ @allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE"+ )def get(self, request):user_notification_preference = UserNotificationPreference.objects.get(user=request.user@@ -353,6 +386,9 @@ class UserNotificationPreferenceEndpoint(BaseAPIView):return Response(serializer.data, status=status.HTTP_200_OK)# update the object+ @allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE"+ )def patch(self, request):user_notification_preference = UserNotificationPreference.objects.get(user=request.userdiff --git a/apiserver/plane/app/views/page/base.py b/apiserver/plane/app/views/page/base.pyindex 44c2c21408..cda44b227b 100644--- a/apiserver/plane/app/views/page/base.py+++ b/apiserver/plane/app/views/page/base.py@@ -19,7 +19,7 @@ from rest_framework import statusfrom rest_framework.response import Response-from plane.app.permissions import ProjectEntityPermission+from plane.app.permissions import allow_permission, ROLEfrom plane.app.serializers import (PageLogSerializer,PageSerializer,@@ -60,9 +60,6 @@ def unarchive_archive_page_and_descendants(page_id, archived_at):class PageViewSet(BaseViewSet):serializer_class = PageSerializermodel = Page- permission_classes = [- ProjectEntityPermission,- ]search_fields = ["name",]@@ -122,6 +119,7 @@ class PageViewSet(BaseViewSet):.distinct())+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def create(self, request, slug, project_id):serializer = PageSerializer(data=request.data,@@ -143,6 +141,7 @@ class PageViewSet(BaseViewSet):return Response(serializer.data, status=status.HTTP_201_CREATED)return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def partial_update(self, request, slug, project_id, pk):try:page = Page.objects.get(@@ -208,6 +207,7 @@ class PageViewSet(BaseViewSet):status=status.HTTP_400_BAD_REQUEST,)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])def retrieve(self, request, slug, project_id, pk=None):page = self.get_queryset().filter(pk=pk).first()if page is None:@@ -226,6 +226,7 @@ class PageViewSet(BaseViewSet):status=status.HTTP_200_OK,)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def lock(self, request, slug, project_id, pk):page = Page.objects.filter(pk=pk, workspace__slug=slug, projects__id=project_id@@ -235,6 +236,7 @@ class PageViewSet(BaseViewSet):page.save()return Response(status=status.HTTP_204_NO_CONTENT)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def unlock(self, request, slug, project_id, pk):page = Page.objects.filter(pk=pk, workspace__slug=slug, projects__id=project_id@@ -245,6 +247,7 @@ class PageViewSet(BaseViewSet):return Response(status=status.HTTP_204_NO_CONTENT)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def access(self, request, slug, project_id, pk):access = request.data.get("access", 0)page = Page.objects.filter(@@ -267,11 +270,13 @@ class PageViewSet(BaseViewSet):page.save()return Response(status=status.HTTP_204_NO_CONTENT)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])def list(self, request, slug, project_id):queryset = self.get_queryset()pages = PageSerializer(queryset, many=True).datareturn Response(pages, status=status.HTTP_200_OK)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def archive(self, request, slug, project_id, pk):page = Page.objects.get(pk=pk, workspace__slug=slug, projects__id=project_id@@ -299,6 +304,7 @@ class PageViewSet(BaseViewSet):status=status.HTTP_200_OK,)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def unarchive(self, request, slug, project_id, pk):page = Page.objects.get(pk=pk, workspace__slug=slug, projects__id=project_id@@ -328,6 +334,7 @@ class PageViewSet(BaseViewSet):return Response(status=status.HTTP_204_NO_CONTENT)+ @allow_permission([ROLE.ADMIN], creator=True, model=Page)def destroy(self, request, slug, project_id, pk):page = Page.objects.get(pk=pk, workspace__slug=slug, projects__id=project_id@@ -370,12 +377,10 @@ class PageViewSet(BaseViewSet):class PageFavoriteViewSet(BaseViewSet):- permission_classes = [- ProjectEntityPermission,- ]model = UserFavorite+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def create(self, request, slug, project_id, pk):_ = UserFavorite.objects.create(project_id=project_id,@@ -385,6 +390,7 @@ class PageFavoriteViewSet(BaseViewSet):)return Response(status=status.HTTP_204_NO_CONTENT)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def destroy(self, request, slug, project_id, pk):page_favorite = UserFavorite.objects.get(project=project_id,@@ -398,9 +404,6 @@ class PageFavoriteViewSet(BaseViewSet):class PageLogEndpoint(BaseAPIView):- permission_classes = [- ProjectEntityPermission,- ]serializer_class = PageLogSerializermodel = PageLog@@ -440,9 +443,6 @@ class PageLogEndpoint(BaseAPIView):class SubPagesEndpoint(BaseAPIView):- permission_classes = [- ProjectEntityPermission,- ]@method_decorator(gzip_page)def get(self, request, slug, project_id, page_id):@@ -461,10 +461,8 @@ class SubPagesEndpoint(BaseAPIView):class PagesDescriptionViewSet(BaseViewSet):- permission_classes = [- ProjectEntityPermission,- ]+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])def retrieve(self, request, slug, project_id, pk):page = (Page.objects.filter(@@ -489,6 +487,7 @@ class PagesDescriptionViewSet(BaseViewSet):)return response+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])def partial_update(self, request, slug, project_id, pk):page = (Page.objects.filter(diff --git a/apiserver/plane/app/views/project/base.py b/apiserver/plane/app/views/project/base.pyindex 22181dacff..2aec4b3bba 100644--- a/apiserver/plane/app/views/project/base.py+++ b/apiserver/plane/app/views/project/base.py@@ -31,8 +31,9 @@ from plane.app.serializers import ()from plane.app.permissions import (- ProjectBasePermission,ProjectMemberPermission,+ allow_permission,+ ROLE,)from plane.db.models import (UserFavorite,@@ -47,6 +48,7 @@ from plane.db.models import (ProjectMember,State,Workspace,+ WorkspaceMember,)from plane.utils.cache import cache_responsefrom plane.bgtasks.webhook_task import model_activity@@ -57,10 +59,6 @@ class ProjectViewSet(BaseViewSet):model = Projectwebhook_event = "project"- permission_classes = [- ProjectBasePermission,- ]-def get_queryset(self):sort_order = ProjectMember.objects.filter(member=self.request.user,@@ -155,6 +153,10 @@ class ProjectViewSet(BaseViewSet):.distinct())+ @allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],+ level="WORKSPACE",+ )def list(self, request, slug):fields = [field@@ -173,11 +175,27 @@ class ProjectViewSet(BaseViewSet):projects, many=True).data,)++ if WorkspaceMember.objects.filter(+ member=request.user,+ workspace__slug=slug,+ is_active=True,+ role__in=[5, 10],+ ).exists():+ projects = projects.filter(+ project_projectmember__member=self.request.user,+ project_projectmember__is_active=True,+ )+projects = ProjectListSerializer(projects, many=True, fields=fields if fields else None).datareturn Response(projects, status=status.HTTP_200_OK)+ @allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],+ level="WORKSPACE",+ )def retrieve(self, request, slug, pk):project = (self.get_queryset()@@ -249,6 +267,7 @@ class ProjectViewSet(BaseViewSet):serializer = ProjectListSerializer(project)return Response(serializer.data, status=status.HTTP_200_OK)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")def create(self, request, slug):try:workspace = Workspace.objects.get(slug=slug)@@ -378,6 +397,7 @@ class ProjectViewSet(BaseViewSet):status=status.HTTP_410_GONE,)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")def partial_update(self, request, slug, pk=None):try:workspace = Workspace.objects.get(slug=slug)@@ -459,10 +479,7 @@ class ProjectViewSet(BaseViewSet):class ProjectArchiveUnarchiveEndpoint(BaseAPIView):- permission_classes = [- ProjectBasePermission,- ]-+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def post(self, request, slug, project_id):project = Project.objects.get(pk=project_id, workspace__slug=slug)project.archived_at = timezone.now()@@ -472,6 +489,7 @@ class ProjectArchiveUnarchiveEndpoint(BaseAPIView):status=status.HTTP_200_OK,)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def delete(self, request, slug, project_id):project = Project.objects.get(pk=project_id, workspace__slug=slug)project.archived_at = None@@ -480,10 +498,7 @@ class ProjectArchiveUnarchiveEndpoint(BaseAPIView):class ProjectIdentifierEndpoint(BaseAPIView):- permission_classes = [- ProjectBasePermission,- ]-+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")def get(self, request, slug):name = request.GET.get("name", "").strip().upper()@@ -502,6 +517,7 @@ class ProjectIdentifierEndpoint(BaseAPIView):status=status.HTTP_200_OK,)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")def delete(self, request, slug):name = request.data.get("name", "").strip().upper()diff --git a/apiserver/plane/app/views/project/member.py b/apiserver/plane/app/views/project/member.pyindex 8c6852480b..460e35e2ec 100644--- a/apiserver/plane/app/views/project/member.py+++ b/apiserver/plane/app/views/project/member.py@@ -23,17 +23,16 @@ from plane.db.models import (Workspace,TeamMember,IssueUserProperty,+ WorkspaceMember,)from plane.bgtasks.project_add_user_email_task import project_add_user_emailfrom plane.utils.host import base_host+from plane.app.permissions.base import allow_permission, ROLEclass ProjectMemberViewSet(BaseViewSet):serializer_class = ProjectMemberAdminSerializermodel = ProjectMember- permission_classes = [- ProjectMemberPermission,- ]def get_permissions(self):if self.action == "leave":@@ -65,6 +64,7 @@ class ProjectMemberViewSet(BaseViewSet):.select_related("workspace", "workspace__owner"))+ @allow_permission([ROLE.ADMIN])def create(self, request, slug, project_id):# Get the list of members to be added to the project and their roles i.e. the user_id and the rolemembers = request.data.get("members", [])@@ -88,6 +88,23 @@ class ProjectMemberViewSet(BaseViewSet):member.get("member_id"): member.get("role") for member in members}+ # check the workspace role of the new user+ for member in member_roles:+ workspace_member_role = WorkspaceMember.objects.get(+ workspace__slug=slug,+ member=member,+ is_active=True,+ ).role+ if workspace_member_role in [5, 10] and member_roles.get(+ member+ ) in [15, 20]:+ return Response(+ {+ "error": "You cannot add a user with role higher than the workspace role"+ },+ status=status.HTTP_400_BAD_REQUEST,+ )+# Update roles in the members array based on the member_roles dictionary and set is_active to Truefor project_member in ProjectMember.objects.filter(project_id=project_id,@@ -172,6 +189,7 @@ class ProjectMemberViewSet(BaseViewSet):# Return the serialized datareturn Response(serializer.data, status=status.HTTP_201_CREATED)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])def list(self, request, slug, project_id):# Get the list of project members for the projectproject_members = ProjectMember.objects.filter(@@ -186,6 +204,7 @@ class ProjectMemberViewSet(BaseViewSet):)return Response(serializer.data, status=status.HTTP_200_OK)+ @allow_permission([ROLE.ADMIN])def partial_update(self, request, slug, project_id, pk):project_member = ProjectMember.objects.get(pk=pk,@@ -205,6 +224,22 @@ class ProjectMemberViewSet(BaseViewSet):member=request.user,is_active=True,)++ workspace_role = WorkspaceMember.objects.get(+ workspace__slug=slug,+ member=project_member.member,+ is_active=True,+ ).role+ if workspace_role in [5, 10] and int(+ request.data.get("role", project_member.role)+ ) in [15, 20]:+ return Response(+ {+ "error": "You cannot add a user with role higher than the workspace role"+ },+ status=status.HTTP_400_BAD_REQUEST,+ )+if ("role" in request.dataand int(request.data.get("role", project_member.role))@@ -226,6 +261,7 @@ class ProjectMemberViewSet(BaseViewSet):return Response(serializer.data, status=status.HTTP_200_OK)return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER])def destroy(self, request, slug, project_id, pk):project_member = ProjectMember.objects.get(workspace__slug=slug,@@ -262,6 +298,7 @@ class ProjectMemberViewSet(BaseViewSet):project_member.save()return Response(status=status.HTTP_204_NO_CONTENT)+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])def leave(self, request, slug, project_id):project_member = ProjectMember.objects.get(workspace__slug=slug,diff --git a/apiserver/plane/app/views/search/issue.py b/apiserver/plane/app/views/search/issue.pyindex 6c0535af23..3bb6541821 100644--- a/apiserver/plane/app/views/search/issue.py+++ b/apiserver/plane/app/views/search/issue.py@@ -9,9 +9,7 @@ from rest_framework.response import Response# Module importsfrom .base import BaseAPIView-from plane.db.models import (- Issue,-)+from plane.db.models import Issue, ProjectMemberfrom plane.utils.issue_search import search_issues@@ -75,6 +73,16 @@ class IssueSearchEndpoint(BaseAPIView):if target_date == "none":issues = issues.filter(target_date__isnull=True)++ if ProjectMember.objects.filter(+ project_id=project_id,+ member=self.request.user,+ is_active=True,+ role=5+ ).exists():+ issues = issues.filter(+ created_by=self.request.user+ )return Response(issues.values(diff --git a/apiserver/plane/app/views/view/base.py b/apiserver/plane/app/views/view/base.pyindex 7a91309513..96b4242a9c 100644--- a/apiserver/plane/app/views/view/base.py+++ b/apiserver/plane/app/views/view/base.py@@ -20,8 +20,8 @@ from django.db import transactionfrom rest_framework.response import Responsefrom plane.app.permissions import (- ProjectEntityPermission,- WorkspaceEntityPermission,+ allow_permission,+ ROLE,)from plane.app.serializers import (IssueViewSerializer,@@ -58,9 +58,6 @@ from plane.db.models import (class WorkspaceViewViewSet(BaseViewSet):serializer_class = IssueViewSerializermodel = IssueView- permission_classes = [- WorkspaceEntityPermission,- ]def perform_create(self, serializer):workspace = Workspace.objects.get(slug=self.kwargs.get("slug"))@@ -78,6 +75,32 @@ class WorkspaceViewViewSet(BaseViewSet):.distinct())+ @allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],+ level="WORKSPACE",+ )+ def list(self, request, slug):+ queryset = self.get_queryset()+ fields = [+ field+ for field in request.GET.get("fields", "").split(",")+ if field+ ]+ if WorkspaceMember.objects.filter(+ workspace__slug=slug,+ member=request.user,+ role=5,+ is_active=True,+ ).exists():+ queryset = queryset.filter(owned_by=request.user)+ views = IssueViewSerializer(+ queryset, many=True, fields=fields if fields else None+ ).data+ return Response(views, status=status.HTTP_200_OK)++ @allow_permission(+ allowed_roles=[], level="WORKSPACE", creator=True, model=IssueView+ )def partial_update(self, request, slug, pk):with transaction.atomic():workspace_view = IssueView.objects.select_for_update().get(@@ -111,6 +134,12 @@ class WorkspaceViewViewSet(BaseViewSet):serializer.errors, status=status.HTTP_400_BAD_REQUEST)+ @allow_permission(+ allowed_roles=[ROLE.ADMIN],+ level="WORKSPACE",+ creator=True,+ model=IssueView,+ )def destroy(self, request, slug, pk):workspace_view = IssueView.objects.get(pk=pk,@@ -157,10 +186,6 @@ class WorkspaceViewViewSet(BaseViewSet):class WorkspaceViewIssuesViewSet(BaseViewSet):- permission_classes = [- WorkspaceEntityPermission,- ]-def get_queryset(self):return (Issue.issue_objects.annotate(@@ -232,6 +257,10 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):)@method_decorator(gzip_page)+ @allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],+ level="WORKSPACE",+ )def list(self, request, slug):filters = issue_filters(request.query_params, "GET")order_by_param = request.GET.get("order_by", "-created_at")@@ -242,6 +271,16 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):.annotate(cycle_id=F("issue_cycle__cycle_id")))+ if WorkspaceMember.objects.filter(+ workspace__slug=slug,+ member=request.user,+ role=5,+ is_active=True,+ ).exists():+ issue_queryset = issue_queryset.filter(+ created_by=request.user,+ )+# Issue querysetissue_queryset, order_by_param = order_issue_queryset(issue_queryset=issue_queryset,@@ -348,9 +387,6 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):class IssueViewViewSet(BaseViewSet):serializer_class = IssueViewSerializermodel = IssueView- permission_classes = [- ProjectEntityPermission,- ]def perform_create(self, serializer):serializer.save(@@ -384,8 +420,20 @@ class IssueViewViewSet(BaseViewSet):.distinct())+ allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST]+ )+def list(self, request, slug, project_id):queryset = self.get_queryset()+ if ProjectMember.objects.filter(+ workspace__slug=slug,+ project_id=project_id,+ member=request.user,+ role=5,+ is_active=True,+ ).exists():+ queryset = queryset.filter(owned_by=request.user)fields = [fieldfor field in request.GET.get("fields", "").split(",")@@ -396,6 +444,8 @@ class IssueViewViewSet(BaseViewSet):).datareturn Response(views, status=status.HTTP_200_OK)+ allow_permission(allowed_roles=[], creator=True, model=IssueView)+def partial_update(self, request, slug, project_id, pk):with transaction.atomic():issue_view = IssueView.objects.select_for_update().get(@@ -428,6 +478,8 @@ class IssueViewViewSet(BaseViewSet):serializer.errors, status=status.HTTP_400_BAD_REQUEST)+ allow_permission(allowed_roles=[ROLE.ADMIN], creator=True, model=IssueView)+def destroy(self, request, slug, project_id, pk):project_view = IssueView.objects.get(pk=pk,@@ -472,6 +524,8 @@ class IssueViewFavoriteViewSet(BaseViewSet):.select_related("view"))+ allow_permission([ROLE.ADMIN, ROLE.MEMBER])+def create(self, request, slug, project_id):_ = UserFavorite.objects.create(user=request.user,@@ -481,6 +535,8 @@ class IssueViewFavoriteViewSet(BaseViewSet):)return Response(status=status.HTTP_204_NO_CONTENT)+ allow_permission([ROLE.ADMIN, ROLE.MEMBER])+def destroy(self, request, slug, project_id, view_id):view_favorite = UserFavorite.objects.get(project=project_id,diff --git a/apiserver/plane/app/views/webhook/base.py b/apiserver/plane/app/views/webhook/base.pyindex 9586722a0c..5581b6aa30 100644--- a/apiserver/plane/app/views/webhook/base.py+++ b/apiserver/plane/app/views/webhook/base.py@@ -9,15 +9,13 @@ from rest_framework.response import Responsefrom plane.db.models import Webhook, WebhookLog, Workspacefrom plane.db.models.webhook import generate_tokenfrom ..base import BaseAPIView-from plane.app.permissions import WorkspaceOwnerPermission+from plane.app.permissions import allow_permission, ROLEfrom plane.app.serializers import WebhookSerializer, WebhookLogSerializerclass WebhookEndpoint(BaseAPIView):- permission_classes = [- WorkspaceOwnerPermission,- ]+ @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")def post(self, request, slug):workspace = Workspace.objects.get(slug=slug)try:@@ -40,6 +38,7 @@ class WebhookEndpoint(BaseAPIView):)raise IntegrityError+ @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")def get(self, request, slug, pk=None):if pk is None:webhooks = Webhook.objects.filter(workspace__slug=slug)@@ -79,6 +78,7 @@ class WebhookEndpoint(BaseAPIView):)return Response(serializer.data, status=status.HTTP_200_OK)+ @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")def patch(self, request, slug, pk):webhook = Webhook.objects.get(workspace__slug=slug, pk=pk)serializer = WebhookSerializer(@@ -104,6 +104,7 @@ class WebhookEndpoint(BaseAPIView):return Response(serializer.data, status=status.HTTP_200_OK)return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)+ @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")def delete(self, request, slug, pk):webhook = Webhook.objects.get(pk=pk, workspace__slug=slug)webhook.delete()@@ -111,10 +112,8 @@ class WebhookEndpoint(BaseAPIView):class WebhookSecretRegenerateEndpoint(BaseAPIView):- permission_classes = [- WorkspaceOwnerPermission,- ]+ @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")def post(self, request, slug, pk):webhook = Webhook.objects.get(workspace__slug=slug, pk=pk)webhook.secret_key = generate_token()@@ -124,10 +123,8 @@ class WebhookSecretRegenerateEndpoint(BaseAPIView):class WebhookLogsEndpoint(BaseAPIView):- permission_classes = [- WorkspaceOwnerPermission,- ]+ @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")def get(self, request, slug, webhook_id):webhook_logs = WebhookLog.objects.filter(workspace__slug=slug, webhook_id=webhook_iddiff --git a/apiserver/plane/app/views/workspace/favorite.py b/apiserver/plane/app/views/workspace/favorite.pyindex d4fe6a622f..204dbfc3c2 100644--- a/apiserver/plane/app/views/workspace/favorite.py+++ b/apiserver/plane/app/views/workspace/favorite.py@@ -9,14 +9,14 @@ from django.db.models import Qfrom plane.app.views.base import BaseAPIViewfrom plane.db.models import UserFavorite, Workspacefrom plane.app.serializers import UserFavoriteSerializer-from plane.app.permissions import WorkspaceEntityPermission+from plane.app.permissions import allow_permission, ROLEclass WorkspaceFavoriteEndpoint(BaseAPIView):- permission_classes = [- WorkspaceEntityPermission,- ]+ @allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"+ )def get(self, request, slug):# the second filter is to check if the user is a member of the projectfavorites = UserFavorite.objects.filter(@@ -34,6 +34,9 @@ class WorkspaceFavoriteEndpoint(BaseAPIView):serializer = UserFavoriteSerializer(favorites, many=True)return Response(serializer.data, status=status.HTTP_200_OK)+ @allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"+ )def post(self, request, slug):workspace = Workspace.objects.get(slug=slug)serializer = UserFavoriteSerializer(data=request.data)@@ -46,6 +49,9 @@ class WorkspaceFavoriteEndpoint(BaseAPIView):return Response(serializer.data, status=status.HTTP_200_OK)return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)+ @allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"+ )def patch(self, request, slug, favorite_id):favorite = UserFavorite.objects.get(user=request.user, workspace__slug=slug, pk=favorite_id@@ -58,6 +64,9 @@ class WorkspaceFavoriteEndpoint(BaseAPIView):return Response(serializer.data, status=status.HTTP_200_OK)return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)+ @allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"+ )def delete(self, request, slug, favorite_id):favorite = UserFavorite.objects.get(user=request.user, workspace__slug=slug, pk=favorite_id@@ -67,10 +76,10 @@ class WorkspaceFavoriteEndpoint(BaseAPIView):class WorkspaceFavoriteGroupEndpoint(BaseAPIView):- permission_classes = [- WorkspaceEntityPermission,- ]+ @allow_permission(+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"+ )def get(self, request, slug, favorite_id):favorites = UserFavorite.objects.filter(user=request.user,diff --git a/apiserver/plane/app/views/workspace/label.py b/apiserver/plane/app/views/workspace/label.pyindex 328f3f8c13..0ea9ea24ab 100644--- a/apiserver/plane/app/views/workspace/label.py+++ b/apiserver/plane/app/views/workspace/label.py@@ -13,7 +13,7 @@ class WorkspaceLabelsEndpoint(BaseAPIView):permission_classes = [WorkspaceViewerPermission,]-+@cache_response(60 * 60 * 2)def get(self, request, slug):labels = Label.objects.filter(diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(list)/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(list)/page.tsxindex b3ac8980f8..4171e1f332 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(list)/page.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(list)/page.tsx@@ -6,7 +6,10 @@ import { useParams, useSearchParams } from "next/navigation";import { TPageNavigationTabs } from "@plane/types";// componentsimport { PageHead } from "@/components/core";+import { EmptyState } from "@/components/empty-state";import { PagesListRoot, PagesListView } from "@/components/pages";+// constants+import { EmptyStateType } from "@/constants/empty-state";// hooksimport { useProject } from "@/hooks/store";@@ -16,7 +19,7 @@ const ProjectPagesPage = observer(() => {const type = searchParams.get("type");const { workspaceSlug, projectId } = useParams();// store hooks- const { getProjectById } = useProject();+ const { getProjectById, currentProjectDetails } = useProject();// derived valuesconst project = projectId ? getProjectById(projectId.toString()) : undefined;const pageTitle = project?.name ? `${project?.name} - Pages` : undefined;@@ -29,6 +32,17 @@ const ProjectPagesPage = observer(() => {};if (!workspaceSlug || !projectId) return <></>;++ // No access to cycle+ if (currentProjectDetails?.page_view === false)+ return (+ <div className="flex items-center justify-center h-full w-full">+ <EmptyState+ type={EmptyStateType.DISABLED_PROJECT_PAGE}+ primaryButtonLink={`/${workspaceSlug}/projects/${projectId}/settings/features`}+ />+ </div>+ );return (<><PageHead title={pageTitle} />diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/automations/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/automations/page.tsxindex 1676b25aa1..bcf6258dd5 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/automations/page.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/automations/page.tsx@@ -7,10 +7,9 @@ import { IProject } from "@plane/types";// uiimport { TOAST_TYPE, setToast } from "@plane/ui";// components+import { NotAuthorizedView } from "@/components/auth-screens";import { AutoArchiveAutomation, AutoCloseAutomation } from "@/components/automation";import { PageHead } from "@/components/core";-// constants-import { EUserProjectRoles } from "@/constants/project";// hooksimport { useProject, useUser } from "@/hooks/store";@@ -19,6 +18,7 @@ const AutomationSettingsPage = observer(() => {const { workspaceSlug, projectId } = useParams();// store hooksconst {+ canPerformProjectAdminActions,membership: { currentProjectRole },} = useUser();const { currentProjectDetails: projectDetails, updateProject } = useProject();@@ -36,13 +36,16 @@ const AutomationSettingsPage = observer(() => {};// derived values- const isAdmin = currentProjectRole === EUserProjectRoles.ADMIN;const pageTitle = projectDetails?.name ? `${projectDetails?.name} - Automations` : undefined;+ if (currentProjectRole && !canPerformProjectAdminActions) {+ return <NotAuthorizedView section="settings" isProjectView />;+ }+return (<><PageHead title={pageTitle} />- <section className={`w-full overflow-y-auto py-8 pr-9 ${isAdmin ? "" : "opacity-60"}`}>+ <section className={`w-full overflow-y-auto py-8 pr-9 ${canPerformProjectAdminActions ? "" : "opacity-60"}`}><div className="flex items-center border-b border-custom-border-100 py-3.5"><h3 className="text-xl font-medium">Automations</h3></div>diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/estimates/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/estimates/page.tsxindex f292bd6d99..84b01b86ab 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/estimates/page.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/estimates/page.tsx@@ -3,30 +3,40 @@import { observer } from "mobx-react";import { useParams } from "next/navigation";// components+import { NotAuthorizedView } from "@/components/auth-screens";import { PageHead } from "@/components/core";import { EstimateRoot } from "@/components/estimates";-// constants-import { EUserProjectRoles } from "@/constants/project";// hooksimport { useUser, useProject } from "@/hooks/store";const EstimatesSettingsPage = observer(() => {const { workspaceSlug, projectId } = useParams();const {+ canPerformProjectAdminActions,membership: { currentProjectRole },} = useUser();const { currentProjectDetails } = useProject();// derived values- const isAdmin = currentProjectRole === EUserProjectRoles.ADMIN;const pageTitle = currentProjectDetails?.name ? `${currentProjectDetails?.name} - Estimates` : undefined;if (!workspaceSlug || !projectId) return <></>;++ if (currentProjectRole && !canPerformProjectAdminActions) {+ return <NotAuthorizedView section="settings" isProjectView />;+ }+return (<><PageHead title={pageTitle} />- <div className={`w-full overflow-y-auto py-8 pr-9 ${isAdmin ? "" : "pointer-events-none opacity-60"}`}>- <EstimateRoot workspaceSlug={workspaceSlug?.toString()} projectId={projectId?.toString()} isAdmin={isAdmin} />+ <div+ className={`w-full overflow-y-auto py-8 pr-9 ${canPerformProjectAdminActions ? "" : "pointer-events-none opacity-60"}`}+ >+ <EstimateRoot+ workspaceSlug={workspaceSlug?.toString()}+ projectId={projectId?.toString()}+ isAdmin={canPerformProjectAdminActions}+ /></div></>);diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/features/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/features/page.tsxindex f09ae985b1..8aba7c88ae 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/features/page.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/features/page.tsx@@ -2,12 +2,10 @@import { observer } from "mobx-react";import { useParams } from "next/navigation";-import useSWR from "swr";// components+import { NotAuthorizedView } from "@/components/auth-screens";import { PageHead } from "@/components/core";import { ProjectFeaturesList } from "@/components/project";-// constants-import { EUserProjectRoles } from "@/constants/project";// hooksimport { useProject, useUser } from "@/hooks/store";@@ -15,28 +13,27 @@ const FeaturesSettingsPage = observer(() => {const { workspaceSlug, projectId } = useParams();// storeconst {- membership: { fetchUserProjectInfo },+ canPerformProjectAdminActions,+ membership: { currentProjectRole },} = useUser();const { currentProjectDetails } = useProject();- // fetch the project details- const { data: memberDetails } = useSWR(- workspaceSlug && projectId ? `PROJECT_MEMBERS_ME_${workspaceSlug}_${projectId}` : null,- workspaceSlug && projectId ? () => fetchUserProjectInfo(workspaceSlug.toString(), projectId.toString()) : null- );// derived values- const isAdmin = memberDetails?.role === EUserProjectRoles.ADMIN;const pageTitle = currentProjectDetails?.name ? `${currentProjectDetails?.name} - Features` : undefined;if (!workspaceSlug || !projectId) return null;+ if (currentProjectRole && !canPerformProjectAdminActions) {+ return <NotAuthorizedView section="settings" isProjectView />;+ }+return (<><PageHead title={pageTitle} />- <section className={`w-full overflow-y-auto py-8 pr-9 ${isAdmin ? "" : "opacity-60"}`}>+ <section className={`w-full overflow-y-auto py-8 pr-9 ${canPerformProjectAdminActions ? "" : "opacity-60"}`}><ProjectFeaturesListworkspaceSlug={workspaceSlug.toString()}projectId={projectId.toString()}- isAdmin={isAdmin}+ isAdmin={canPerformProjectAdminActions}/></section></>diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/header.tsxindex be9e3781a3..8cb142b751 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/header.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/header.tsx@@ -24,7 +24,7 @@ export const ProjectSettingHeader: FC = observer(() => {} = useUser();const { currentProjectDetails, loader } = useProject();- if (currentProjectRole && currentProjectRole <= EUserProjectRoles.VIEWER) return null;+ const projectMemberInfo = currentProjectRole || EUserProjectRoles.GUEST;return (<div className="relative z-10 flex h-[3.75rem] w-full flex-shrink-0 flex-row items-center justify-between gap-x-2 gap-y-4 bg-custom-sidebar-background-100 p-4">@@ -70,14 +70,17 @@ export const ProjectSettingHeader: FC = observer(() => {placement="bottom-start"closeOnSelect>- {PROJECT_SETTINGS_LINKS.map((item) => (- <CustomMenu.MenuItem- key={item.key}- onClick={() => router.push(`/${workspaceSlug}/projects/${projectId}${item.href}`)}- >- {item.label}- </CustomMenu.MenuItem>- ))}+ {PROJECT_SETTINGS_LINKS.map(+ (item) =>+ projectMemberInfo >= item.access && (+ <CustomMenu.MenuItem+ key={item.key}+ onClick={() => router.push(`/${workspaceSlug}/projects/${projectId}${item.href}`)}+ >+ {item.label}+ </CustomMenu.MenuItem>+ )+ )}</CustomMenu></div></div>diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/labels/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/labels/page.tsxindex 192d7147f7..0e88b9c5d5 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/labels/page.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/labels/page.tsx@@ -5,13 +5,19 @@ import { combine } from "@atlaskit/pragmatic-drag-and-drop/combine";import { autoScrollForElements } from "@atlaskit/pragmatic-drag-and-drop-auto-scroll/element";import { observer } from "mobx-react";// components+import { NotAuthorizedView } from "@/components/auth-screens";import { PageHead } from "@/components/core";import { ProjectSettingsLabelList } from "@/components/labels";// hooks-import { useProject } from "@/hooks/store";+import { useProject, useUser } from "@/hooks/store";const LabelsSettingsPage = observer(() => {+ // store hooksconst { currentProjectDetails } = useProject();+ const {+ canPerformProjectMemberActions,+ membership: { currentProjectRole },+ } = useUser();const pageTitle = currentProjectDetails?.name ? `${currentProjectDetails?.name} - Labels` : undefined;const scrollableContainerRef = useRef<HTMLDivElement | null>(null);@@ -29,6 +35,10 @@ const LabelsSettingsPage = observer(() => {);}, [scrollableContainerRef?.current]);+ if (currentProjectRole && !canPerformProjectMemberActions) {+ return <NotAuthorizedView section="settings" isProjectView />;+ }+return (<><PageHead title={pageTitle} />diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/layout.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/layout.tsxindex 8553d86aa5..743c14d103 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/layout.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/layout.tsx@@ -1,18 +1,8 @@"use client";import { FC, ReactNode } from "react";-import { observer } from "mobx-react";-import Link from "next/link";-import { useParams } from "next/navigation";-// ui-import { Button, LayersIcon } from "@plane/ui";// components-import { NotAuthorizedView } from "@/components/auth-screens";import { AppHeader, ContentWrapper } from "@/components/core";-// constants-import { EUserProjectRoles } from "@/constants/project";-// hooks-import { useUser } from "@/hooks/store";// local componentsimport { ProjectSettingHeader } from "./header";import { ProjectSettingsSidebar } from "./sidebar";@@ -21,33 +11,8 @@ export interface IProjectSettingLayout {children: ReactNode;}-const ProjectSettingLayout: FC<IProjectSettingLayout> = observer((props) => {+const ProjectSettingLayout: FC<IProjectSettingLayout> = (props) => {const { children } = props;- // router- const { workspaceSlug, projectId } = useParams();- // store hooks- const {- membership: { currentProjectRole },- } = useUser();-- const restrictViewSettings = currentProjectRole && currentProjectRole <= EUserProjectRoles.VIEWER;-- if (restrictViewSettings) {- return (- <NotAuthorizedView- type="project"- actionButton={- //TODO: Create a new component called Button Link to handle such scenarios- <Link href={`/${workspaceSlug}/projects/${projectId}/issues`}>- <Button variant="primary" size="md" prependIcon={<LayersIcon />}>- Go to issues- </Button>- </Link>- }- />- );- }-return (<><AppHeader header={<ProjectSettingHeader />} />@@ -63,6 +28,6 @@ const ProjectSettingLayout: FC<IProjectSettingLayout> = observer((props) => {</ContentWrapper></>);-});+};export default ProjectSettingLayout;diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/members/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/members/page.tsxindex af1c82e12a..28c65f680f 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/members/page.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/members/page.tsx@@ -2,17 +2,26 @@import { observer } from "mobx-react";// components+import { NotAuthorizedView } from "@/components/auth-screens";import { PageHead } from "@/components/core";import { ProjectMemberList, ProjectSettingsMemberDefaults } from "@/components/project";// hooks-import { useProject } from "@/hooks/store";+import { useProject, useUser } from "@/hooks/store";const MembersSettingsPage = observer(() => {// storeconst { currentProjectDetails } = useProject();+ const {+ canPerformProjectViewerActions,+ membership: { currentProjectRole },+ } = useUser();// derived valuesconst pageTitle = currentProjectDetails?.name ? `${currentProjectDetails?.name} - Members` : undefined;+ if (currentProjectRole && !canPerformProjectViewerActions) {+ return <NotAuthorizedView section="settings" isProjectView />;+ }+return (<><PageHead title={pageTitle} />diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/sidebar.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/sidebar.tsxindex 0b9a94f82e..3b60e15253 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/sidebar.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/sidebar.tsx@@ -1,6 +1,7 @@"use client";import React from "react";+import { observer } from "mobx-react";import Link from "next/link";import { useParams, usePathname } from "next/navigation";// ui@@ -12,7 +13,7 @@ import { EUserProjectRoles, PROJECT_SETTINGS_LINKS } from "@/constants/project";// hooksimport { useUser } from "@/hooks/store";-export const ProjectSettingsSidebar = () => {+export const ProjectSettingsSidebar = observer(() => {const { workspaceSlug, projectId } = useParams();const pathname = usePathname();// mobx store@@ -60,4 +61,4 @@ export const ProjectSettingsSidebar = () => {</div></div>);-};+});diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/states/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/states/page.tsxindex 4132662bf0..b03310a091 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/states/page.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/states/page.tsx@@ -3,18 +3,27 @@import { observer } from "mobx-react";import { useParams } from "next/navigation";// components+import { NotAuthorizedView } from "@/components/auth-screens";import { PageHead } from "@/components/core";import { ProjectStateRoot } from "@/components/project-states";// hook-import { useProject } from "@/hooks/store";+import { useProject, useUser } from "@/hooks/store";const StatesSettingsPage = observer(() => {const { workspaceSlug, projectId } = useParams();// storeconst { currentProjectDetails } = useProject();+ const {+ canPerformProjectMemberActions,+ membership: { currentProjectRole },+ } = useUser();// derived valuesconst pageTitle = currentProjectDetails?.name ? `${currentProjectDetails?.name} - States` : undefined;+ if (currentProjectRole && !canPerformProjectMemberActions) {+ return <NotAuthorizedView section="settings" isProjectView />;+ }+return (<><PageHead title={pageTitle} />diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/header.tsxindex 26d5fd873c..27f84d94ef 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/header.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/header.tsx@@ -12,21 +12,17 @@ import { BreadcrumbLink, Logo } from "@/components/common";import { ViewListHeader } from "@/components/views";import { ViewAppliedFiltersList } from "@/components/views/applied-filters";// constants-import { EUserProjectRoles } from "@/constants/project";import { EViewAccess } from "@/constants/views";// helpersimport { calculateTotalFilters } from "@/helpers/filter.helper";// hooks-import { useCommandPalette, useProject, useProjectView, useUser } from "@/hooks/store";+import { useCommandPalette, useProject, useProjectView } from "@/hooks/store";export const ProjectViewsHeader = observer(() => {// routerconst { workspaceSlug } = useParams();// store hooksconst { toggleCreateViewModal } = useCommandPalette();- const {- membership: { currentProjectRole },- } = useUser();const { currentProjectDetails, loader } = useProject();const { filters, updateFilters, clearAllFilters } = useProjectView();@@ -49,9 +45,6 @@ export const ProjectViewsHeader = observer(() => {const isFiltersApplied = calculateTotalFilters(filters?.filters ?? {}) !== 0;- const canUserCreateView =- currentProjectRole && [EUserProjectRoles.ADMIN, EUserProjectRoles.MEMBER].includes(currentProjectRole);-return (<><div className="relative z-10 flex h-[3.75rem] w-full flex-shrink-0 flex-row items-center justify-between gap-x-2 gap-y-4 bg-custom-sidebar-background-100 p-4">@@ -83,13 +76,11 @@ export const ProjectViewsHeader = observer(() => {</div><div className="flex flex-shrink-0 items-center gap-2"><ViewListHeader />- {canUserCreateView && (- <div>- <Button variant="primary" size="sm" onClick={() => toggleCreateViewModal(true)}>- Add view- </Button>- </div>- )}+ <div>+ <Button variant="primary" size="sm" onClick={() => toggleCreateViewModal(true)}>+ Add view+ </Button>+ </div></div></div>{isFiltersApplied && (diff --git a/web/app/[workspaceSlug]/(projects)/settings/api-tokens/page.tsx b/web/app/[workspaceSlug]/(projects)/settings/api-tokens/page.tsxindex 906fee3284..bfc583b785 100644--- a/web/app/[workspaceSlug]/(projects)/settings/api-tokens/page.tsx+++ b/web/app/[workspaceSlug]/(projects)/settings/api-tokens/page.tsx@@ -8,13 +8,13 @@ import useSWR from "swr";import { Button } from "@plane/ui";// componentimport { ApiTokenListItem, CreateApiTokenModal } from "@/components/api-token";+import { NotAuthorizedView } from "@/components/auth-screens";import { PageHead } from "@/components/core";import { EmptyState } from "@/components/empty-state";import { APITokenSettingsLoader } from "@/components/ui";// constantsimport { EmptyStateType } from "@/constants/empty-state";import { API_TOKENS_LIST } from "@/constants/fetch-keys";-import { EUserWorkspaceRoles } from "@/constants/workspace";// store hooksimport { useUser, useWorkspace } from "@/hooks/store";// services@@ -29,27 +29,22 @@ const ApiTokensPage = observer(() => {const { workspaceSlug } = useParams();// store hooksconst {+ canPerformWorkspaceAdminActions,membership: { currentWorkspaceRole },} = useUser();const { currentWorkspace } = useWorkspace();- const isAdmin = currentWorkspaceRole === EUserWorkspaceRoles.ADMIN;-- const { data: tokens } = useSWR(workspaceSlug && isAdmin ? API_TOKENS_LIST(workspaceSlug.toString()) : null, () =>- workspaceSlug && isAdmin ? apiTokenService.getApiTokens(workspaceSlug.toString()) : null+ const { data: tokens } = useSWR(+ workspaceSlug && canPerformWorkspaceAdminActions ? API_TOKENS_LIST(workspaceSlug.toString()) : null,+ () =>+ workspaceSlug && canPerformWorkspaceAdminActions ? apiTokenService.getApiTokens(workspaceSlug.toString()) : null);const pageTitle = currentWorkspace?.name ? `${currentWorkspace.name} - API Tokens` : undefined;- if (!isAdmin)- return (- <>- <PageHead title={pageTitle} />- <div className="mt-10 flex h-full w-full justify-center p-4">- <p className="text-sm text-custom-text-300">You are not authorized to access this page.</p>- </div>- </>- );+ if (currentWorkspaceRole && !canPerformWorkspaceAdminActions) {+ return <NotAuthorizedView section="settings" />;+ }if (!tokens) {return <APITokenSettingsLoader />;@@ -92,4 +87,4 @@ const ApiTokensPage = observer(() => {);});-export default ApiTokensPage;\ No newline at end of file+export default ApiTokensPage;diff --git a/web/app/[workspaceSlug]/(projects)/settings/billing/page.tsx b/web/app/[workspaceSlug]/(projects)/settings/billing/page.tsxindex 3e3c586c47..0158c3c98e 100644--- a/web/app/[workspaceSlug]/(projects)/settings/billing/page.tsx+++ b/web/app/[workspaceSlug]/(projects)/settings/billing/page.tsx@@ -2,9 +2,8 @@import { observer } from "mobx-react";// component+import { NotAuthorizedView } from "@/components/auth-screens";import { PageHead } from "@/components/core";-// constants-import { EUserWorkspaceRoles } from "@/constants/workspace";// hooksimport { useUser, useWorkspace } from "@/hooks/store";// plane web components@@ -13,22 +12,16 @@ import { BillingRoot } from "@/plane-web/components/workspace";const BillingSettingsPage = observer(() => {// store hooksconst {+ canPerformWorkspaceAdminActions,membership: { currentWorkspaceRole },} = useUser();const { currentWorkspace } = useWorkspace();// derived values- const isAdmin = currentWorkspaceRole === EUserWorkspaceRoles.ADMIN;const pageTitle = currentWorkspace?.name ? `${currentWorkspace.name} - Billing & Plans` : undefined;- if (!isAdmin)- return (- <>- <PageHead title={pageTitle} />- <div className="mt-10 flex h-full w-full justify-center p-4">- <p className="text-sm text-custom-text-300">You are not authorized to access this page.</p>- </div>- </>- );+ if (currentWorkspaceRole && !canPerformWorkspaceAdminActions) {+ return <NotAuthorizedView section="settings" />;+ }return (<>diff --git a/web/app/[workspaceSlug]/(projects)/settings/exports/page.tsx b/web/app/[workspaceSlug]/(projects)/settings/exports/page.tsxindex 59fd4d2c75..85b8cd6442 100644--- a/web/app/[workspaceSlug]/(projects)/settings/exports/page.tsx+++ b/web/app/[workspaceSlug]/(projects)/settings/exports/page.tsx@@ -2,39 +2,39 @@import { observer } from "mobx-react";// components+import { NotAuthorizedView } from "@/components/auth-screens";import { PageHead } from "@/components/core";import ExportGuide from "@/components/exporter/guide";-// constants-import { EUserWorkspaceRoles } from "@/constants/workspace";+// helpers+import { cn } from "@/helpers/common.helper";// hooksimport { useUser, useWorkspace } from "@/hooks/store";const ExportsPage = observer(() => {// store hooksconst {+ canPerformWorkspaceViewerActions,+ canPerformWorkspaceMemberActions,membership: { currentWorkspaceRole },} = useUser();const { currentWorkspace } = useWorkspace();// derived values- const hasPageAccess =- currentWorkspaceRole && [EUserWorkspaceRoles.ADMIN, EUserWorkspaceRoles.MEMBER].includes(currentWorkspaceRole);const pageTitle = currentWorkspace?.name ? `${currentWorkspace.name} - Exports` : undefined;- if (!hasPageAccess)- return (- <>- <PageHead title={pageTitle} />- <div className="mt-10 flex h-full w-full justify-center p-4">- <p className="text-sm text-custom-text-300">You are not authorized to access this page.</p>- </div>- </>- );+ // if user is not authorized to view this page+ if (currentWorkspaceRole && !canPerformWorkspaceViewerActions) {+ return <NotAuthorizedView section="settings" />;+ }return (<><PageHead title={pageTitle} />- <div className="w-full overflow-y-auto md:pr-9 pr-4">+ <div+ className={cn("w-full overflow-y-auto md:pr-9 pr-4", {+ "opacity-60": !canPerformWorkspaceMemberActions,+ })}+ ><div className="flex items-center border-b border-custom-border-100 py-3.5"><h3 className="text-xl font-medium">Exports</h3></div>@@ -44,4 +44,4 @@ const ExportsPage = observer(() => {);});-export default ExportsPage;\ No newline at end of file+export default ExportsPage;diff --git a/web/app/[workspaceSlug]/(projects)/settings/members/page.tsx b/web/app/[workspaceSlug]/(projects)/settings/members/page.tsxindex 52b2256398..0d48bef73f 100644--- a/web/app/[workspaceSlug]/(projects)/settings/members/page.tsx+++ b/web/app/[workspaceSlug]/(projects)/settings/members/page.tsx@@ -9,12 +9,13 @@ import { IWorkspaceBulkInviteFormData } from "@plane/types";// uiimport { Button, TOAST_TYPE, setToast } from "@plane/ui";// components+import { NotAuthorizedView } from "@/components/auth-screens";import { PageHead } from "@/components/core";import { SendWorkspaceInvitationModal, WorkspaceMembersList } from "@/components/workspace";// constantsimport { MEMBER_INVITED } from "@/constants/event-tracker";-import { EUserWorkspaceRoles } from "@/constants/workspace";// helpers+import { cn } from "@/helpers/common.helper";import { getUserRole } from "@/helpers/user.helper";// hooksimport { useEventTracker, useMember, useUser, useWorkspace } from "@/hooks/store";@@ -28,6 +29,9 @@ const WorkspaceMembersSettingsPage = observer(() => {// store hooksconst { captureEvent } = useEventTracker();const {+ canPerformWorkspaceAdminActions,+ canPerformWorkspaceViewerActions,+ canPerformWorkspaceMemberActions,membership: { currentWorkspaceRole },} = useUser();const {@@ -79,9 +83,13 @@ const WorkspaceMembersSettingsPage = observer(() => {};// derived values- const isAdmin = currentWorkspaceRole && [EUserWorkspaceRoles.ADMIN].includes(currentWorkspaceRole);const pageTitle = currentWorkspace?.name ? `${currentWorkspace.name} - Members` : undefined;+ // if user is not authorized to view this page+ if (currentWorkspaceRole && !canPerformWorkspaceViewerActions) {+ return <NotAuthorizedView section="settings" />;+ }+return (<><PageHead title={pageTitle} />@@ -90,7 +98,11 @@ const WorkspaceMembersSettingsPage = observer(() => {onClose={() => setInviteModal(false)}onSubmit={handleWorkspaceInvite}/>- <section className="w-full overflow-y-auto md:pr-9 pr-4">+ <section+ className={cn("w-full overflow-y-auto md:pr-9 pr-4", {+ "opacity-60": !canPerformWorkspaceMemberActions,+ })}+ ><div className="flex items-center justify-between gap-4 py-3.5"><h4 className="text-xl font-medium">Members</h4><div className="ml-auto flex items-center gap-1.5 rounded-md border border-custom-border-200 bg-custom-background-100 px-2.5 py-1.5">@@ -103,13 +115,13 @@ const WorkspaceMembersSettingsPage = observer(() => {onChange={(e) => setSearchQuery(e.target.value)}/></div>- {isAdmin && (+ {canPerformWorkspaceAdminActions && (<Button variant="primary" size="sm" onClick={() => setInviteModal(true)}>Add member</Button>)}</div>- <WorkspaceMembersList searchQuery={searchQuery} isAdmin={isAdmin ?? false} />+ <WorkspaceMembersList searchQuery={searchQuery} isAdmin={canPerformWorkspaceAdminActions} /></section></>);diff --git a/web/app/[workspaceSlug]/(projects)/settings/webhooks/page.tsx b/web/app/[workspaceSlug]/(projects)/settings/webhooks/page.tsxindex 695f1f16b2..a887c41440 100644--- a/web/app/[workspaceSlug]/(projects)/settings/webhooks/page.tsx+++ b/web/app/[workspaceSlug]/(projects)/settings/webhooks/page.tsx@@ -7,6 +7,7 @@ import useSWR from "swr";// uiimport { Button } from "@plane/ui";// components+import { NotAuthorizedView } from "@/components/auth-screens";import { PageHead } from "@/components/core";import { EmptyState } from "@/components/empty-state";import { WebhookSettingsLoader } from "@/components/ui";@@ -23,16 +24,15 @@ const WebhooksListPage = observer(() => {const { workspaceSlug } = useParams();// mobx storeconst {+ canPerformWorkspaceAdminActions,membership: { currentWorkspaceRole },} = useUser();const { fetchWebhooks, webhooks, clearSecretKey, webhookSecretKey, createWebhook } = useWebhook();const { currentWorkspace } = useWorkspace();- const isAdmin = currentWorkspaceRole === 20;-useSWR(- workspaceSlug && isAdmin ? `WEBHOOKS_LIST_${workspaceSlug}` : null,- workspaceSlug && isAdmin ? () => fetchWebhooks(workspaceSlug.toString()) : null+ workspaceSlug && canPerformWorkspaceAdminActions ? `WEBHOOKS_LIST_${workspaceSlug}` : null,+ workspaceSlug && canPerformWorkspaceAdminActions ? () => fetchWebhooks(workspaceSlug.toString()) : null);const pageTitle = currentWorkspace?.name ? `${currentWorkspace.name} - Webhooks` : undefined;@@ -42,15 +42,9 @@ const WebhooksListPage = observer(() => {if (!showCreateWebhookModal && webhookSecretKey) clearSecretKey();}, [showCreateWebhookModal, webhookSecretKey, clearSecretKey]);- if (!isAdmin)- return (- <>- <PageHead title={pageTitle} />- <div className="mt-10 flex h-full w-full justify-center p-4">- <p className="text-sm text-custom-text-300">You are not authorized to access this page.</p>- </div>- </>- );+ if (currentWorkspaceRole && !canPerformWorkspaceAdminActions) {+ return <NotAuthorizedView section="settings" />;+ }if (!webhooks) return <WebhookSettingsLoader />;@@ -95,4 +89,4 @@ const WebhooksListPage = observer(() => {);});-export default WebhooksListPage;\ No newline at end of file+export default WebhooksListPage;diff --git a/web/app/[workspaceSlug]/(projects)/sidebar.tsx b/web/app/[workspaceSlug]/(projects)/sidebar.tsxindex be09caa9b4..338a8488b1 100644--- a/web/app/[workspaceSlug]/(projects)/sidebar.tsx+++ b/web/app/[workspaceSlug]/(projects)/sidebar.tsx@@ -13,7 +13,7 @@ import {import { SidebarFavoritesMenu } from "@/components/workspace/sidebar/favorites/favorites-menu";import { cn } from "@/helpers/common.helper";// hooks-import { useAppTheme } from "@/hooks/store";+import { useAppTheme, useUser } from "@/hooks/store";import useOutsideClickDetector from "@/hooks/use-outside-click-detector";// plane web componentsimport useSize from "@/hooks/use-window-size";@@ -23,6 +23,7 @@ export interface IAppSidebar {}export const AppSidebar: FC<IAppSidebar> = observer(() => {// store hooks+ const { canPerformWorkspaceMemberActions } = useUser();const { toggleSidebar, sidebarCollapsed } = useAppTheme();const windowSize = useSize();// refs@@ -85,7 +86,7 @@ export const AppSidebar: FC<IAppSidebar> = observer(() => {"opacity-0": !sidebarCollapsed,})}/>- <SidebarFavoritesMenu />+ {canPerformWorkspaceMemberActions && <SidebarFavoritesMenu />}<SidebarProjectsList /></div>diff --git a/web/app/[workspaceSlug]/(projects)/workspace-views/header.tsx b/web/app/[workspaceSlug]/(projects)/workspace-views/header.tsxindex 686e4f7b60..82e11b2083 100644--- a/web/app/[workspaceSlug]/(projects)/workspace-views/header.tsx+++ b/web/app/[workspaceSlug]/(projects)/workspace-views/header.tsx@@ -14,11 +14,10 @@ import { DisplayFiltersSelection, FiltersDropdown, FilterSelection } from "@/comimport { CreateUpdateWorkspaceViewModal } from "@/components/workspace";// constantsimport { EIssueFilterType, EIssuesStoreType, ISSUE_DISPLAY_FILTERS_BY_LAYOUT } from "@/constants/issue";-import { EUserWorkspaceRoles } from "@/constants/workspace";// helpersimport { isIssueFilterActive } from "@/helpers/filter.helper";// hooks-import { useLabel, useMember, useUser, useIssues, useGlobalView } from "@/hooks/store";+import { useLabel, useMember, useIssues, useGlobalView } from "@/hooks/store";export const GlobalIssuesHeader = observer(() => {// states@@ -30,9 +29,6 @@ export const GlobalIssuesHeader = observer(() => {issuesFilter: { filters, updateFilters },} = useIssues(EIssuesStoreType.GLOBAL);const { getViewDetailsById } = useGlobalView();- const {- membership: { currentWorkspaceRole },- } = useUser();const { workspaceLabels } = useLabel();const {workspace: { workspaceMemberIds },@@ -97,8 +93,6 @@ export const GlobalIssuesHeader = observer(() => {[workspaceSlug, updateFilters, globalViewId]);- const isAuthorizedUser = !!currentWorkspaceRole && currentWorkspaceRole >= EUserWorkspaceRoles.MEMBER;-const isLocked = viewDetails?.is_locked;return (@@ -142,11 +136,10 @@ export const GlobalIssuesHeader = observer(() => {</FiltersDropdown></>)}- {isAuthorizedUser && (- <Button variant="primary" size="sm" onClick={() => setCreateViewModal(true)}>- Add view- </Button>- )}++ <Button variant="primary" size="sm" onClick={() => setCreateViewModal(true)}>+ Add view+ </Button></div></div></>diff --git a/web/ce/constants/workspace.ts b/web/ce/constants/workspace.tsindex b89ced416d..109a7a4d14 100644--- a/web/ce/constants/workspace.ts+++ b/web/ce/constants/workspace.ts@@ -17,7 +17,7 @@ export const WORKSPACE_SETTINGS = {key: "members",label: "Members",href: `/settings/members`,- access: EUserWorkspaceRoles.GUEST,+ access: EUserWorkspaceRoles.VIEWER,highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/settings/members/`,Icon: SettingIcon,},@@ -33,7 +33,7 @@ export const WORKSPACE_SETTINGS = {key: "export",label: "Exports",href: `/settings/exports`,- access: EUserWorkspaceRoles.MEMBER,+ access: EUserWorkspaceRoles.VIEWER,highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/settings/exports/`,Icon: SettingIcon,},diff --git a/web/core/components/auth-screens/not-authorized-view.tsx b/web/core/components/auth-screens/not-authorized-view.tsxindex f8f101dd30..fe344f468f 100644--- a/web/core/components/auth-screens/not-authorized-view.tsx+++ b/web/core/components/auth-screens/not-authorized-view.tsx@@ -1,62 +1,33 @@import React from "react";import { observer } from "mobx-react";import Image from "next/image";-import Link from "next/link";-import { useSearchParams } from "next/navigation";-// hooks-import { useUser } from "@/hooks/store";// layoutsimport DefaultLayout from "@/layouts/default-layout";// imagesimport ProjectNotAuthorizedImg from "@/public/auth/project-not-authorized.svg";+import Unauthorized from "@/public/auth/unauthorized.svg";import WorkspaceNotAuthorizedImg from "@/public/auth/workspace-not-authorized.svg";type Props = {actionButton?: React.ReactNode;- type: "project" | "workspace";+ section?: "settings" | "general";+ isProjectView?: boolean;};export const NotAuthorizedView: React.FC<Props> = observer((props) => {- const { actionButton, type } = props;- // router- const searchParams = useSearchParams();- const next_path = searchParams.get("next_path");- // hooks- const { data: currentUser } = useUser();+ const { actionButton, section = "general", isProjectView = false } = props;++ // assets+ const settingAsset = isProjectView ? ProjectNotAuthorizedImg : WorkspaceNotAuthorizedImg;+ const asset = section === "settings" ? settingAsset : Unauthorized;return (<DefaultLayout><div className="flex h-full w-full flex-col items-center justify-center gap-y-5 bg-custom-background-100 text-center"><div className="h-44 w-72">- <Image- src={type === "project" ? ProjectNotAuthorizedImg : WorkspaceNotAuthorizedImg}- height="176"- width="288"- alt="ProjectSettingImg"- />+ <Image src={asset} height="176" width="288" alt="ProjectSettingImg" /></div><h1 className="text-xl font-medium text-custom-text-100">Oops! You are not authorized to view this page</h1>-- <div className="w-full max-w-md text-base text-custom-text-200">- {currentUser ? (- <p>- You have signed in as {currentUser.email}. <br />- <Link href={`/?next_path=${next_path}`}>- <span className="font-medium text-custom-text-100">Sign in</span>- </Link>{" "}- with different account that has access to this page.- </p>- ) : (- <p>- You need to{" "}- <Link href={`/?next_path=${next_path}`}>- <span className="font-medium text-custom-text-100">Sign in</span>- </Link>{" "}- with an account that has access to this page.- </p>- )}- </div>-{actionButton}</div></DefaultLayout>diff --git a/web/core/components/command-palette/command-palette.tsx b/web/core/components/command-palette/command-palette.tsxindex 7427fabee8..62f0491450 100644--- a/web/core/components/command-palette/command-palette.tsx+++ b/web/core/components/command-palette/command-palette.tsx@@ -43,8 +43,8 @@ export const CommandPalette: FC = observer(() => {const { platform } = usePlatformOS();const {data: currentUser,- canPerformProjectCreateActions,- canPerformWorkspaceCreateActions,+ canPerformProjectMemberActions,+ canPerformWorkspaceMemberActions,canPerformAnyCreateAction,canPerformProjectAdminActions,} = useUser();@@ -103,15 +103,15 @@ export const CommandPalette: FC = observer(() => {// authconst performProjectCreateActions = useCallback((showToast: boolean = true) => {- if (!canPerformProjectCreateActions && showToast)+ if (!canPerformProjectMemberActions && showToast)setToast({type: TOAST_TYPE.ERROR,title: "You don't have permission to perform this action.",});- return canPerformProjectCreateActions;+ return canPerformProjectMemberActions;},- [canPerformProjectCreateActions]+ [canPerformProjectMemberActions]);const performProjectBulkDeleteActions = useCallback(@@ -129,14 +129,14 @@ export const CommandPalette: FC = observer(() => {const performWorkspaceCreateActions = useCallback((showToast: boolean = true) => {- if (!canPerformWorkspaceCreateActions && showToast)+ if (!canPerformWorkspaceMemberActions && showToast)setToast({type: TOAST_TYPE.ERROR,title: "You don't have permission to perform this action.",});- return canPerformWorkspaceCreateActions;+ return canPerformWorkspaceMemberActions;},- [canPerformWorkspaceCreateActions]+ [canPerformWorkspaceMemberActions]);const performAnyProjectCreateActions = useCallback(diff --git a/web/core/components/pages/list/block-item-action.tsx b/web/core/components/pages/list/block-item-action.tsxindex 83f5e3941c..a5b3b5866c 100644--- a/web/core/components/pages/list/block-item-action.tsx+++ b/web/core/components/pages/list/block-item-action.tsx@@ -7,10 +7,12 @@ import { Earth, Info, Lock, Minus } from "lucide-react";import { Avatar, FavoriteStar, TOAST_TYPE, Tooltip, setToast } from "@plane/ui";// componentsimport { PageQuickActions } from "@/components/pages/dropdowns";+// constants+import { EUserProjectRoles } from "@/constants/project";// helpersimport { renderFormattedDate } from "@/helpers/date-time.helper";// hooks-import { useMember, usePage } from "@/hooks/store";+import { useMember, usePage, useProject } from "@/hooks/store";type Props = {workspaceSlug: string;@@ -25,10 +27,15 @@ export const BlockItemAction: FC<Props> = observer((props) => {// store hooksconst page = usePage(pageId);const { getUserDetails } = useMember();+ const { getProjectById } = useProject();+// derived valuesconst { access, created_at, is_favorite, owned_by, addToFavorites, removePageFromFavorites } = page;// derived values+ const project = getProjectById(projectId);+ const isViewerOrGuest =+ project?.member_role && [EUserProjectRoles.VIEWER, EUserProjectRoles.GUEST].includes(project.member_role);const ownerDetails = owned_by ? getUserDetails(owned_by) : undefined;// handlers@@ -74,14 +81,16 @@ export const BlockItemAction: FC<Props> = observer((props) => {</Tooltip>{/* favorite/unfavorite */}- <FavoriteStar- onClick={(e) => {- e.preventDefault();- e.stopPropagation();- handleFavorites();- }}- selected={is_favorite}- />+ {!isViewerOrGuest && (+ <FavoriteStar+ onClick={(e) => {+ e.preventDefault();+ e.stopPropagation();+ handleFavorites();+ }}+ selected={is_favorite}+ />+ )}{/* quick actions dropdown */}<PageQuickActionsdiff --git a/web/core/components/project/send-project-invitation-modal.tsx b/web/core/components/project/send-project-invitation-modal.tsxindex c0281e840d..759137c8d8 100644--- a/web/core/components/project/send-project-invitation-modal.tsx+++ b/web/core/components/project/send-project-invitation-modal.tsx@@ -12,7 +12,7 @@ import { Avatar, Button, CustomSelect, CustomSearchSelect, TOAST_TYPE, setToast// helpersimport { PROJECT_MEMBER_ADDED } from "@/constants/event-tracker";import { EUserProjectRoles } from "@/constants/project";-import { ROLE } from "@/constants/workspace";+import { EUserWorkspaceRoles, ROLE } from "@/constants/workspace";import { useEventTracker, useMember, useUser } from "@/hooks/store";// constants@@ -56,6 +56,8 @@ export const SendProjectInvitationModal: React.FC<Props> = observer((props) => {// form infoconst {formState: { errors, isSubmitting },+ watch,+ setValue,reset,handleSubmit,control,@@ -167,6 +169,19 @@ export const SendProjectInvitationModal: React.FC<Props> = observer((props) => {}[]| undefined;+ const checkCurrentOptionWorkspaceRole = (value: string) => {+ const currentMemberWorkspaceRole = getWorkspaceMemberDetails(value)?.role;+ if (!value || !currentMemberWorkspaceRole) return ROLE;++ const isGuestOrViewer = [EUserWorkspaceRoles.GUEST, EUserWorkspaceRoles.VIEWER].includes(+ currentMemberWorkspaceRole+ );++ return Object.fromEntries(+ Object.entries(ROLE).filter(([key]) => !isGuestOrViewer || [5, 10].includes(parseInt(key)))+ );+ };+return (<Transition.Root show={isOpen} as={React.Fragment}><Dialog as="div" className="relative z-20" onClose={handleClose}>@@ -237,6 +252,14 @@ export const SendProjectInvitationModal: React.FC<Props> = observer((props) => {}onChange={(val: string) => {onChange(val);+ // Update the role to the workspace role when member ID changes+ const workspaceMemberDetails = getWorkspaceMemberDetails(val);+ const workspaceRole = workspaceMemberDetails?.role ?? 5;+ const newValue = ROLE[workspaceRole].toUpperCase();+ setValue(+ `members.${index}.role`,+ EUserProjectRoles[newValue as keyof typeof EUserProjectRoles]+ );}}options={options}optionsClassName="w-full"@@ -271,7 +294,9 @@ export const SendProjectInvitationModal: React.FC<Props> = observer((props) => {inputoptionsClassName="w-full">- {Object.entries(ROLE).map(([key, label]) => {+ {Object.entries(+ checkCurrentOptionWorkspaceRole(watch(`members.${index}.member_id`))+ ).map(([key, label]) => {if (parseInt(key) > (currentProjectRole ?? EUserProjectRoles.GUEST)) return null;return (diff --git a/web/core/components/project/settings/member-columns.tsx b/web/core/components/project/settings/member-columns.tsxindex 0c4184e0ea..51f510d306 100644--- a/web/core/components/project/settings/member-columns.tsx+++ b/web/core/components/project/settings/member-columns.tsx@@ -91,6 +91,7 @@ export const AccountTypeColumn: React.FC<AccountTypeProps> = observer((props) =>// store hooksconst {project: { updateMember },+ workspace: { getWorkspaceMemberDetails },} = useMember();const { data: currentUser } = useUser();@@ -99,6 +100,19 @@ export const AccountTypeColumn: React.FC<AccountTypeProps> = observer((props) =>const isAdminRole = currentProjectRole === EUserProjectRoles.ADMIN;const isRoleNonEditable = isCurrentUser || !isAdminRole;+ const checkCurrentOptionWorkspaceRole = (value: string) => {+ const currentMemberWorkspaceRole = getWorkspaceMemberDetails(value)?.role;+ if (!value || !currentMemberWorkspaceRole) return ROLE;++ const isGuestOrViewer = [EUserWorkspaceRoles.GUEST, EUserWorkspaceRoles.VIEWER].includes(+ currentMemberWorkspaceRole+ );++ return Object.fromEntries(+ Object.entries(ROLE).filter(([key]) => !isGuestOrViewer || [5, 10].includes(parseInt(key)))+ );+ };+return (<>{isRoleNonEditable ? (@@ -140,11 +154,14 @@ export const AccountTypeColumn: React.FC<AccountTypeProps> = observer((props) =>optionsClassName="w-full"input>- {Object.keys(ROLE).map((item) => (- <CustomSelect.Option key={item} value={item as unknown as EUserProjectRoles}>- {ROLE[item as unknown as keyof typeof ROLE]}- </CustomSelect.Option>- ))}+ {Object.entries(checkCurrentOptionWorkspaceRole(rowData.member.id)).map(([key, label]) => {+ if (parseInt(key) > (currentProjectRole ?? EUserProjectRoles.GUEST)) return null;+ return (+ <CustomSelect.Option key={key} value={key}>+ {label}+ </CustomSelect.Option>+ );+ })}</CustomSelect>)}/>diff --git a/web/core/components/workspace/sidebar/projects-list-item.tsx b/web/core/components/workspace/sidebar/projects-list-item.tsxindex a9fdb002a2..5feada1a8f 100644--- a/web/core/components/workspace/sidebar/projects-list-item.tsx+++ b/web/core/components/workspace/sidebar/projects-list-item.tsx@@ -45,7 +45,7 @@ import { EUserProjectRoles } from "@/constants/project";// helpersimport { cn } from "@/helpers/common.helper";// hooks-import { useAppTheme, useEventTracker, useProject } from "@/hooks/store";+import { useAppTheme, useEventTracker, useProject, useUser } from "@/hooks/store";import useOutsideClickDetector from "@/hooks/use-outside-click-detector";import { usePlatformOS } from "@/hooks/use-platform-os";// constants@@ -70,31 +70,37 @@ const navigation = (workspaceSlug: string, projectId: string) => [name: "Issues",href: `/${workspaceSlug}/projects/${projectId}/issues`,Icon: LayersIcon,+ access: EUserProjectRoles.GUEST,},{name: "Cycles",href: `/${workspaceSlug}/projects/${projectId}/cycles`,Icon: ContrastIcon,+ access: EUserProjectRoles.VIEWER,},{name: "Modules",href: `/${workspaceSlug}/projects/${projectId}/modules`,Icon: DiceIcon,+ access: EUserProjectRoles.VIEWER,},{name: "Views",href: `/${workspaceSlug}/projects/${projectId}/views`,Icon: Layers,+ access: EUserProjectRoles.GUEST,},{name: "Pages",href: `/${workspaceSlug}/projects/${projectId}/pages`,Icon: FileText,+ access: EUserProjectRoles.VIEWER,},{name: "Intake",href: `/${workspaceSlug}/projects/${projectId}/inbox`,Icon: Intake,+ access: EUserProjectRoles.GUEST,},];@@ -106,6 +112,9 @@ export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {const { setTrackElement } = useEventTracker();const { addProjectToFavorites, removeProjectFromFavorites, getProjectById } = useProject();const { isMobile } = usePlatformOS();+ const {+ membership: { currentWorkspaceAllProjectsRole },+ } = useUser();// statesconst [leaveProjectModalOpen, setLeaveProjectModal] = useState(false);const [publishModalOpen, setPublishModal] = useState(false);@@ -378,16 +387,20 @@ export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {customButtonClassName="grid place-items-center"placement="bottom-start">- <CustomMenu.MenuItem onClick={project.is_favorite ? handleRemoveFromFavorites : handleAddToFavorites}>- <span className="flex items-center justify-start gap-2">- <Star- className={cn("h-3.5 w-3.5 ", {- "fill-yellow-500 stroke-yellow-500": project.is_favorite,- })}- />- <span>{project.is_favorite ? "Remove from favorites" : "Add to favorites"}</span>- </span>- </CustomMenu.MenuItem>+ {!isViewerOrGuest && (+ <CustomMenu.MenuItem+ onClick={project.is_favorite ? handleRemoveFromFavorites : handleAddToFavorites}+ >+ <span className="flex items-center justify-start gap-2">+ <Star+ className={cn("h-3.5 w-3.5 ", {+ "fill-yellow-500 stroke-yellow-500": project.is_favorite,+ })}+ />+ <span>{project.is_favorite ? "Remove from favorites" : "Add to favorites"}</span>+ </span>+ </CustomMenu.MenuItem>+ )}{/* publish project settings */}{isAdmin && (@@ -400,14 +413,16 @@ export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {</div></CustomMenu.MenuItem>)}- <CustomMenu.MenuItem>- <Link href={`/${workspaceSlug}/projects/${project?.id}/draft-issues/`}>- <div className="flex items-center justify-start gap-2">- <PenSquare className="h-3.5 w-3.5 stroke-[1.5] text-custom-text-300" />- <span>Draft issues</span>- </div>- </Link>- </CustomMenu.MenuItem>+ {!isViewerOrGuest && (+ <CustomMenu.MenuItem>+ <Link href={`/${workspaceSlug}/projects/${project?.id}/draft-issues/`}>+ <div className="flex items-center justify-start gap-2">+ <PenSquare className="h-3.5 w-3.5 stroke-[1.5] text-custom-text-300" />+ <span>Draft issues</span>+ </div>+ </Link>+ </CustomMenu.MenuItem>+ )}<CustomMenu.MenuItem onClick={handleCopyText}><span className="flex items-center justify-start gap-2"><LinkIcon className="h-3.5 w-3.5 stroke-[1.5]" />@@ -482,31 +497,37 @@ export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {(item.name === "Intake" && !project.inbox_view))return;-+ const currentRole = currentWorkspaceAllProjectsRole+ ? currentWorkspaceAllProjectsRole[projectId]+ : undefined;return (- <Tooltip- key={item.name}- isMobile={isMobile}- tooltipContent={`${project?.name}: ${item.name}`}- position="right"- className="ml-2"- disabled={!isSidebarCollapsed}- >- <Link key={item.name} href={item.href} onClick={handleProjectClick}>- <SidebarNavItem+ <>+ {currentRole >= item.access && (+ <Tooltipkey={item.name}- className={`pl-[18px] ${isSidebarCollapsed ? "p-0 size-7 justify-center mx-auto" : ""}`}- isActive={pathname.includes(item.href)}+ isMobile={isMobile}+ tooltipContent={`${project?.name}: ${item.name}`}+ position="right"+ className="ml-2"+ disabled={!isSidebarCollapsed}>- <div className="flex items-center gap-1.5 py-[1px]">- <item.Icon- className={`flex-shrink-0 size-4 ${item.name === "Intake" ? "stroke-1" : "stroke-[1.5]"}`}- />- {!isSidebarCollapsed && <span className="text-xs font-medium">{item.name}</span>}- </div>- </SidebarNavItem>- </Link>- </Tooltip>+ <Link key={item.name} href={item.href} onClick={handleProjectClick}>+ <SidebarNavItem+ key={item.name}+ className={`pl-[18px] ${isSidebarCollapsed ? "p-0 size-7 justify-center mx-auto" : ""}`}+ isActive={pathname.includes(item.href)}+ >+ <div className="flex items-center gap-1.5 py-[1px]">+ <item.Icon+ className={`flex-shrink-0 size-4 ${item.name === "Intake" ? "stroke-1" : "stroke-[1.5]"}`}+ />+ {!isSidebarCollapsed && <span className="text-xs font-medium">{item.name}</span>}+ </div>+ </SidebarNavItem>+ </Link>+ </Tooltip>+ )}+ </>);})}</Disclosure.Panel>diff --git a/web/core/components/workspace/sidebar/projects-list.tsx b/web/core/components/workspace/sidebar/projects-list.tsxindex 568f984439..c9943a5420 100644--- a/web/core/components/workspace/sidebar/projects-list.tsx+++ b/web/core/components/workspace/sidebar/projects-list.tsx@@ -263,7 +263,6 @@ export const SidebarProjectsList: FC = observer(() => {toggleCreateProjectModal(true);}}>- <Plus className="flex-shrink-0 size-4" />{!isCollapsed && "Add project"}</button>)}diff --git a/web/core/constants/dashboard.ts b/web/core/constants/dashboard.tsindex a723a40ba6..9775570721 100644--- a/web/core/constants/dashboard.ts+++ b/web/core/constants/dashboard.ts@@ -279,7 +279,7 @@ export const SIDEBAR_WORKSPACE_MENU_ITEMS: {key: "active-cycles",label: "Cycles",href: `/active-cycles`,- access: EUserWorkspaceRoles.GUEST,+ access: EUserWorkspaceRoles.MEMBER,highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/active-cycles/`,Icon: ContrastIcon,},@@ -317,7 +317,7 @@ export const SIDEBAR_USER_MENU_ITEMS: {key: "your-work",label: "Your work",href: "/profile",- access: EUserWorkspaceRoles.GUEST,+ access: EUserWorkspaceRoles.MEMBER,highlight: (pathname: string, baseUrl: string, options?: TLinkOptions) =>options?.userId ? pathname.includes(`${baseUrl}/profile/${options?.userId}`) : false,Icon: UserActivityIcon,diff --git a/web/core/constants/empty-state.ts b/web/core/constants/empty-state.tsindex 87f74362d8..984f6f96d7 100644--- a/web/core/constants/empty-state.ts+++ b/web/core/constants/empty-state.ts@@ -490,7 +490,7 @@ const emptyStateDetails = {},},accessType: "project",- access: EUserProjectRoles.MEMBER,+ access: EUserProjectRoles.GUEST,},// project pages[EmptyStateType.PROJECT_PAGE]: {diff --git a/web/core/constants/project.ts b/web/core/constants/project.tsindex 0737e77d0d..2152a3407c 100644--- a/web/core/constants/project.ts+++ b/web/core/constants/project.ts@@ -79,7 +79,7 @@ export const PROJECT_SETTINGS_LINKS: {key: "general",label: "General",href: `/settings`,- access: EUserProjectRoles.MEMBER,+ access: EUserProjectRoles.GUEST,highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/settings/`,Icon: SettingIcon,},@@ -87,7 +87,7 @@ export const PROJECT_SETTINGS_LINKS: {key: "members",label: "Members",href: `/settings/members`,- access: EUserProjectRoles.MEMBER,+ access: EUserProjectRoles.VIEWER,highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/settings/members/`,Icon: SettingIcon,},diff --git a/web/core/hooks/use-favorite-item-details.tsx b/web/core/hooks/use-favorite-item-details.tsxindex 8bf17b8a78..9513d3e5e7 100644--- a/web/core/hooks/use-favorite-item-details.tsx+++ b/web/core/hooks/use-favorite-item-details.tsx@@ -6,7 +6,7 @@ import {import { useProject, usePage, useProjectView, useCycle, useModule } from "@/hooks/store";export const useFavoriteItemDetails = (workspaceSlug: string, favorite: IFavorite) => {- const favoriteItemId = favorite.entity_data.id;+ const favoriteItemId = favorite?.entity_data?.id;const favoriteItemLogoProps = favorite?.entity_data?.logo_props;const favoriteItemName = favorite?.entity_data.name || favorite?.name;const favoriteItemEntityType = favorite?.entity_type;diff --git a/web/core/layouts/auth-layout/workspace-wrapper.tsx b/web/core/layouts/auth-layout/workspace-wrapper.tsxindex 37be07fcec..361c983a7d 100644--- a/web/core/layouts/auth-layout/workspace-wrapper.tsx+++ b/web/core/layouts/auth-layout/workspace-wrapper.tsx@@ -30,7 +30,7 @@ export const WorkspaceAuthWrapper: FC<IWorkspaceAuthWrapper> = observer((props)// next themesconst { resolvedTheme } = useTheme();// store hooks- const { membership, signOut, data: currentUser } = useUser();+ const { membership, signOut, data: currentUser, canPerformWorkspaceMemberActions } = useUser();const { fetchProjects } = useProject();const { fetchFavorite } = useFavorite();const {@@ -72,8 +72,12 @@ export const WorkspaceAuthWrapper: FC<IWorkspaceAuthWrapper> = observer((props));// fetch workspace favoriteuseSWR(- workspaceSlug && currentWorkspace ? `WORKSPACE_FAVORITE_${workspaceSlug}` : null,- workspaceSlug && currentWorkspace ? () => fetchFavorite(workspaceSlug.toString()) : null,+ workspaceSlug && currentWorkspace && canPerformWorkspaceMemberActions+ ? `WORKSPACE_FAVORITE_${workspaceSlug}`+ : null,+ workspaceSlug && currentWorkspace && canPerformWorkspaceMemberActions+ ? () => fetchFavorite(workspaceSlug.toString())+ : null,{ revalidateIfStale: false, revalidateOnFocus: false });diff --git a/web/core/store/user/index.ts b/web/core/store/user/index.tsindex d087811a76..56eee659aa 100644--- a/web/core/store/user/index.ts+++ b/web/core/store/user/index.ts@@ -42,9 +42,18 @@ export interface IUserStore {reset: () => void;signOut: () => Promise<void>;// computed- canPerformProjectCreateActions: boolean;++ // workspace level+ canPerformWorkspaceAdminActions: boolean;+ canPerformWorkspaceMemberActions: boolean;+ canPerformWorkspaceViewerActions: boolean;+ canPerformWorkspaceGuestActions: boolean;++ // project levelcanPerformProjectAdminActions: boolean;- canPerformWorkspaceCreateActions: boolean;+ canPerformProjectMemberActions: boolean;+ canPerformProjectViewerActions: boolean;+ canPerformProjectGuestActions: boolean;canPerformAnyCreateAction: boolean;projectsWithCreatePermissions: { [projectId: string]: number } | null;}@@ -92,9 +101,16 @@ export class UserStore implements IUserStore {reset: action,signOut: action,// computed- canPerformProjectCreateActions: computed,+ canPerformWorkspaceAdminActions: computed,+ canPerformWorkspaceMemberActions: computed,+ canPerformWorkspaceViewerActions: computed,+ canPerformWorkspaceGuestActions: computed,+canPerformProjectAdminActions: computed,- canPerformWorkspaceCreateActions: computed,+ canPerformProjectMemberActions: computed,+ canPerformProjectViewerActions: computed,+ canPerformProjectGuestActions: computed,+canPerformAnyCreateAction: computed,projectsWithCreatePermissions: computed,});@@ -273,15 +289,40 @@ export class UserStore implements IUserStore {}/**- * @description tells if user has project create actions permissions+ * @description returns true if user has workspace admin actions permissions* @returns {boolean}*/- get canPerformProjectCreateActions() {- return !!this.membership.currentProjectRole && this.membership.currentProjectRole >= EUserProjectRoles.MEMBER;+ get canPerformWorkspaceAdminActions() {+ return !!this.membership.currentWorkspaceRole && this.membership.currentWorkspaceRole === EUserWorkspaceRoles.ADMIN;+ }++ /**+ * @description returns true if user has workspace member actions permissions+ * @returns {boolean}+ */+ get canPerformWorkspaceMemberActions() {+ return !!this.membership.currentWorkspaceRole && this.membership.currentWorkspaceRole >= EUserWorkspaceRoles.MEMBER;}/**- * @description tells if user has project admin actions permissions+ * @description returns true if user has workspace viewer actions permissions+ * @returns {boolean}+ */++ get canPerformWorkspaceViewerActions() {+ return !!this.membership.currentWorkspaceRole && this.membership.currentWorkspaceRole >= EUserWorkspaceRoles.VIEWER;+ }++ /**+ * @description returns true if user has workspace guest actions permissions+ * @returns {boolean}+ */+ get canPerformWorkspaceGuestActions() {+ return !!this.membership.currentWorkspaceRole && this.membership.currentWorkspaceRole >= EUserWorkspaceRoles.GUEST;+ }++ /**+ * @description returns true if user has project admin actions permissions* @returns {boolean}*/get canPerformProjectAdminActions() {@@ -289,10 +330,27 @@ export class UserStore implements IUserStore {}/**- * @description tells if user has workspace create actions permissions+ * @description returns true if user has project member actions permissions* @returns {boolean}*/- get canPerformWorkspaceCreateActions() {- return !!this.membership.currentWorkspaceRole && this.membership.currentWorkspaceRole >= EUserWorkspaceRoles.MEMBER;+ get canPerformProjectMemberActions() {+ return !!this.membership.currentProjectRole && this.membership.currentProjectRole >= EUserProjectRoles.MEMBER;+ }++ /**+ * @description returns true if user has project viewer actions permissions+ * @returns {boolean}+ */++ get canPerformProjectViewerActions() {+ return !!this.membership.currentProjectRole && this.membership.currentProjectRole >= EUserProjectRoles.VIEWER;+ }++ /**+ * @description returns true if user has project guest actions permissions+ * @returns {boolean}+ */+ get canPerformProjectGuestActions() {+ return !!this.membership.currentProjectRole && this.membership.currentProjectRole >= EUserProjectRoles.GUEST;}}diff --git a/web/public/auth/unauthorized.svg b/web/public/auth/unauthorized.svgnew file mode 100644index 0000000000..2bad48a570--- /dev/null+++ b/web/public/auth/unauthorized.svg@@ -0,0 +1,44 @@+<svg viewBox="113.973 38.701 281.415 172.368" xmlns="http://www.w3.org/2000/svg">+ <defs>+ <filter id="filter0_d_1537_45910" x="17.5323" y="0.532252" width="264.935" height="151.935" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">+ <feFlood flood-opacity="0" result="BackgroundImageFix"/>+ <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>+ <feOffset/>+ <feGaussianBlur stdDeviation="1.23387"/>+ <feComposite in2="hardAlpha" operator="out"/>+ <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>+ <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1537_45910"/>+ <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_1537_45910" result="shape"/>+ </filter>+ <filter id="filter1_d_1537_45910" x="0.532252" y="21.5323" width="264.935" height="151.935" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">+ <feFlood flood-opacity="0" result="BackgroundImageFix"/>+ <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>+ <feOffset/>+ <feGaussianBlur stdDeviation="1.23387"/>+ <feComposite in2="hardAlpha" operator="out"/>+ <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>+ <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1537_45910"/>+ <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_1537_45910" result="shape"/>+ </filter>+ </defs>+ <rect x="169.862" y="65.408" width="79.585" height="13.551" rx="6.169" fill="#EBEBEB" transform="matrix(0.9999999999999999, 0, 0, 0.9999999999999999, 0, -7.105427357601002e-15)"/>+ <rect x="264.871" y="65.408" width="79.585" height="13.551" rx="6.169" fill="#E2E2E2" transform="matrix(0.9999999999999999, 0, 0, 0.9999999999999999, 0, -7.105427357601002e-15)"/>+ <g filter="url(#filter0_d_1537_45910)" transform="matrix(0.9999999999999999, 0, 0, 0.9999999999999999, 113.2900695800781, 37.6835594177246)">+ <rect x="20" y="3" width="260" height="147" rx="6.16937" fill="white"/>+ </g>+ <path d="M 147.794 137.684 L 147.794 128.229 L 151.34 128.229 C 152.066 128.229 152.676 128.365 153.168 128.635 C 153.664 128.906 154.037 129.279 154.29 129.753 C 154.545 130.223 154.673 130.759 154.673 131.359 C 154.673 131.965 154.545 132.504 154.29 132.975 C 154.034 133.446 153.657 133.817 153.159 134.087 C 152.66 134.355 152.046 134.489 151.317 134.489 L 148.967 134.489 L 148.967 133.081 L 151.086 133.081 C 151.511 133.081 151.858 133.007 152.129 132.859 C 152.4 132.712 152.6 132.509 152.729 132.25 C 152.862 131.992 152.928 131.695 152.928 131.359 C 152.928 131.024 152.862 130.728 152.729 130.473 C 152.6 130.217 152.399 130.019 152.125 129.877 C 151.854 129.733 151.505 129.66 151.077 129.66 L 149.507 129.66 L 149.507 137.684 L 147.794 137.684 Z M 156.087 137.684 L 156.087 130.593 L 157.707 130.593 L 157.707 131.775 L 157.781 131.775 C 157.91 131.365 158.132 131.05 158.446 130.828 C 158.763 130.604 159.124 130.491 159.531 130.491 C 159.623 130.491 159.726 130.496 159.84 130.505 C 159.957 130.511 160.054 130.522 160.131 130.537 L 160.131 132.075 C 160.06 132.05 159.948 132.028 159.794 132.01 C 159.643 131.988 159.497 131.978 159.355 131.978 C 159.051 131.978 158.777 132.044 158.534 132.176 C 158.293 132.305 158.104 132.485 157.966 132.716 C 157.827 132.947 157.758 133.213 157.758 133.515 L 157.758 137.684 L 156.087 137.684 Z M 164.042 137.822 C 163.35 137.822 162.75 137.67 162.242 137.365 C 161.734 137.06 161.34 136.634 161.06 136.086 C 160.783 135.539 160.644 134.898 160.644 134.166 C 160.644 133.433 160.783 132.792 161.06 132.241 C 161.34 131.69 161.734 131.262 162.242 130.957 C 162.75 130.653 163.35 130.5 164.042 130.5 C 164.735 130.5 165.335 130.653 165.843 130.957 C 166.35 131.262 166.743 131.69 167.02 132.241 C 167.3 132.792 167.44 133.433 167.44 134.166 C 167.44 134.898 167.3 135.539 167.02 136.086 C 166.743 136.634 166.35 137.06 165.843 137.365 C 165.335 137.67 164.735 137.822 164.042 137.822 Z M 164.051 136.483 C 164.427 136.483 164.741 136.38 164.993 136.174 C 165.245 135.965 165.433 135.685 165.556 135.334 C 165.683 134.983 165.746 134.592 165.746 134.161 C 165.746 133.727 165.683 133.335 165.556 132.984 C 165.433 132.63 165.245 132.349 164.993 132.139 C 164.741 131.93 164.427 131.825 164.051 131.825 C 163.667 131.825 163.347 131.93 163.091 132.139 C 162.839 132.349 162.649 132.63 162.523 132.984 C 162.4 133.335 162.339 133.727 162.339 134.161 C 162.339 134.592 162.4 134.983 162.523 135.334 C 162.649 135.685 162.839 135.965 163.091 136.174 C 163.347 136.38 163.667 136.483 164.051 136.483 Z M 168.858 130.593 L 170.529 130.593 L 170.529 138.09 C 170.529 138.601 170.432 139.023 170.239 139.355 C 170.045 139.688 169.765 139.935 169.398 140.098 C 169.032 140.262 168.587 140.343 168.064 140.343 C 168.003 140.343 167.946 140.342 167.893 140.338 C 167.841 140.338 167.784 140.337 167.723 140.334 L 167.723 138.972 C 167.769 138.975 167.81 138.977 167.847 138.977 C 167.884 138.98 167.923 138.981 167.963 138.981 C 168.283 138.981 168.512 138.903 168.651 138.746 C 168.789 138.592 168.858 138.366 168.858 138.067 L 168.858 130.593 Z M 169.689 129.586 C 169.421 129.586 169.192 129.499 169.001 129.323 C 168.814 129.145 168.72 128.931 168.72 128.682 C 168.72 128.429 168.814 128.215 169.001 128.04 C 169.192 127.861 169.421 127.772 169.689 127.772 C 169.954 127.772 170.18 127.861 170.368 128.04 C 170.559 128.215 170.654 128.429 170.654 128.682 C 170.654 128.931 170.559 129.145 170.368 129.323 C 170.18 129.499 169.954 129.586 169.689 129.586 Z M 175.387 137.822 C 174.676 137.822 174.062 137.674 173.545 137.379 C 173.031 137.08 172.636 136.659 172.359 136.114 C 172.082 135.566 171.943 134.921 171.943 134.18 C 171.943 133.45 172.082 132.81 172.359 132.259 C 172.639 131.705 173.03 131.274 173.531 130.967 C 174.033 130.656 174.622 130.5 175.299 130.5 C 175.736 130.5 176.149 130.571 176.537 130.713 C 176.927 130.851 177.272 131.067 177.571 131.359 C 177.872 131.651 178.109 132.024 178.282 132.476 C 178.454 132.926 178.54 133.461 178.54 134.083 L 178.54 134.595 L 172.728 134.595 L 172.728 133.469 L 176.938 133.469 C 176.935 133.149 176.866 132.864 176.731 132.615 C 176.595 132.362 176.406 132.164 176.163 132.019 C 175.923 131.875 175.643 131.802 175.322 131.802 C 174.981 131.802 174.681 131.885 174.422 132.052 C 174.164 132.215 173.962 132.43 173.818 132.698 C 173.676 132.963 173.604 133.253 173.601 133.57 L 173.601 134.554 C 173.601 134.966 173.676 135.32 173.827 135.615 C 173.978 135.908 174.188 136.133 174.459 136.289 C 174.73 136.443 175.047 136.52 175.41 136.52 C 175.653 136.52 175.873 136.486 176.07 136.419 C 176.267 136.348 176.438 136.245 176.583 136.109 C 176.727 135.974 176.837 135.806 176.911 135.606 L 178.471 135.782 C 178.372 136.194 178.185 136.554 177.908 136.862 C 177.634 137.167 177.283 137.404 176.855 137.573 C 176.427 137.739 175.938 137.822 175.387 137.822 Z M 183.047 137.822 C 182.339 137.822 181.731 137.667 181.224 137.356 C 180.719 137.045 180.329 136.616 180.056 136.068 C 179.785 135.517 179.649 134.883 179.649 134.166 C 179.649 133.446 179.788 132.81 180.065 132.259 C 180.342 131.705 180.733 131.274 181.237 130.967 C 181.745 130.656 182.345 130.5 183.038 130.5 C 183.613 130.5 184.123 130.607 184.566 130.819 C 185.012 131.028 185.368 131.325 185.632 131.71 C 185.897 132.092 186.048 132.538 186.085 133.049 L 184.487 133.049 C 184.423 132.707 184.269 132.422 184.026 132.195 C 183.786 131.964 183.464 131.848 183.061 131.848 C 182.719 131.848 182.419 131.941 182.161 132.125 C 181.902 132.307 181.701 132.569 181.556 132.91 C 181.414 133.252 181.344 133.661 181.344 134.138 C 181.344 134.621 181.414 135.037 181.556 135.385 C 181.697 135.729 181.896 135.996 182.151 136.183 C 182.41 136.368 182.713 136.46 183.061 136.46 C 183.307 136.46 183.527 136.414 183.721 136.322 C 183.918 136.226 184.083 136.089 184.215 135.911 C 184.347 135.732 184.438 135.515 184.487 135.26 L 186.085 135.26 C 186.045 135.762 185.897 136.206 185.641 136.594 C 185.386 136.979 185.038 137.28 184.598 137.499 C 184.158 137.715 183.641 137.822 183.047 137.822 Z M 190.998 130.593 L 190.998 131.885 L 186.921 131.885 L 186.921 130.593 L 190.998 130.593 Z M 187.928 128.894 L 189.599 128.894 L 189.599 135.551 C 189.599 135.776 189.633 135.948 189.701 136.068 C 189.771 136.185 189.864 136.265 189.978 136.308 C 190.091 136.351 190.218 136.373 190.356 136.373 C 190.461 136.373 190.556 136.365 190.642 136.349 C 190.732 136.334 190.799 136.32 190.845 136.308 L 191.127 137.614 C 191.038 137.645 190.91 137.679 190.744 137.716 C 190.581 137.753 190.381 137.775 190.144 137.781 C 189.725 137.793 189.348 137.73 189.013 137.591 C 188.677 137.45 188.411 137.231 188.214 136.936 C 188.02 136.64 187.925 136.271 187.928 135.828 L 187.928 128.894 Z M 200.832 130.828 C 200.789 130.425 200.607 130.111 200.287 129.886 C 199.97 129.662 199.558 129.549 199.05 129.549 C 198.693 129.549 198.387 129.603 198.131 129.711 C 197.876 129.819 197.68 129.965 197.545 130.15 C 197.41 130.334 197.34 130.545 197.337 130.782 C 197.337 130.979 197.382 131.15 197.471 131.294 C 197.564 131.439 197.688 131.562 197.845 131.664 C 198.002 131.762 198.176 131.845 198.367 131.913 C 198.558 131.981 198.75 132.038 198.944 132.084 L 199.83 132.305 C 200.187 132.389 200.53 132.501 200.86 132.642 C 201.192 132.784 201.489 132.963 201.751 133.178 C 202.015 133.393 202.225 133.653 202.379 133.958 C 202.532 134.263 202.609 134.62 202.609 135.029 C 202.609 135.583 202.468 136.071 202.185 136.493 C 201.901 136.911 201.492 137.239 200.957 137.476 C 200.424 137.71 199.779 137.827 199.022 137.827 C 198.287 137.827 197.648 137.713 197.107 137.485 C 196.568 137.257 196.146 136.925 195.842 136.488 C 195.54 136.051 195.377 135.519 195.352 134.891 L 197.037 134.891 C 197.062 135.22 197.163 135.494 197.342 135.712 C 197.52 135.931 197.753 136.094 198.039 136.202 C 198.328 136.309 198.651 136.363 199.008 136.363 C 199.381 136.363 199.707 136.308 199.987 136.197 C 200.27 136.083 200.492 135.926 200.652 135.726 C 200.812 135.523 200.894 135.286 200.897 135.015 C 200.894 134.769 200.821 134.566 200.68 134.406 C 200.538 134.243 200.34 134.107 200.084 134 C 199.832 133.889 199.536 133.79 199.198 133.704 L 198.122 133.427 C 197.343 133.227 196.728 132.924 196.276 132.518 C 195.826 132.108 195.602 131.565 195.602 130.888 C 195.602 130.331 195.752 129.843 196.054 129.425 C 196.359 129.006 196.773 128.682 197.296 128.451 C 197.819 128.217 198.411 128.1 199.073 128.1 C 199.744 128.1 200.332 128.217 200.837 128.451 C 201.344 128.682 201.743 129.003 202.032 129.416 C 202.322 129.825 202.471 130.296 202.48 130.828 L 200.832 130.828 Z M 207.202 137.822 C 206.491 137.822 205.877 137.674 205.36 137.379 C 204.846 137.08 204.45 136.659 204.173 136.114 C 203.896 135.566 203.758 134.921 203.758 134.18 C 203.758 133.45 203.896 132.81 204.173 132.259 C 204.453 131.705 204.844 131.274 205.346 130.967 C 205.847 130.656 206.437 130.5 207.114 130.5 C 207.551 130.5 207.963 130.571 208.351 130.713 C 208.742 130.851 209.087 131.067 209.385 131.359 C 209.687 131.651 209.924 132.024 210.096 132.476 C 210.268 132.926 210.355 133.461 210.355 134.083 L 210.355 134.595 L 204.542 134.595 L 204.542 133.469 L 208.753 133.469 C 208.75 133.149 208.68 132.864 208.545 132.615 C 208.41 132.362 208.22 132.164 207.977 132.019 C 207.737 131.875 207.457 131.802 207.137 131.802 C 206.795 131.802 206.495 131.885 206.237 132.052 C 205.978 132.215 205.777 132.43 205.632 132.698 C 205.49 132.963 205.418 133.253 205.415 133.57 L 205.415 134.554 C 205.415 134.966 205.49 135.32 205.641 135.615 C 205.792 135.908 206.003 136.133 206.274 136.289 C 206.545 136.443 206.862 136.52 207.225 136.52 C 207.468 136.52 207.688 136.486 207.885 136.419 C 208.082 136.348 208.253 136.245 208.397 136.109 C 208.542 135.974 208.651 135.806 208.725 135.606 L 210.285 135.782 C 210.187 136.194 209.999 136.554 209.722 136.862 C 209.448 137.167 209.097 137.404 208.67 137.573 C 208.242 137.739 207.752 137.822 207.202 137.822 Z M 215.31 130.593 L 215.31 131.885 L 211.233 131.885 L 211.233 130.593 L 215.31 130.593 Z M 212.239 128.894 L 213.911 128.894 L 213.911 135.551 C 213.911 135.776 213.945 135.948 214.012 136.068 C 214.083 136.185 214.176 136.265 214.289 136.308 C 214.403 136.351 214.529 136.373 214.668 136.373 C 214.773 136.373 214.868 136.365 214.954 136.349 C 215.043 136.334 215.111 136.32 215.157 136.308 L 215.439 137.614 C 215.35 137.645 215.222 137.679 215.056 137.716 C 214.893 137.753 214.693 137.775 214.456 137.781 C 214.037 137.793 213.66 137.73 213.325 137.591 C 212.989 137.45 212.723 137.231 212.526 136.936 C 212.332 136.64 212.236 136.271 212.239 135.828 L 212.239 128.894 Z M 220.248 130.593 L 220.248 131.885 L 216.172 131.885 L 216.172 130.593 L 220.248 130.593 Z M 217.178 128.894 L 218.849 128.894 L 218.849 135.551 C 218.849 135.776 218.883 135.948 218.951 136.068 C 219.022 136.185 219.114 136.265 219.228 136.308 C 219.342 136.351 219.468 136.373 219.606 136.373 C 219.711 136.373 219.806 136.365 219.893 136.349 C 219.982 136.334 220.05 136.32 220.096 136.308 L 220.377 137.614 C 220.288 137.645 220.16 137.679 219.994 137.716 C 219.831 137.753 219.631 137.775 219.394 137.781 C 218.975 137.793 218.598 137.73 218.263 137.591 C 217.928 137.45 217.661 137.231 217.464 136.936 C 217.27 136.64 217.175 136.271 217.178 135.828 L 217.178 128.894 Z M 221.646 137.684 L 221.646 130.593 L 223.317 130.593 L 223.317 137.684 L 221.646 137.684 Z M 222.486 129.586 C 222.221 129.586 221.994 129.499 221.803 129.323 C 221.612 129.145 221.516 128.931 221.516 128.682 C 221.516 128.429 221.612 128.215 221.803 128.04 C 221.994 127.861 222.221 127.772 222.486 127.772 C 222.754 127.772 222.981 127.861 223.169 128.04 C 223.36 128.215 223.455 128.429 223.455 128.682 C 223.455 128.931 223.36 129.145 223.169 129.323 C 222.981 129.499 222.754 129.586 222.486 129.586 Z M 226.707 133.529 L 226.707 137.684 L 225.035 137.684 L 225.035 130.593 L 226.633 130.593 L 226.633 131.798 L 226.716 131.798 C 226.879 131.401 227.139 131.085 227.496 130.851 C 227.856 130.617 228.301 130.5 228.83 130.5 C 229.319 130.5 229.746 130.605 230.109 130.814 C 230.475 131.024 230.758 131.327 230.958 131.724 C 231.161 132.121 231.261 132.602 231.258 133.169 L 231.258 137.684 L 229.587 137.684 L 229.587 133.427 C 229.587 132.953 229.464 132.582 229.218 132.315 C 228.975 132.047 228.638 131.913 228.207 131.913 C 227.915 131.913 227.654 131.978 227.427 132.107 C 227.202 132.233 227.025 132.416 226.896 132.656 C 226.77 132.896 226.707 133.187 226.707 133.529 Z M 236.041 140.491 C 235.441 140.491 234.925 140.409 234.495 140.246 C 234.064 140.086 233.717 139.871 233.456 139.6 C 233.194 139.329 233.013 139.029 232.911 138.7 L 234.416 138.335 C 234.484 138.473 234.582 138.61 234.712 138.746 C 234.841 138.884 235.015 138.998 235.233 139.087 C 235.455 139.18 235.733 139.226 236.069 139.226 C 236.543 139.226 236.935 139.11 237.246 138.88 C 237.557 138.652 237.712 138.276 237.712 137.753 L 237.712 136.41 L 237.629 136.41 C 237.543 136.582 237.417 136.759 237.251 136.94 C 237.087 137.122 236.87 137.274 236.6 137.397 C 236.332 137.521 235.995 137.582 235.589 137.582 C 235.044 137.582 234.55 137.454 234.107 137.199 C 233.667 136.94 233.316 136.556 233.054 136.045 C 232.796 135.531 232.666 134.888 232.666 134.115 C 232.666 133.336 232.796 132.679 233.054 132.144 C 233.316 131.605 233.668 131.197 234.111 130.921 C 234.555 130.64 235.049 130.5 235.593 130.5 C 236.009 130.5 236.35 130.571 236.618 130.713 C 236.889 130.851 237.104 131.019 237.264 131.216 C 237.424 131.41 237.546 131.593 237.629 131.765 L 237.721 131.765 L 237.721 130.593 L 239.37 130.593 L 239.37 137.799 C 239.37 138.406 239.225 138.907 238.936 139.304 C 238.646 139.701 238.251 139.998 237.749 140.195 C 237.248 140.392 236.678 140.491 236.041 140.491 Z M 236.055 136.271 C 236.409 136.271 236.71 136.185 236.96 136.012 C 237.209 135.84 237.398 135.592 237.528 135.269 C 237.657 134.946 237.721 134.558 237.721 134.106 C 237.721 133.66 237.657 133.269 237.528 132.933 C 237.401 132.598 237.214 132.338 236.964 132.153 C 236.718 131.965 236.415 131.872 236.055 131.872 C 235.683 131.872 235.372 131.968 235.122 132.162 C 234.873 132.356 234.685 132.622 234.559 132.961 C 234.433 133.296 234.37 133.678 234.37 134.106 C 234.37 134.54 234.433 134.92 234.559 135.246 C 234.688 135.569 234.878 135.822 235.127 136.003 C 235.379 136.182 235.689 136.271 236.055 136.271 Z M 246.687 132.467 L 245.163 132.633 C 245.12 132.479 245.045 132.335 244.937 132.199 C 244.832 132.064 244.691 131.955 244.512 131.872 C 244.334 131.788 244.115 131.747 243.857 131.747 C 243.509 131.747 243.217 131.822 242.98 131.973 C 242.746 132.124 242.63 132.319 242.633 132.559 C 242.63 132.766 242.706 132.933 242.86 133.063 C 243.017 133.192 243.275 133.298 243.635 133.381 L 244.845 133.64 C 245.516 133.784 246.014 134.014 246.34 134.327 C 246.67 134.641 246.836 135.052 246.839 135.56 C 246.836 136.006 246.705 136.4 246.447 136.742 C 246.191 137.08 245.836 137.345 245.38 137.536 C 244.925 137.727 244.402 137.822 243.811 137.822 C 242.943 137.822 242.244 137.641 241.715 137.277 C 241.185 136.911 240.87 136.402 240.768 135.749 L 242.398 135.592 C 242.472 135.912 242.629 136.154 242.869 136.317 C 243.109 136.48 243.421 136.562 243.806 136.562 C 244.203 136.562 244.522 136.48 244.762 136.317 C 245.005 136.154 245.126 135.952 245.126 135.712 C 245.126 135.509 245.048 135.342 244.891 135.209 C 244.737 135.077 244.497 134.975 244.171 134.905 L 242.961 134.651 C 242.281 134.509 241.778 134.271 241.452 133.935 C 241.125 133.597 240.964 133.169 240.967 132.652 C 240.964 132.215 241.082 131.836 241.322 131.516 C 241.565 131.193 241.902 130.944 242.333 130.768 C 242.767 130.59 243.267 130.5 243.834 130.5 C 244.665 130.5 245.319 130.677 245.796 131.031 C 246.276 131.385 246.573 131.864 246.687 132.467 Z" fill="black" transform="matrix(0.9999999999999999, 0, 0, 0.9999999999999999, 0, -7.105427357601002e-15)"/>+ <rect x="147.29" y="150.495" width="232" height="8" rx="4" fill="#EBEBEB" transform="matrix(0.9999999999999999, 0, 0, 0.9999999999999999, 0, -7.105427357601002e-15)"/>+ <rect x="147.29" y="166.495" width="79.585" height="8.02" rx="4.01" fill="#E2E2E2" transform="matrix(0.9999999999999999, 0, 0, 0.9999999999999999, 0, -7.105427357601002e-15)"/>+ <path d="M 133.29 46.684 C 133.29 43.37 135.976 40.684 139.29 40.684 L 387.29 40.684 C 390.604 40.684 393.29 43.37 393.29 46.684 L 393.29 111.684 L 133.29 111.684 L 133.29 46.684 Z" fill="#FCECEF" transform="matrix(0.9999999999999999, 0, 0, 0.9999999999999999, 0, -7.105427357601002e-15)"/>+ <path d="M 250.832 95.85 C 250.033 95.85 249.355 95.57 248.796 95.011 C 248.237 94.452 247.957 93.773 247.957 92.975 L 247.957 72.179 C 247.957 71.38 248.237 70.701 248.796 70.142 C 249.355 69.583 250.033 69.304 250.832 69.304 L 254.186 69.304 L 254.186 64.704 C 254.186 62.18 255.073 60.032 256.846 58.259 C 258.618 56.486 260.767 55.6 263.29 55.6 C 265.814 55.6 267.962 56.486 269.735 58.259 C 271.508 60.032 272.394 62.18 272.394 64.704 L 272.394 69.304 L 275.749 69.304 C 276.547 69.304 277.226 69.583 277.785 70.142 C 278.344 70.701 278.624 71.38 278.624 72.179 L 278.624 92.975 C 278.624 93.773 278.344 94.452 277.785 95.011 C 277.226 95.57 276.547 95.85 275.749 95.85 L 250.832 95.85 Z M 250.832 92.975 L 275.749 92.975 L 275.749 72.179 L 250.832 72.179 L 250.832 92.975 Z M 263.29 86.266 C 264.313 86.266 265.183 85.915 265.902 85.212 C 266.621 84.509 266.98 83.663 266.98 82.673 C 266.98 81.714 266.621 80.844 265.902 80.061 C 265.183 79.278 264.313 78.887 263.29 78.887 C 262.268 78.887 261.398 79.278 260.679 80.061 C 259.96 80.844 259.601 81.714 259.601 82.673 C 259.601 83.663 259.96 84.509 260.679 85.212 C 261.398 85.915 262.268 86.266 263.29 86.266 Z M 257.061 69.304 L 269.519 69.304 L 269.519 64.704 C 269.519 62.979 268.913 61.509 267.699 60.295 C 266.485 59.082 265.015 58.475 263.29 58.475 C 261.565 58.475 260.096 59.082 258.882 60.295 C 257.668 61.509 257.061 62.979 257.061 64.704 L 257.061 69.304 Z M 250.832 92.975 L 250.832 72.179 L 250.832 92.975 Z" fill="#F19FA9" transform="matrix(0.9999999999999999, 0, 0, 0.9999999999999999, 0, -7.105427357601002e-15)"/>+ <rect x="152.862" y="86.408" width="79.585" height="13.551" rx="6.169" fill="#EBEBEB" transform="matrix(0.9999999999999999, 0, 0, 0.9999999999999999, 0, -7.105427357601002e-15)"/>+ <rect x="247.871" y="86.408" width="79.585" height="13.551" rx="6.169" fill="#E2E2E2" transform="matrix(0.9999999999999999, 0, 0, 0.9999999999999999, 0, -7.105427357601002e-15)"/>+ <g filter="url(#filter1_d_1537_45910)" transform="matrix(0.9999999999999999, 0, 0, 0.9999999999999999, 113.2900695800781, 37.6835594177246)">+ <rect x="3" y="24" width="260" height="147" rx="6.16937" fill="white"/>+ </g>+ <rect x="130.29" y="171.495" width="232" height="8" rx="4" fill="#EBEBEB" transform="matrix(0.9999999999999999, 0, 0, 0.9999999999999999, 0, -7.105427357601002e-15)"/>+ <rect x="130.29" y="187.495" width="79.585" height="8.02" rx="4.01" fill="#E2E2E2" transform="matrix(0.9999999999999999, 0, 0, 0.9999999999999999, 0, -7.105427357601002e-15)"/>+ <path d="M 116.29 67.684 C 116.29 64.37 118.976 61.684 122.29 61.684 L 370.29 61.684 C 373.604 61.684 376.29 64.37 376.29 67.684 L 376.29 132.684 L 116.29 132.684 L 116.29 67.684 Z" fill="#FCECEF" transform="matrix(0.9999999999999999, 0, 0, 0.9999999999999999, 0, -7.105427357601002e-15)"/>+ <path d="M 233.832 116.85 C 233.033 116.85 232.355 116.57 231.796 116.011 C 231.237 115.452 230.957 114.773 230.957 113.975 L 230.957 93.179 C 230.957 92.38 231.237 91.701 231.796 91.142 C 232.355 90.583 233.033 90.304 233.832 90.304 L 237.186 90.304 L 237.186 85.704 C 237.186 83.18 238.073 81.032 239.846 79.259 C 241.618 77.486 243.767 76.6 246.29 76.6 C 248.814 76.6 250.962 77.486 252.735 79.259 C 254.508 81.032 255.394 83.18 255.394 85.704 L 255.394 90.304 L 258.749 90.304 C 259.547 90.304 260.226 90.583 260.785 91.142 C 261.344 91.701 261.624 92.38 261.624 93.179 L 261.624 113.975 C 261.624 114.773 261.344 115.452 260.785 116.011 C 260.226 116.57 259.547 116.85 258.749 116.85 L 233.832 116.85 Z M 233.832 113.975 L 258.749 113.975 L 258.749 93.179 L 233.832 93.179 L 233.832 113.975 Z M 246.29 107.266 C 247.313 107.266 248.183 106.915 248.902 106.212 C 249.621 105.509 249.98 104.663 249.98 103.673 C 249.98 102.714 249.621 101.844 248.902 101.061 C 248.183 100.278 247.313 99.887 246.29 99.887 C 245.268 99.887 244.398 100.278 243.679 101.061 C 242.96 101.844 242.601 102.714 242.601 103.673 C 242.601 104.663 242.96 105.509 243.679 106.212 C 244.398 106.915 245.268 107.266 246.29 107.266 Z M 240.061 90.304 L 252.519 90.304 L 252.519 85.704 C 252.519 83.979 251.913 82.509 250.699 81.295 C 249.485 80.082 248.015 79.475 246.29 79.475 C 244.565 79.475 243.096 80.082 241.882 81.295 C 240.668 82.509 240.061 83.979 240.061 85.704 L 240.061 90.304 Z M 233.832 113.975 L 233.832 93.179 L 233.832 113.975 Z" fill="#F19FA9" transform="matrix(0.9999999999999999, 0, 0, 0.9999999999999999, 0, -7.105427357601002e-15)"/>+ <text style="fill: rgb(51, 51, 51); font-family: Arial, sans-serif; font-size: 29px; white-space: pre;" transform="matrix(0.46257600188255305, 0, 0, 0.4491150081157684, 71.06017303466794, 85.70719146728516)" x="126.837" y="162.177">Error unauthorized</text>+</svg>\ No newline at end of file