π₯π₯π₯ 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-5506] fix: new navigation pre release bugs (#8181)
Sangeethac31a22577572
diff --git a/apps/api/plane/app/serializers/__init__.py b/apps/api/plane/app/serializers/__init__.pyindex 18be363cda..759f27ed6e 100644--- a/apps/api/plane/app/serializers/__init__.py+++ b/apps/api/plane/app/serializers/__init__.py@@ -37,6 +37,7 @@ from .project import (ProjectMemberAdminSerializer,ProjectPublicMemberSerializer,ProjectMemberRoleSerializer,+ ProjectMemberPreferenceSerializer,)from .state import StateSerializer, StateLiteSerializerfrom .view import IssueViewSerializer, ViewIssueListSerializerdiff --git a/apps/api/plane/app/serializers/project.py b/apps/api/plane/app/serializers/project.pyindex c709093adc..01569cbc96 100644--- a/apps/api/plane/app/serializers/project.py+++ b/apps/api/plane/app/serializers/project.py@@ -142,6 +142,18 @@ class ProjectMemberSerializer(BaseSerializer):fields = "__all__"+class ProjectMemberPreferenceSerializer(BaseSerializer):+ class Meta:+ model = ProjectMember+ fields = ["preferences", "project_id", "member_id", "workspace_id"]++ def validate_preferences(self, value):+ preferences = self.instance.preferences++ preferences.update(value)+ return preferences++class ProjectMemberAdminSerializer(BaseSerializer):workspace = WorkspaceLiteSerializer(read_only=True)project = ProjectLiteSerializer(read_only=True)diff --git a/apps/api/plane/app/views/project/member.py b/apps/api/plane/app/views/project/member.pyindex 241b56221f..69d45226ce 100644--- a/apps/api/plane/app/views/project/member.py+++ b/apps/api/plane/app/views/project/member.py@@ -8,6 +8,7 @@ from plane.app.serializers import (ProjectMemberSerializer,ProjectMemberAdminSerializer,ProjectMemberRoleSerializer,+ ProjectMemberPreferenceSerializer,)from plane.app.permissions import WorkspaceUserPermission@@ -303,7 +304,7 @@ class UserProjectRolesEndpoint(BaseAPIView):class ProjectMemberPreferenceEndpoint(BaseAPIView):- def get_project_member(self, slug, project_id, member_id):+ def get_queryset(self, slug, project_id, member_id):return ProjectMember.objects.get(project_id=project_id,member_id=member_id,@@ -312,25 +313,20 @@ class ProjectMemberPreferenceEndpoint(BaseAPIView):@allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])def patch(self, request, slug, project_id, member_id):- project_member = self.get_project_member(slug, project_id, member_id)+ project_member = self.get_queryset(slug, project_id, member_id)- current_preferences = project_member.preferences or {}- current_preferences["navigation"] = request.data["navigation"]+ serializer = ProjectMemberPreferenceSerializer(project_member, {"preferences": request.data}, partial=True)- project_member.preferences = current_preferences- project_member.save(update_fields=["preferences"])+ if serializer.is_valid():+ serializer.save()- return Response({"preferences": project_member.preferences}, status=status.HTTP_200_OK)+ return Response({"preferences": serializer.data["preferences"]}, status=status.HTTP_200_OK)+ return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)@allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])def get(self, request, slug, project_id, member_id):- project_member = self.get_project_member(slug, project_id, member_id)+ project_member = self.get_queryset(slug, project_id, member_id)- response = {- "preferences": project_member.preferences,- "project_id": project_member.project_id,- "member_id": project_member.member_id,- "workspace_id": project_member.workspace_id,- }+ serializer = ProjectMemberPreferenceSerializer(project_member)- return Response(response, status=status.HTTP_200_OK)+ return Response(serializer.data, status=status.HTTP_200_OK)diff --git a/apps/api/plane/app/views/workspace/user.py b/apps/api/plane/app/views/workspace/user.pyindex 0d4f152ee4..b45c6e410b 100644--- a/apps/api/plane/app/views/workspace/user.py+++ b/apps/api/plane/app/views/workspace/user.py@@ -249,23 +249,26 @@ class WorkspaceUserPropertiesEndpoint(BaseAPIView):permission_classes = [WorkspaceViewerPermission]def patch(self, request, slug):- workspace_properties = WorkspaceUserProperties.objects.get(user=request.user, workspace__slug=slug)+ workspace = Workspace.objects.get(slug=slug)- workspace_properties.filters = request.data.get("filters", workspace_properties.filters)- workspace_properties.rich_filters = request.data.get("rich_filters", workspace_properties.rich_filters)- workspace_properties.display_filters = request.data.get("display_filters", workspace_properties.display_filters)- workspace_properties.display_properties = request.data.get(- "display_properties", workspace_properties.display_properties+ (workspace_properties, _) = WorkspaceUserProperties.objects.get_or_create(+ user=request.user, workspace_id=workspace.id)- workspace_properties.save()- serializer = WorkspaceUserPropertiesSerializer(workspace_properties)- return Response(serializer.data, status=status.HTTP_201_CREATED)+ serializer = WorkspaceUserPropertiesSerializer(workspace_properties, data=request.data, partial=True)+ if serializer.is_valid():+ serializer.save()+ return Response(serializer.data, status=status.HTTP_200_OK)++ return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)def get(self, request, slug):+ workspace = Workspace.objects.get(slug=slug)+(workspace_properties, _) = WorkspaceUserProperties.objects.get_or_create(- user=request.user, workspace__slug=slug+ user=request.user, workspace=workspace)+serializer = WorkspaceUserPropertiesSerializer(workspace_properties)return Response(serializer.data, status=status.HTTP_200_OK)diff --git a/apps/api/plane/app/views/workspace/user_preference.py b/apps/api/plane/app/views/workspace/user_preference.pyindex 3b8edd8ca1..253f715b36 100644--- a/apps/api/plane/app/views/workspace/user_preference.py+++ b/apps/api/plane/app/views/workspace/user_preference.py@@ -39,6 +39,16 @@ class WorkspaceUserPreferenceViewSet(BaseAPIView):user=request.user,workspace=workspace,sort_order=(65535 + (i * 10000)),+ is_pinned=(+ True+ if key+ in [+ WorkspaceUserPreference.UserPreferenceKeys.DRAFTS,+ WorkspaceUserPreference.UserPreferenceKeys.YOUR_WORK,+ WorkspaceUserPreference.UserPreferenceKeys.STICKIES,+ ]+ else False+ ),)for i, key in enumerate(create_preference_keys)],