dev: update sort order calculation

.env.example

@@ -21,8 +21,6 @@ NEXT_PUBLIC_TRACK_EVENTS=0
 NEXT_PUBLIC_SLACK_CLIENT_ID=""
 # For Telemetry, set it to "app.plane.so"
 NEXT_PUBLIC_PLAUSIBLE_DOMAIN=""
-# public boards deploy url
-NEXT_PUBLIC_DEPLOY_URL=""
 
 # Backend
 # Debug value for api server use it as 0 for production use

.gitignore

@@ -70,6 +70,4 @@ package-lock.json
 # lock files
 package-lock.json
 pnpm-lock.yaml
-pnpm-workspace.yaml
-
-.npmrc
+pnpm-workspace.yaml

README.md

@@ -61,16 +61,6 @@ chmod +x setup.sh
 
 > If running in a cloud env replace localhost with public facing IP address of the VM
 
-- Setup Tiptap Pro
-
-  Visit [Tiptap Pro](https://collab.tiptap.dev/pro-extensions) and signup (it is free).
-
-  Create a **`.npmrc`** file, copy the following and replace your registry token generated from Tiptap Pro. 
-
-```
-@tiptap-pro:registry=https://registry.tiptap.dev/
-//registry.tiptap.dev/:_authToken=YOUR_REGISTRY_TOKEN
-```
 - Run Docker compose up
 
 ```bash

apiserver/bin/user_script.py

@@ -1,4 +1,4 @@
-import os, sys, random, string
+import os, sys
 import uuid
 
 sys.path.append("/code")
@@ -19,9 +19,9 @@ def populate():
         user = User.objects.create(email=default_email, username=uuid.uuid4().hex)
         user.set_password(default_password)
         user.save()
-        print(f"User created with an email: {default_email}")
-    else:
-        print(f"User already exists with the default email: {default_email}")
+        print("User created")
+
+    print("Success")
 
 
 if __name__ == "__main__":

apiserver/plane/api/serializers/__init__.py

@@ -1,10 +1,16 @@
 from .base import BaseSerializer
-from .user import UserSerializer, ChangePasswordSerializer, ResetPasswordSerializer
+from .people import (
+    ChangePasswordSerializer,
+    ResetPasswordSerializer,
+    TokenSerializer,
+)
+from .user import UserSerializer, UserLiteSerializer
 from .workspace import (
     WorkSpaceSerializer,
     WorkSpaceMemberSerializer,
     TeamSerializer,
     WorkSpaceMemberInviteSerializer,
+    WorkspaceLiteSerializer,
     WorkspaceThemeSerializer,
 )
 from .project import (
@@ -14,11 +20,10 @@ from .project import (
     ProjectMemberInviteSerializer,
     ProjectIdentifierSerializer,
     ProjectFavoriteSerializer,
+    ProjectLiteSerializer,
     ProjectMemberLiteSerializer,
-    ProjectDeployBoardSerializer,
-    ProjectMemberAdminSerializer,
 )
-from .state import StateSerializer
+from .state import StateSerializer, StateLiteSerializer
 from .view import IssueViewSerializer, IssueViewFavoriteSerializer
 from .cycle import CycleSerializer, CycleIssueSerializer, CycleFavoriteSerializer, CycleWriteSerializer
 from .asset import FileAssetSerializer
@@ -29,7 +34,7 @@ from .issue import (
     IssuePropertySerializer,
     BlockerIssueSerializer,
     BlockedIssueSerializer,
-    # IssueAssigneeSerializer,
+    IssueAssigneeSerializer,
     LabelSerializer,
     IssueSerializer,
     IssueFlatSerializer,
@@ -40,7 +45,6 @@ from .issue import (
     IssueSubscriberSerializer,
     IssueReactionSerializer,
     CommentReactionSerializer,
-    IssueVoteSerializer,
 )
 
 from .module import (
@@ -70,6 +74,7 @@ from .page import PageSerializer, PageBlockSerializer, PageFavoriteSerializer
 from .estimate import (
     EstimateSerializer,
     EstimatePointSerializer,
+    EstimateReadSerializer,
 )
 
 from .inbox import InboxSerializer, InboxIssueSerializer, IssueStateInboxSerializer
@@ -77,5 +82,3 @@ from .inbox import InboxSerializer, InboxIssueSerializer, IssueStateInboxSeriali
 from .analytic import AnalyticViewSerializer
 
 from .notification import NotificationSerializer
-
-from .exporter import ExporterHistorySerializer

apiserver/plane/api/serializers/base.py

@@ -1,33 +1,5 @@
 from rest_framework import serializers
 
-def filterFields(self, fields):
-    for field_name in fields:
-         if isinstance(field_name, dict):
-            for key, value in field_name.items():
-                if isinstance(value, list):
-                    filterFields(self.fields[key], value) 
-    allowed = []
-    for item in fields:
-        if isinstance(item, str):
-            allowed.append(item)
-        elif isinstance(item, dict):
-            allowed.append(list(item.keys())[0])
-    existing = set(self.fields)
-    allowed = set(allowed)
-    for field_name in existing - allowed:
-        self.fields.pop(field_name)
-    return self.fields
 
 class BaseSerializer(serializers.ModelSerializer):
     id = serializers.PrimaryKeyRelatedField(read_only=True)
-
-    def __init__(self, *args, **kwargs):
-        # Don't pass the 'fields' arg up to the superclass
-        fields = kwargs.pop("fields", None)
-
-        # Instantiate the superclass normally
-        super().__init__(*args, **kwargs)
-
-        if fields is not None:
-            # Drop any fields that are not specified in the `fields` argument.
-                self.fields = filterFields(self, fields)

apiserver/plane/api/serializers/cycle.py

@@ -6,10 +6,10 @@ from rest_framework import serializers
 
 # Module imports
 from .base import BaseSerializer
-from .user import UserSerializer
+from .user import UserLiteSerializer
 from .issue import IssueStateSerializer
-from .workspace import WorkSpaceSerializer
-from .project import ProjectSerializer
+from .workspace import WorkspaceLiteSerializer
+from .project import ProjectLiteSerializer
 from plane.db.models import Cycle, CycleIssue, CycleFavorite
 
 class CycleWriteSerializer(BaseSerializer):
@@ -20,7 +20,7 @@ class CycleWriteSerializer(BaseSerializer):
 
 
 class CycleSerializer(BaseSerializer):
-    owned_by = UserSerializer(read_only=True)
+    owned_by = UserLiteSerializer(read_only=True)
     is_favorite = serializers.BooleanField(read_only=True)
     total_issues = serializers.IntegerField(read_only=True)
     cancelled_issues = serializers.IntegerField(read_only=True)
@@ -33,15 +33,14 @@ class CycleSerializer(BaseSerializer):
     total_estimates = serializers.IntegerField(read_only=True)
     completed_estimates = serializers.IntegerField(read_only=True)
     started_estimates = serializers.IntegerField(read_only=True)
-    workspace_detail =  WorkSpaceSerializer(source="workspace",read_only=True) 
-    project_detail = ProjectSerializer(read_only=True, source="project")
-
+    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    
     def get_assignees(self, obj):
         members = [
             {
                 "avatar": assignee.avatar,
                 "first_name": assignee.first_name,
-                "display_name": assignee.display_name,
                 "id": assignee.id,
             }
             for issue_cycle in obj.issue_cycle.all()
@@ -54,7 +53,7 @@ class CycleSerializer(BaseSerializer):
         unique_list = [dict(item) for item in unique_objects]
 
         return unique_list
-
+    
     def get_labels(self, obj):
         labels = [
             {

apiserver/plane/api/serializers/estimate.py

@@ -2,12 +2,12 @@
 from .base import BaseSerializer
 
 from plane.db.models import Estimate, EstimatePoint
-from plane.api.serializers import WorkSpaceSerializer, ProjectSerializer
+from plane.api.serializers import WorkspaceLiteSerializer, ProjectLiteSerializer
 
 
 class EstimateSerializer(BaseSerializer):
-    workspace_detail = WorkSpaceSerializer(source="workspace", read_only=True)
-    project_detail = ProjectSerializer(read_only=True, source="project")
+    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
 
     class Meta:
         model = Estimate
@@ -27,3 +27,18 @@ class EstimatePointSerializer(BaseSerializer):
             "workspace",
             "project",
         ]
+
+
+class EstimateReadSerializer(BaseSerializer):
+    points = EstimatePointSerializer(read_only=True, many=True)
+    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+
+    class Meta:
+        model = Estimate
+        fields = "__all__"
+        read_only_fields = [
+            "points",
+            "name",
+            "description",
+        ]

apiserver/plane/api/serializers/exporter.py

@@ -1,26 +0,0 @@
-# Module imports
-from .base import BaseSerializer
-from plane.db.models import ExporterHistory
-from .user import UserSerializer
-
-
-class ExporterHistorySerializer(BaseSerializer):
-    initiated_by_detail = UserSerializer(source="initiated_by",read_only=True)
-
-    class Meta:
-        model = ExporterHistory
-        fields = [
-            "id",
-            "created_at",
-            "updated_at",
-            "project",
-            "provider",
-            "status",
-            "url",
-            "initiated_by",
-            "initiated_by_detail",
-            "token",
-            "created_by",
-            "updated_by",
-        ]
-        read_only_fields = fields

apiserver/plane/api/serializers/importer.py

@@ -1,15 +1,15 @@
 # Module imports
 from .base import BaseSerializer
-from .user import UserSerializer
-from .project import ProjectSerializer
-from .workspace import WorkSpaceSerializer
+from .user import UserLiteSerializer
+from .project import ProjectLiteSerializer
+from .workspace import WorkspaceLiteSerializer
 from plane.db.models import Importer
 
 
 class ImporterSerializer(BaseSerializer):
-    initiated_by_detail = UserSerializer(source="initiated_by", read_only=True)
-    project_detail = ProjectSerializer(source="project", read_only=True)
-    workspace_detail = WorkSpaceSerializer(source="workspace", read_only=True)
+    initiated_by_detail = UserLiteSerializer(source="initiated_by", read_only=True)
+    project_detail = ProjectLiteSerializer(source="project", read_only=True)
+    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
 
     class Meta:
         model = Importer

apiserver/plane/api/serializers/inbox.py

@@ -4,14 +4,15 @@ from rest_framework import serializers
 # Module imports
 from .base import BaseSerializer
 from .issue import IssueFlatSerializer, LabelLiteSerializer
-from .project import ProjectSerializer
+from .project import ProjectLiteSerializer
 from .state import StateLiteSerializer
-from .user import UserSerializer
+from .project import ProjectLiteSerializer
+from .user import UserLiteSerializer
 from plane.db.models import Inbox, InboxIssue, Issue
 
 
 class InboxSerializer(BaseSerializer):
-    project_detail = ProjectSerializer(source="project", fields=("id","name","cover_image","icon_prop","emoji","description"), read_only=True)
+    project_detail = ProjectLiteSerializer(source="project", read_only=True)
     pending_issue_count = serializers.IntegerField(read_only=True)
 
     class Meta:
@@ -25,7 +26,7 @@ class InboxSerializer(BaseSerializer):
 
 class InboxIssueSerializer(BaseSerializer):
     issue_detail = IssueFlatSerializer(source="issue", read_only=True)
-    project_detail = ProjectSerializer(source="project", fields=("id","name","cover_image","icon_prop","emoji","description"), read_only=True)
+    project_detail = ProjectLiteSerializer(source="project", read_only=True)
 
     class Meta:
         model = InboxIssue
@@ -45,9 +46,9 @@ class InboxIssueLiteSerializer(BaseSerializer):
 
 class IssueStateInboxSerializer(BaseSerializer):
     state_detail = StateLiteSerializer(read_only=True, source="state")
-    project_detail = ProjectSerializer(source="project", fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
     label_details = LabelLiteSerializer(read_only=True, source="labels", many=True)
-    assignee_details = UserSerializer(source="assignees", read_only=True, many=True)
+    assignee_details = UserLiteSerializer(read_only=True, source="assignees", many=True)
     sub_issues_count = serializers.IntegerField(read_only=True)
     bridge_id = serializers.UUIDField(read_only=True)
     issue_inbox = InboxIssueLiteSerializer(read_only=True, many=True)

apiserver/plane/api/serializers/issue.py

@@ -6,10 +6,11 @@ from rest_framework import serializers
 
 # Module imports
 from .base import BaseSerializer
-from .user import UserSerializer
+from .user import UserLiteSerializer
 from .state import StateSerializer, StateLiteSerializer
-from .project import ProjectSerializer
-from .workspace import WorkSpaceSerializer
+from .user import UserLiteSerializer
+from .project import ProjectSerializer, ProjectLiteSerializer
+from .workspace import WorkspaceLiteSerializer
 from plane.db.models import (
     User,
     Issue,
@@ -30,7 +31,6 @@ from plane.db.models import (
     IssueAttachment,
     IssueReaction,
     CommentReaction,
-    IssueVote,
 )
 
 
@@ -53,11 +53,7 @@ class IssueFlatSerializer(BaseSerializer):
 
 
 class IssueProjectLiteSerializer(BaseSerializer):
-    project_detail = ProjectSerializer(
-        source="project",
-        fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"),
-        read_only=True,
-    )
+    project_detail = ProjectLiteSerializer(source="project", read_only=True)
 
     class Meta:
         model = Issue
@@ -74,12 +70,9 @@ class IssueProjectLiteSerializer(BaseSerializer):
 ## Find a better approach to save manytomany?
 class IssueCreateSerializer(BaseSerializer):
     state_detail = StateSerializer(read_only=True, source="state")
-    created_by_detail = UserSerializer(
-        source="created_by",
-        read_only=True,
-    )
-    project_detail = ProjectSerializer(source="project", read_only=True)
-    workspace_detail = WorkSpaceSerializer(source="workspace", read_only=True)
+    created_by_detail = UserLiteSerializer(read_only=True, source="created_by")
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
 
     assignees_list = serializers.ListField(
         child=serializers.PrimaryKeyRelatedField(queryset=User.objects.all()),
@@ -118,15 +111,6 @@ class IssueCreateSerializer(BaseSerializer):
             "updated_at",
         ]
 
-    def validate(self, data):
-        if (
-            data.get("start_date", None) is not None
-            and data.get("target_date", None) is not None
-            and data.get("start_date", None) > data.get("target_date", None)
-        ):
-            raise serializers.ValidationError("Start date cannot exceed target date")
-        return data
-
     def create(self, validated_data):
         blockers = validated_data.pop("blockers_list", None)
         assignees = validated_data.pop("assignees_list", None)
@@ -306,19 +290,35 @@ class IssueCreateSerializer(BaseSerializer):
 
 
 class IssueActivitySerializer(BaseSerializer):
-    actor_detail = UserSerializer(source="actor", read_only=True)
+    actor_detail = UserLiteSerializer(read_only=True, source="actor")
     issue_detail = IssueFlatSerializer(read_only=True, source="issue")
-    project_detail = ProjectSerializer(
-        source="project",
-        fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"),
-        read_only=True,
-    )
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
 
     class Meta:
         model = IssueActivity
         fields = "__all__"
 
 
+class IssueCommentSerializer(BaseSerializer):
+    actor_detail = UserLiteSerializer(read_only=True, source="actor")
+    issue_detail = IssueFlatSerializer(read_only=True, source="issue")
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
+
+    class Meta:
+        model = IssueComment
+        fields = "__all__"
+        read_only_fields = [
+            "workspace",
+            "project",
+            "issue",
+            "created_by",
+            "updated_by",
+            "created_at",
+            "updated_at",
+        ]
+
+
 class IssuePropertySerializer(BaseSerializer):
     class Meta:
         model = IssueProperty
@@ -331,14 +331,8 @@ class IssuePropertySerializer(BaseSerializer):
 
 
 class LabelSerializer(BaseSerializer):
-    workspace_detail = WorkSpaceSerializer(
-        source="workspace", fields=("id", "name", "slug"), read_only=True
-    )
-    project_detail = ProjectSerializer(
-        source="project",
-        fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"),
-        read_only=True,
-    )
+    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
+    project_detail = ProjectLiteSerializer(source="project", read_only=True)
 
     class Meta:
         model = Label
@@ -399,16 +393,12 @@ class BlockerIssueSerializer(BaseSerializer):
         read_only_fields = fields
 
 
-# class IssueAssigneeSerializer(BaseSerializer):
-#     assignee_details = UserSerializer(
-#         source="assignee",
-#         fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
-#         read_only=True,
-#     )
+class IssueAssigneeSerializer(BaseSerializer):
+    assignee_details = UserLiteSerializer(read_only=True, source="assignee")
 
-#     class Meta:
-#         model = IssueAssignee
-#         fields = "__all__"
+    class Meta:
+        model = IssueAssignee
+        fields = "__all__"
 
 
 class CycleBaseSerializer(BaseSerializer):
@@ -472,11 +462,7 @@ class IssueModuleDetailSerializer(BaseSerializer):
 
 
 class IssueLinkSerializer(BaseSerializer):
-    created_by_detail = UserSerializer(
-        source="created_by",
-        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
-        read_only=True,
-    )
+    created_by_detail = UserLiteSerializer(read_only=True, source="created_by")
 
     class Meta:
         model = IssueLink
@@ -530,11 +516,7 @@ class IssueReactionSerializer(BaseSerializer):
 
 
 class IssueReactionLiteSerializer(BaseSerializer):
-    actor_detail = UserSerializer(
-        source="actor",
-        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
-        read_only=True,
-    )
+    actor_detail = UserLiteSerializer(read_only=True, source="actor")
 
     class Meta:
         model = IssueReaction
@@ -547,11 +529,7 @@ class IssueReactionLiteSerializer(BaseSerializer):
 
 
 class CommentReactionLiteSerializer(BaseSerializer):
-    actor_detail = UserSerializer(
-        source="actor",
-        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
-        read_only=True,
-    )
+    actor_detail = UserLiteSerializer(read_only=True, source="actor")
 
     class Meta:
         model = CommentReaction
@@ -570,29 +548,15 @@ class CommentReactionSerializer(BaseSerializer):
         read_only_fields = ["workspace", "project", "comment", "actor"]
 
 
-class IssueVoteSerializer(BaseSerializer):
-    class Meta:
-        model = IssueVote
-        fields = ["issue", "vote", "workspace_id", "project_id", "actor"]
-        read_only_fields = fields
-
 
 class IssueCommentSerializer(BaseSerializer):
-    actor_detail = UserSerializer(source="actor", read_only=True)
+    actor_detail = UserLiteSerializer(read_only=True, source="actor")
     issue_detail = IssueFlatSerializer(read_only=True, source="issue")
-    project_detail = ProjectSerializer(
-        source="project",
-        fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"),
-        read_only=True,
-    )
-
-    workspace_details = WorkSpaceSerializer(
-        source="workspace",
-        fields=("id", "name", "slug"),
-        read_only=True,
-    )
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
     comment_reactions = CommentReactionLiteSerializer(read_only=True, many=True)
 
+
     class Meta:
         model = IssueComment
         fields = "__all__"
@@ -604,17 +568,12 @@ class IssueCommentSerializer(BaseSerializer):
             "updated_by",
             "created_at",
             "updated_at",
-            "access",
         ]
 
 
 class IssueStateFlatSerializer(BaseSerializer):
     state_detail = StateLiteSerializer(read_only=True, source="state")
-    project_detail = ProjectSerializer(
-        source="project",
-        fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"),
-        read_only=True,
-    )
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
 
     class Meta:
         model = Issue
@@ -631,17 +590,8 @@ class IssueStateFlatSerializer(BaseSerializer):
 class IssueStateSerializer(BaseSerializer):
     label_details = LabelLiteSerializer(read_only=True, source="labels", many=True)
     state_detail = StateLiteSerializer(read_only=True, source="state")
-    project_detail = ProjectSerializer(
-        source="project",
-        fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"),
-        read_only=True,
-    )
-    assignee_details = UserSerializer(
-        source="assignees",
-        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
-        read_only=True,
-        many=True,
-    )
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    assignee_details = UserLiteSerializer(read_only=True, source="assignees", many=True)
     sub_issues_count = serializers.IntegerField(read_only=True)
     bridge_id = serializers.UUIDField(read_only=True)
     attachment_count = serializers.IntegerField(read_only=True)
@@ -653,20 +603,11 @@ class IssueStateSerializer(BaseSerializer):
 
 
 class IssueSerializer(BaseSerializer):
-    project_detail = ProjectSerializer(
-        source="project",
-        fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"),
-        read_only=True,
-    )
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
     state_detail = StateSerializer(read_only=True, source="state")
     parent_detail = IssueStateFlatSerializer(read_only=True, source="parent")
     label_details = LabelSerializer(read_only=True, source="labels", many=True)
-    assignee_details = UserSerializer(
-        source="assignees",
-        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
-        read_only=True,
-        many=True,
-    )
+    assignee_details = UserLiteSerializer(read_only=True, source="assignees", many=True)
     # List of issues blocked by this issue
     blocked_issues = BlockedIssueSerializer(read_only=True, many=True)
     # List of issues that block this issue
@@ -692,24 +633,11 @@ class IssueSerializer(BaseSerializer):
 
 
 class IssueLiteSerializer(BaseSerializer):
-    workspace_detail = WorkSpaceSerializer(
-        source="workspace",
-        fields=("id", "name", "slug"),
-        read_only=True,
-    )
-    project_detail = ProjectSerializer(
-        source="project",
-        fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"),
-        read_only=True,
-    )
+    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
     state_detail = StateLiteSerializer(read_only=True, source="state")
     label_details = LabelLiteSerializer(read_only=True, source="labels", many=True)
-    assignee_details = UserSerializer(
-        source="assignees",
-        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
-        read_only=True,
-        many=True,
-    )
+    assignee_details = UserLiteSerializer(read_only=True, source="assignees", many=True)
     sub_issues_count = serializers.IntegerField(read_only=True)
     cycle_id = serializers.UUIDField(read_only=True)
     module_id = serializers.UUIDField(read_only=True)

apiserver/plane/api/serializers/module.py

@@ -3,9 +3,9 @@ from rest_framework import serializers
 
 # Module imports
 from .base import BaseSerializer
-from .user import UserSerializer
-from .project import ProjectSerializer
-from .workspace import WorkSpaceSerializer
+from .user import UserLiteSerializer
+from .project import ProjectSerializer, ProjectLiteSerializer
+from .workspace import WorkspaceLiteSerializer
 from .issue import IssueStateSerializer
 
 from plane.db.models import (
@@ -25,12 +25,8 @@ class ModuleWriteSerializer(BaseSerializer):
         required=False,
     )
 
-    project_detail = ProjectSerializer(source="project", fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
-    workspace_detail = WorkSpaceSerializer(
-        source="workspace",
-        fields=("id", "name", "slug"),
-        read_only=True,
-    ) 
+    project_detail = ProjectLiteSerializer(source="project", read_only=True)
+    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
 
     class Meta:
         model = Module
@@ -110,7 +106,7 @@ class ModuleFlatSerializer(BaseSerializer):
 
 class ModuleIssueSerializer(BaseSerializer):
     module_detail = ModuleFlatSerializer(read_only=True, source="module")
-    issue_detail = ProjectSerializer(source="issue", fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
+    issue_detail = ProjectLiteSerializer(read_only=True, source="issue")
     sub_issues_count = serializers.IntegerField(read_only=True)
 
     class Meta:
@@ -128,11 +124,7 @@ class ModuleIssueSerializer(BaseSerializer):
 
 
 class ModuleLinkSerializer(BaseSerializer):
-    created_by_detail = UserSerializer(
-        source="created_by",
-        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
-        read_only=True,
-    )
+    created_by_detail = UserLiteSerializer(read_only=True, source="created_by")
 
     class Meta:
         model = ModuleLink
@@ -159,18 +151,9 @@ class ModuleLinkSerializer(BaseSerializer):
 
 
 class ModuleSerializer(BaseSerializer):
-    project_detail = ProjectSerializer(source="project", fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
-    lead_detail = UserSerializer(
-        source="lead",
-        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
-        read_only=True,
-    )
-    members_detail = UserSerializer(
-        source="members",
-        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
-        read_only=True,
-        many=True,
-    )
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    lead_detail = UserLiteSerializer(read_only=True, source="lead")
+    members_detail = UserLiteSerializer(read_only=True, many=True, source="members")
     link_module = ModuleLinkSerializer(read_only=True, many=True)
     is_favorite = serializers.BooleanField(read_only=True)
     total_issues = serializers.IntegerField(read_only=True)

apiserver/plane/api/serializers/notification.py

@@ -1,16 +1,12 @@
 # Module imports
 from .base import BaseSerializer
-from .user import UserSerializer
+from .user import UserLiteSerializer
 from plane.db.models import Notification
 
-
 class NotificationSerializer(BaseSerializer):
-    triggered_by_details = UserSerializer(
-        source="triggered_by",
-        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
-        read_only=True,
-    )
+    triggered_by_details = UserLiteSerializer(read_only=True, source="triggered_by")
 
     class Meta:
         model = Notification
         fields = "__all__"
+

apiserver/plane/api/serializers/page.py

@@ -4,19 +4,15 @@ from rest_framework import serializers
 # Module imports
 from .base import BaseSerializer
 from .issue import IssueFlatSerializer, LabelLiteSerializer
-from .workspace import WorkSpaceSerializer
-from .project import ProjectSerializer
+from .workspace import WorkspaceLiteSerializer
+from .project import ProjectLiteSerializer
 from plane.db.models import Page, PageBlock, PageFavorite, PageLabel, Label
 
 
 class PageBlockSerializer(BaseSerializer):
     issue_detail = IssueFlatSerializer(source="issue", read_only=True)
-    project_detail = ProjectSerializer(source="project", fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
-    workspace_detail = WorkSpaceSerializer(
-        source="workspace",
-        fields=("id", "name", "slug"),
-        read_only=True,
-    ) 
+    project_detail = ProjectLiteSerializer(source="project", read_only=True)
+    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
 
     class Meta:
         model = PageBlock
@@ -43,12 +39,8 @@ class PageSerializer(BaseSerializer):
         required=False,
     )
     blocks = PageBlockLiteSerializer(read_only=True, many=True)
-    project_detail = ProjectSerializer(source="project", fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
-    workspace_detail = WorkSpaceSerializer(
-        source="workspace",
-        fields=("id", "name", "slug"),
-        read_only=True,
-    ) 
+    project_detail = ProjectLiteSerializer(source="project", read_only=True)
+    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
 
     class Meta:
         model = Page

apiserver/plane/api/serializers/people.py

@@ -0,0 +1,57 @@
+from rest_framework.serializers import (
+    ModelSerializer,
+    Serializer,
+    CharField,
+    SerializerMethodField,
+)
+from rest_framework.authtoken.models import Token
+from rest_framework_simplejwt.tokens import RefreshToken
+
+
+from plane.db.models import User
+
+
+class UserSerializer(ModelSerializer):
+    class Meta:
+        model = User
+        fields = "__all__"
+        extra_kwargs = {"password": {"write_only": True}}
+
+
+class ChangePasswordSerializer(Serializer):
+    model = User
+
+    """
+    Serializer for password change endpoint.
+    """
+    old_password = CharField(required=True)
+    new_password = CharField(required=True)
+
+
+class ResetPasswordSerializer(Serializer):
+    model = User
+
+    """
+    Serializer for password change endpoint.
+    """
+    new_password = CharField(required=True)
+    confirm_password = CharField(required=True)
+
+
+class TokenSerializer(ModelSerializer):
+
+    user = UserSerializer()
+    access_token = SerializerMethodField()
+    refresh_token = SerializerMethodField()
+
+    def get_access_token(self, obj):
+        refresh_token = RefreshToken.for_user(obj.user)
+        return str(refresh_token.access_token)
+
+    def get_refresh_token(self, obj):
+        refresh_token = RefreshToken.for_user(obj.user)
+        return str(refresh_token)
+
+    class Meta:
+        model = Token
+        fields = "__all__"

apiserver/plane/api/serializers/project.py

@@ -6,41 +6,19 @@ from rest_framework import serializers
 
 # Module imports
 from .base import BaseSerializer
-from plane.api.serializers.workspace import WorkSpaceSerializer
-from plane.api.serializers.user import UserSerializer
+from plane.api.serializers.workspace import WorkSpaceSerializer, WorkspaceLiteSerializer
+from plane.api.serializers.user import UserLiteSerializer
 from plane.db.models import (
     Project,
     ProjectMember,
     ProjectMemberInvite,
     ProjectIdentifier,
     ProjectFavorite,
-    ProjectDeployBoard,
 )
 
 
 class ProjectSerializer(BaseSerializer):
-    # workspace = WorkSpaceSerializer(read_only=True)
-    default_assignee = UserSerializer(
-        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
-        read_only=True,
-    )
-    project_lead = UserSerializer(
-        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
-        read_only=True,
-    )
-    is_favorite = serializers.BooleanField(read_only=True)
-    total_members = serializers.IntegerField(read_only=True)
-    total_cycles = serializers.IntegerField(read_only=True)
-    total_modules = serializers.IntegerField(read_only=True)
-    is_member = serializers.BooleanField(read_only=True)
-    sort_order = serializers.FloatField(read_only=True)
-    member_role = serializers.IntegerField(read_only=True)
-    is_deployed = serializers.BooleanField(read_only=True)
-    workspace_detail = WorkSpaceSerializer(
-        source="workspace",
-        # fields=("id", "name", "slug"),
-        read_only=True,
-    ) 
+    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
 
     class Meta:
         model = Project
@@ -99,24 +77,23 @@ class ProjectSerializer(BaseSerializer):
         raise serializers.ValidationError(detail="Project Identifier is already taken")
 
 
+class ProjectLiteSerializer(BaseSerializer):
+    class Meta:
+        model = Project
+        fields = ["id", "identifier", "name"]
+        read_only_fields = fields
+
+
 class ProjectDetailSerializer(BaseSerializer):
     workspace = WorkSpaceSerializer(read_only=True)
-    default_assignee = UserSerializer(
-        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
-        read_only=True,
-    )
-    project_lead = UserSerializer(
-        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
-        read_only=True,
-    )
+    default_assignee = UserLiteSerializer(read_only=True)
+    project_lead = UserLiteSerializer(read_only=True)
     is_favorite = serializers.BooleanField(read_only=True)
     total_members = serializers.IntegerField(read_only=True)
     total_cycles = serializers.IntegerField(read_only=True)
     total_modules = serializers.IntegerField(read_only=True)
     is_member = serializers.BooleanField(read_only=True)
     sort_order = serializers.FloatField(read_only=True)
-    member_role = serializers.IntegerField(read_only=True)
-    is_deployed = serializers.BooleanField(read_only=True)
 
     class Meta:
         model = Project
@@ -125,36 +102,8 @@ class ProjectDetailSerializer(BaseSerializer):
 
 class ProjectMemberSerializer(BaseSerializer):
     workspace = WorkSpaceSerializer(read_only=True)
-    project = ProjectSerializer(fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
-    member = UserSerializer(
-        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
-        read_only=True,
-    )
-
-    class Meta:
-        model = ProjectMember
-        fields = "__all__"
-
-
-class ProjectMemberAdminSerializer(BaseSerializer):
-    workspace = WorkSpaceSerializer(
-        source="workspace",
-        fields=("id", "name", "slug"),
-        read_only=True,
-    ) 
-    project = ProjectSerializer(fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
-    member = UserSerializer(
-        # fields=(
-        #     "id",
-        #     "first_name",
-        #     "last_name",
-        #     "avatar",
-        #     "is_bot",
-        #     "display_name",
-        #     "email",
-        # ),
-        read_only=True,
-    )
+    project = ProjectLiteSerializer(read_only=True)
+    member = UserLiteSerializer(read_only=True)
 
     class Meta:
         model = ProjectMember
@@ -162,11 +111,8 @@ class ProjectMemberAdminSerializer(BaseSerializer):
 
 
 class ProjectMemberInviteSerializer(BaseSerializer):
-    project = ProjectSerializer(fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
-    workspace = WorkSpaceSerializer(
-        fields=("id", "name", "slug"),
-        read_only=True,
-    ) 
+    project = ProjectLiteSerializer(read_only=True)
+    workspace = WorkspaceLiteSerializer(read_only=True)
 
     class Meta:
         model = ProjectMemberInvite
@@ -180,7 +126,7 @@ class ProjectIdentifierSerializer(BaseSerializer):
 
 
 class ProjectFavoriteSerializer(BaseSerializer):
-    project_detail = ProjectSerializer(source="project", fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
+    project_detail = ProjectLiteSerializer(source="project", read_only=True)
 
     class Meta:
         model = ProjectFavorite
@@ -191,31 +137,13 @@ class ProjectFavoriteSerializer(BaseSerializer):
         ]
 
 
+
+
 class ProjectMemberLiteSerializer(BaseSerializer):
-    member = UserSerializer(
-        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
-        read_only=True,
-    )
+    member = UserLiteSerializer(read_only=True)
     is_subscribed = serializers.BooleanField(read_only=True)
 
     class Meta:
         model = ProjectMember
         fields = ["member", "id", "is_subscribed"]
         read_only_fields = fields
-
-
-class ProjectDeployBoardSerializer(BaseSerializer):
-    project_details = ProjectSerializer(source="project", fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
-    workspace_detail = WorkSpaceSerializer(
-        source="workspace",
-        fields=("id", "name", "slug"),
-        read_only=True,
-    ) 
-
-    class Meta:
-        model = ProjectDeployBoard
-        fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "project" "anchor",
-        ]

apiserver/plane/api/serializers/state.py

@@ -1,14 +1,14 @@
 # Module imports
 from .base import BaseSerializer
-from .workspace import WorkSpaceSerializer
-from .project import ProjectSerializer
+from .workspace import WorkspaceLiteSerializer
+from .project import ProjectLiteSerializer
 
 from plane.db.models import State
 
 
 class StateSerializer(BaseSerializer):
-    workspace_detail = WorkSpaceSerializer(source="workspace", read_only=True)
-    project_detail = ProjectSerializer(source="project", read_only=True)
+    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
 
     class Meta:
         model = State

apiserver/plane/api/serializers/user.py

@@ -1,6 +1,3 @@
-# Third party imports
-from rest_framework import serializers
-
 # Module import
 from .base import BaseSerializer
 from plane.db.models import User
@@ -33,21 +30,18 @@ class UserSerializer(BaseSerializer):
             return bool(obj.first_name) or bool(obj.last_name)
 
 
-class ChangePasswordSerializer(serializers.Serializer):
-    model = User
-
-    """
-    Serializer for password change endpoint.
-    """
-    old_password = serializers.CharField(required=True)
-    new_password = serializers.CharField(required=True)
-
-
-class ResetPasswordSerializer(serializers.Serializer):
-    model = User
-
-    """
-    Serializer for password change endpoint.
-    """
-    new_password = serializers.CharField(required=True)
-    confirm_password = serializers.CharField(required=True)
+class UserLiteSerializer(BaseSerializer):
+    class Meta:
+        model = User
+        fields = [
+            "id",
+            "first_name",
+            "last_name",
+            "email",
+            "avatar",
+            "is_bot",
+        ]
+        read_only_fields = [
+            "id",
+            "is_bot",
+        ]

apiserver/plane/api/serializers/view.py

@@ -3,20 +3,16 @@ from rest_framework import serializers
 
 # Module imports
 from .base import BaseSerializer
-from .workspace import WorkSpaceSerializer
-from .project import ProjectSerializer
+from .workspace import WorkspaceLiteSerializer
+from .project import ProjectLiteSerializer
 from plane.db.models import IssueView, IssueViewFavorite
 from plane.utils.issue_filters import issue_filters
 
 
 class IssueViewSerializer(BaseSerializer):
     is_favorite = serializers.BooleanField(read_only=True)
-    project_detail = ProjectSerializer(source="project", fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
-    workspace_detail = WorkSpaceSerializer(
-        source="workspace",
-        fields=("id", "name", "slug"),
-        read_only=True,
-    ) 
+    project_detail = ProjectLiteSerializer(source="project", read_only=True)
+    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
 
     class Meta:
         model = IssueView

apiserver/plane/api/serializers/workspace.py

@@ -3,7 +3,7 @@ from rest_framework import serializers
 
 # Module imports
 from .base import BaseSerializer
-from .user import UserSerializer
+from .user import UserLiteSerializer
 
 from plane.db.models import (
     User,
@@ -17,10 +17,7 @@ from plane.db.models import (
 
 
 class WorkSpaceSerializer(BaseSerializer):
-    owner = UserSerializer(
-        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
-        read_only=True,
-    )
+    owner = UserLiteSerializer(read_only=True)
     total_members = serializers.IntegerField(read_only=True)
     total_issues = serializers.IntegerField(read_only=True)
 
@@ -38,14 +35,8 @@ class WorkSpaceSerializer(BaseSerializer):
 
 
 class WorkSpaceMemberSerializer(BaseSerializer):
-    member = UserSerializer(
-        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name" ,"email"),
-        read_only=True,
-    )
-    workspace = WorkSpaceSerializer(
-        fields=("id", "name", "slug"),
-        read_only=True,
-    )
+    member = UserLiteSerializer(read_only=True)
+    workspace = WorkSpaceSerializer(read_only=True)
 
     class Meta:
         model = WorkspaceMember
@@ -55,11 +46,7 @@ class WorkSpaceMemberSerializer(BaseSerializer):
 class WorkSpaceMemberInviteSerializer(BaseSerializer):
     workspace = WorkSpaceSerializer(read_only=True)
     total_members = serializers.IntegerField(read_only=True)
-    created_by_detail = UserSerializer(
-        source="created_by",
-        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
-        read_only=True,
-    )
+    created_by_detail = UserLiteSerializer(read_only=True, source="created_by")
 
     class Meta:
         model = WorkspaceMemberInvite
@@ -67,12 +54,7 @@ class WorkSpaceMemberInviteSerializer(BaseSerializer):
 
 
 class TeamSerializer(BaseSerializer):
-    members_detail = UserSerializer(
-        source="members",
-        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
-        read_only=True,
-        many=True,
-    )
+    members_detail = UserLiteSerializer(read_only=True, source="members", many=True)
     members = serializers.ListField(
         child=serializers.PrimaryKeyRelatedField(queryset=User.objects.all()),
         write_only=True,
@@ -119,6 +101,17 @@ class TeamSerializer(BaseSerializer):
             return super().update(instance, validated_data)
 
 
+class WorkspaceLiteSerializer(BaseSerializer):
+    class Meta:
+        model = Workspace
+        fields = [
+            "name",
+            "slug",
+            "id",
+        ]
+        read_only_fields = fields
+
+
 class WorkspaceThemeSerializer(BaseSerializer):
     class Meta:
         model = WorkspaceTheme

apiserver/plane/api/urls.py

@@ -32,7 +32,6 @@ from plane.api.views import (
     InviteWorkspaceEndpoint,
     JoinWorkspaceEndpoint,
     WorkSpaceMemberViewSet,
-    WorkspaceMembersEndpoint,
     WorkspaceInvitationsViewset,
     UserWorkspaceInvitationsEndpoint,
     WorkspaceMemberUserEndpoint,
@@ -60,7 +59,6 @@ from plane.api.views import (
     ProjectViewSet,
     InviteProjectEndpoint,
     ProjectMemberViewSet,
-    ProjectMemberEndpoint,
     ProjectMemberInvitationsViewset,
     ProjectMemberUserEndpoint,
     AddMemberToProjectEndpoint,
@@ -86,10 +84,8 @@ from plane.api.views import (
     IssueAttachmentEndpoint,
     IssueArchiveViewSet,
     IssueSubscriberViewSet,
-    IssueCommentPublicViewSet,
     IssueReactionViewSet,
     CommentReactionViewSet,
-    ExportIssuesEndpoint,
     ## End Issues
     # States
     StateViewSet,
@@ -166,15 +162,6 @@ from plane.api.views import (
     NotificationViewSet,
     UnreadNotificationEndpoint,
     ## End Notification
-    # Public Boards
-    ProjectDeployBoardViewSet,
-    ProjectDeployBoardIssuesPublicEndpoint,
-    ProjectDeployBoardPublicSettingsEndpoint,
-    IssueReactionPublicViewSet,
-    CommentReactionPublicViewSet,
-    InboxIssuePublicViewSet,
-    IssueVotePublicViewSet,
-    ## End Public Boards
 )
 
 
@@ -347,11 +334,6 @@ urlpatterns = [
         ),
         name="workspace",
     ),
-    path(
-        "workspaces/<str:slug>/workspace-members/",
-        WorkspaceMembersEndpoint.as_view(),
-        name="workspace-members",
-    ),
     path(
         "workspaces/<str:slug>/teams/",
         TeamMemberViewSet.as_view(
@@ -485,11 +467,6 @@ urlpatterns = [
         ),
         name="project",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/project-members/",
-        ProjectMemberEndpoint.as_view(),
-        name="project",
-    ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/members/add/",
         AddMemberToProjectEndpoint.as_view(),
@@ -831,11 +808,6 @@ urlpatterns = [
         IssueAttachmentEndpoint.as_view(),
         name="project-issue-attachments",
     ),
-    path(
-        "workspaces/<str:slug>/export-issues/",
-        ExportIssuesEndpoint.as_view(),
-        name="export-issues",
-    ),
     ## End Issues
     ## Issue Activity
     path(
@@ -1491,128 +1463,4 @@ urlpatterns = [
         name="unread-notifications",
     ),
     ## End Notification
-    # Public Boards
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/project-deploy-boards/",
-        ProjectDeployBoardViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
-        name="project-deploy-board",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/project-deploy-boards/<uuid:pk>/",
-        ProjectDeployBoardViewSet.as_view(
-            {
-                "get": "retrieve",
-                "patch": "partial_update",
-                "delete": "destroy",
-            }
-        ),
-        name="project-deploy-board",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/settings/",
-        ProjectDeployBoardPublicSettingsEndpoint.as_view(),
-        name="project-deploy-board-settings",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/",
-        ProjectDeployBoardIssuesPublicEndpoint.as_view(),
-        name="project-deploy-board",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/comments/",
-        IssueCommentPublicViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
-        name="issue-comments-project-board",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/comments/<uuid:pk>/",
-        IssueCommentPublicViewSet.as_view(
-            {
-                "get": "retrieve",
-                "patch": "partial_update",
-                "delete": "destroy",
-            }
-        ),
-        name="issue-comments-project-board",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/reactions/",
-        IssueReactionPublicViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
-        name="issue-reactions-project-board",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/reactions/<str:reaction_code>/",
-        IssueReactionPublicViewSet.as_view(
-            {
-                "delete": "destroy",
-            }
-        ),
-        name="issue-reactions-project-board",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/comments/<uuid:comment_id>/reactions/",
-        CommentReactionPublicViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
-        name="comment-reactions-project-board",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/comments/<uuid:comment_id>/reactions/<str:reaction_code>/",
-        CommentReactionPublicViewSet.as_view(
-            {
-                "delete": "destroy",
-            }
-        ),
-        name="comment-reactions-project-board",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/inboxes/<uuid:inbox_id>/inbox-issues/",
-        InboxIssuePublicViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
-        name="inbox-issue",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/inboxes/<uuid:inbox_id>/inbox-issues/<uuid:pk>/",
-        InboxIssuePublicViewSet.as_view(
-            {
-                "get": "retrieve",
-                "patch": "partial_update",
-                "delete": "destroy",
-            }
-        ),
-        name="inbox-issue",
-    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/votes/",
-        IssueVotePublicViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-                "delete": "destroy",
-            }
-        ),
-        name="issue-vote-project-board",
-    ),
-    ## End Public Boards
 ]

apiserver/plane/api/views/__init__.py

@@ -12,12 +12,8 @@ from .project import (
     ProjectUserViewsEndpoint,
     ProjectMemberUserEndpoint,
     ProjectFavoritesViewSet,
-    ProjectDeployBoardIssuesPublicEndpoint,
-    ProjectDeployBoardViewSet,
-    ProjectDeployBoardPublicSettingsEndpoint,
-    ProjectMemberEndpoint,
 )
-from .user import (
+from .people import (
     UserEndpoint,
     UpdateUserOnBoardedEndpoint,
     UpdateUserTourCompletedEndpoint,
@@ -51,7 +47,6 @@ from .workspace import (
     WorkspaceUserProfileEndpoint,
     WorkspaceUserProfileIssuesEndpoint,
     WorkspaceLabelsEndpoint,
-    WorkspaceMembersEndpoint,
 )
 from .state import StateViewSet
 from .view import IssueViewViewSet, ViewIssuesEndpoint, IssueViewFavoriteViewSet
@@ -78,12 +73,8 @@ from .issue import (
     IssueAttachmentEndpoint,
     IssueArchiveViewSet,
     IssueSubscriberViewSet,
-    IssueCommentPublicViewSet,
     CommentReactionViewSet,
     IssueReactionViewSet,
-    IssueReactionPublicViewSet,
-    CommentReactionPublicViewSet,
-    IssueVotePublicViewSet,
 )
 
 from .auth_extended import (
@@ -151,7 +142,7 @@ from .estimate import (
 
 from .release import ReleaseNotesEndpoint
 
-from .inbox import InboxViewSet, InboxIssueViewSet, InboxIssuePublicViewSet
+from .inbox import InboxViewSet, InboxIssueViewSet
 
 from .analytic import (
     AnalyticsEndpoint,
@@ -161,8 +152,4 @@ from .analytic import (
     DefaultAnalyticsEndpoint,
 )
 
-from .notification import NotificationViewSet, UnreadNotificationEndpoint
-
-from .exporter import (
-    ExportIssuesEndpoint,
-)
+from .notification import NotificationViewSet, UnreadNotificationEndpoint

apiserver/plane/api/views/analytic.py

@@ -79,12 +79,12 @@ class AnalyticsEndpoint(BaseAPIView):
                 )
 
             assignee_details = {}
-            if x_axis in ["assignees__id"] or segment in ["assignees__id"]:
+            if x_axis in ["assignees__email"] or segment in ["assignees__email"]:
                 assignee_details = (
                     Issue.issue_objects.filter(workspace__slug=slug, **filters, assignees__avatar__isnull=False)
                     .order_by("assignees__id")
                     .distinct("assignees__id")
-                    .values("assignees__avatar", "assignees__display_name", "assignees__first_name", "assignees__last_name", "assignees__id")
+                    .values("assignees__avatar", "assignees__email", "assignees__first_name", "assignees__last_name")
                 )
 
 
@@ -243,21 +243,21 @@ class DefaultAnalyticsEndpoint(BaseAPIView):
             )
             most_issue_created_user = (
                 queryset.exclude(created_by=None)
-                .values("created_by__first_name", "created_by__last_name", "created_by__avatar", "created_by__display_name", "created_by__id")
+                .values("created_by__first_name", "created_by__last_name", "created_by__avatar", "created_by__email")
                 .annotate(count=Count("id"))
                 .order_by("-count")
             )[:5]
 
             most_issue_closed_user = (
                 queryset.filter(completed_at__isnull=False, assignees__isnull=False)
-                .values("assignees__first_name", "assignees__last_name", "assignees__avatar", "assignees__display_name", "assignees__id")
+                .values("assignees__first_name", "assignees__last_name", "assignees__avatar", "assignees__email")
                 .annotate(count=Count("id"))
                 .order_by("-count")
             )[:5]
 
             pending_issue_user = (
                 queryset.filter(completed_at__isnull=True)
-                .values("assignees__first_name", "assignees__last_name", "assignees__avatar", "assignees__display_name", "assignees__id")
+                .values("assignees__first_name", "assignees__last_name", "assignees__avatar", "assignees__email")
                 .annotate(count=Count("id"))
                 .order_by("-count")
             )

apiserver/plane/api/views/auth_extended.py

@@ -22,7 +22,7 @@ from sentry_sdk import capture_exception
 
 ## Module imports
 from . import BaseAPIView
-from plane.api.serializers import (
+from plane.api.serializers.people import (
     ChangePasswordSerializer,
     ResetPasswordSerializer,
 )

apiserver/plane/api/views/cycle.py

@@ -56,10 +56,6 @@ class CycleViewSet(BaseViewSet):
     permission_classes = [
         ProjectEntityPermission,
     ]
-    # def get_serializer_class(self):
-    #     return (
-    #         CycleSerializer(nested_fields={"owned_by":("id", "first_name", "last_name", "avatar", "is_bot", "display_name")})
-    #     )
 
     def perform_create(self, serializer):
         serializer.save(
@@ -152,15 +148,13 @@ class CycleViewSet(BaseViewSet):
             .prefetch_related(
                 Prefetch(
                     "issue_cycle__issue__assignees",
-                    queryset=User.objects.only(
-                        "avatar", "first_name", "id").distinct(),
+                    queryset=User.objects.only("avatar", "first_name", "id").distinct(),
                 )
             )
             .prefetch_related(
                 Prefetch(
                     "issue_cycle__issue__labels",
-                    queryset=Label.objects.only(
-                        "name", "color", "id").distinct(),
+                    queryset=Label.objects.only("name", "color", "id").distinct(),
                 )
             )
             .order_by("-is_favorite", "name")
@@ -171,15 +165,11 @@ class CycleViewSet(BaseViewSet):
         try:
             queryset = self.get_queryset()
             cycle_view = request.GET.get("cycle_view", "all")
-            order_by = request.GET.get("order_by", "sort_order")
-
-            queryset = queryset.order_by(order_by)
 
             # All Cycles
             if cycle_view == "all":
                 return Response(
-                    CycleSerializer(queryset, fields=["id", "created_by", "created_at", "updated_at", "updated_by", "project", "workspace", "name", "description", "start_date", "end_date", "owned_by", "view_props", "sort_order", "is_favorite", "total_issues", "cancelled_issues", "completed_issues", "started_issues", "unstarted_issues"
-                    , "backlog_issues", "assignees", "labels", "total_estimates", "completed_estimates", "started_estimates",{"workspace_detail": ["id", "name","slug"]},{ "project_detail": ["id", "name", "cover_image", "icon_prop", "emoji", "description"]}, {"owned_by": ["id", "first_name", "last_name", "avatar", "is_bot", "display_name"]}], many=True).data, status=status.HTTP_200_OK
+                    CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
                 )
 
             # Current Cycle
@@ -189,8 +179,7 @@ class CycleViewSet(BaseViewSet):
                     end_date__gte=timezone.now(),
                 )
 
-                data = CycleSerializer(queryset,  fields=["id", "created_by", "created_at", "updated_at", "updated_by", "project", "workspace", "name", "description", "start_date", "end_date", "owned_by", "view_props", "sort_order", "is_favorite", "total_issues", "cancelled_issues", "completed_issues", "started_issues", "unstarted_issues"
-                    , "backlog_issues", "assignees", "labels", "total_estimates", "completed_estimates", "started_estimates",{"workspace_detail": ["id", "name","slug"]},{ "project_detail": ["id", "name", "cover_image", "icon_prop", "emoji", "description"]}, {"owned_by": ["id", "first_name", "last_name", "avatar", "is_bot", "display_name"]}], many=True).data
+                data = CycleSerializer(queryset, many=True).data
 
                 if len(data):
                     assignee_distribution = (
@@ -264,16 +253,14 @@ class CycleViewSet(BaseViewSet):
             if cycle_view == "upcoming":
                 queryset = queryset.filter(start_date__gt=timezone.now())
                 return Response(
-                    CycleSerializer(queryset, fields=["id", "created_by", "created_at", "updated_at", "updated_by", "project", "workspace", "name", "description", "start_date", "end_date", "owned_by", "view_props", "sort_order", "is_favorite", "total_issues", "cancelled_issues", "completed_issues", "started_issues", "unstarted_issues"
-                    , "backlog_issues", "assignees", "labels", "total_estimates", "completed_estimates", "started_estimates",{"workspace_detail": ["id", "name","slug"]},{ "project_detail": ["id", "name", "cover_image", "icon_prop", "emoji", "description"]}, {"owned_by": ["id", "first_name", "last_name", "avatar", "is_bot", "display_name"]}], many=True).data, status=status.HTTP_200_OK
+                    CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
                 )
 
             # Completed Cycles
             if cycle_view == "completed":
                 queryset = queryset.filter(end_date__lt=timezone.now())
                 return Response(
-                    CycleSerializer(queryset,  fields=["id", "created_by", "created_at", "updated_at", "updated_by", "project", "workspace", "name", "description", "start_date", "end_date", "owned_by", "view_props", "sort_order", "is_favorite", "total_issues", "cancelled_issues", "completed_issues", "started_issues", "unstarted_issues"
-                    , "backlog_issues", "assignees", "labels", "total_estimates", "completed_estimates", "started_estimates",{"workspace_detail": ["id", "name","slug"]},{ "project_detail": ["id", "name", "cover_image", "icon_prop", "emoji", "description"]}, {"owned_by": ["id", "first_name", "last_name", "avatar", "is_bot", "display_name"]}], many=True).data, status=status.HTTP_200_OK
+                    CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
                 )
 
             # Draft Cycles
@@ -284,19 +271,16 @@ class CycleViewSet(BaseViewSet):
                 )
 
                 return Response(
-                    CycleSerializer(queryset,  fields=["id", "created_by", "created_at", "updated_at", "updated_by", "project", "workspace", "name", "description", "start_date", "end_date", "owned_by", "view_props", "sort_order", "is_favorite", "total_issues", "cancelled_issues", "completed_issues", "started_issues", "unstarted_issues"
-                    , "backlog_issues", "assignees", "labels", "total_estimates", "completed_estimates", "started_estimates",{"workspace_detail": ["id", "name","slug"]},{ "project_detail": ["id", "name", "cover_image", "icon_prop", "emoji", "description"]}, {"owned_by": ["id", "first_name", "last_name", "avatar", "is_bot", "display_name"]}], many=True).data, status=status.HTTP_200_OK
+                    CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
                 )
 
             # Incomplete Cycles
             if cycle_view == "incomplete":
                 queryset = queryset.filter(
-                    Q(end_date__gte=timezone.now().date()) | Q(
-                        end_date__isnull=True),
+                    Q(end_date__gte=timezone.now().date()) | Q(end_date__isnull=True),
                 )
                 return Response(
-                    CycleSerializer(queryset,  fields=["id", "created_by", "created_at", "updated_at", "updated_by", "project", "workspace", "name", "description", "start_date", "end_date", "owned_by", "view_props", "sort_order", "is_favorite", "total_issues", "cancelled_issues", "completed_issues", "started_issues", "unstarted_issues"
-                    , "backlog_issues", "assignees", "labels", "total_estimates", "completed_estimates", "started_estimates",{"workspace_detail": ["id", "name","slug"]},{ "project_detail": ["id", "name", "cover_image", "icon_prop", "emoji", "description"]}, {"owned_by": ["id", "first_name", "last_name", "avatar", "is_bot", "display_name"]}], many=True).data, status=status.HTTP_200_OK
+                    CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
                 )
 
             return Response(
@@ -319,8 +303,7 @@ class CycleViewSet(BaseViewSet):
                 request.data.get("start_date", None) is not None
                 and request.data.get("end_date", None) is not None
             ):
-                serializer = CycleSerializer(data=request.data,  fields=["id", "created_by", "created_at", "updated_at", "updated_by", "project", "workspace", "name", "description", "start_date", "end_date", "owned_by", "view_props", "sort_order", "is_favorite", "total_issues", "cancelled_issues", "completed_issues", "started_issues", "unstarted_issues"
-                    , "backlog_issues", "assignees", "labels", "total_estimates", "completed_estimates", "started_estimates",{"workspace_detail": ["id", "name","slug"]},{ "project_detail": ["id", "name", "cover_image", "icon_prop", "emoji", "description"]}, {"owned_by": ["id", "first_name", "last_name", "avatar", "is_bot", "display_name"]}])
+                serializer = CycleSerializer(data=request.data)
                 if serializer.is_valid():
                     serializer.save(
                         project_id=project_id,
@@ -356,8 +339,7 @@ class CycleViewSet(BaseViewSet):
                     status=status.HTTP_400_BAD_REQUEST,
                 )
 
-            serializer = CycleWriteSerializer(
-                cycle, data=request.data, partial=True)
+            serializer = CycleWriteSerializer(cycle, data=request.data, partial=True)
             if serializer.is_valid():
                 serializer.save()
                 return Response(serializer.data, status=status.HTTP_200_OK)
@@ -388,8 +370,7 @@ class CycleViewSet(BaseViewSet):
                 .annotate(last_name=F("assignees__last_name"))
                 .annotate(assignee_id=F("assignees__id"))
                 .annotate(avatar=F("assignees__avatar"))
-                .annotate(display_name=F("assignees__display_name"))
-                .values("first_name", "last_name", "assignee_id", "avatar", "display_name")
+                .values("first_name", "last_name", "assignee_id", "avatar")
                 .annotate(total_issues=Count("assignee_id"))
                 .annotate(
                     completed_issues=Count(
@@ -433,8 +414,7 @@ class CycleViewSet(BaseViewSet):
                 .order_by("label_name")
             )
 
-            data = CycleSerializer(queryset, fields=["id", "created_by", "created_at", "updated_at", "updated_by", "project", "workspace", "name", "description", "start_date", "end_date", "owned_by", "view_props", "sort_order", "is_favorite", "total_issues", "cancelled_issues", "completed_issues", "started_issues", "unstarted_issues"
-                    , "backlog_issues", "assignees", "labels", "total_estimates", "completed_estimates", "started_estimates",{"workspace_detail": ["id", "name","slug"]},{ "project_detail": ["id", "name", "cover_image", "icon_prop", "emoji", "description"]}, {"owned_by": ["id", "first_name", "last_name", "avatar", "is_bot", "display_name"]}]).data
+            data = CycleSerializer(queryset).data
             data["distribution"] = {
                 "assignees": assignee_distribution,
                 "labels": label_distribution,
@@ -502,8 +482,7 @@ class CycleIssueViewSet(BaseViewSet):
             super()
             .get_queryset()
             .annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("issue_id"))
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("issue_id"))
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
@@ -529,8 +508,7 @@ class CycleIssueViewSet(BaseViewSet):
             issues = (
                 Issue.issue_objects.filter(issue_cycle__cycle_id=cycle_id)
                 .annotate(
-                    sub_issues_count=Issue.issue_objects.filter(
-                        parent=OuterRef("id"))
+                    sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
                     .order_by()
                     .annotate(count=Func(F("id"), function="Count"))
                     .values("count")

apiserver/plane/api/views/estimate.py

@@ -13,6 +13,7 @@ from plane.db.models import Project, Estimate, EstimatePoint
 from plane.api.serializers import (
     EstimateSerializer,
     EstimatePointSerializer,
+    EstimateReadSerializer,
 )
 
 
@@ -50,38 +51,10 @@ class BulkEstimatePointEndpoint(BaseViewSet):
 
     def list(self, request, slug, project_id):
         try:
-            estimates = (
-                Estimate.objects.filter(workspace__slug=slug, project_id=project_id)
-                .prefetch_related("points")
-                .select_related("workspace", "project")
-            )
-            serializer = EstimateSerializer(
-                estimates,
-                fields=[
-                    "id",
-                    "created_at",
-                    "created_by",
-                    "updated_at",
-                    "updated_by",
-                    "workspace",
-                    "project",
-                    {"workspace_detail": ["id", "name", "slug"]},
-                    {
-                        "project_detail": [
-                            "id",
-                            "name",
-                            "cover_image",
-                            "icon_prop",
-                            "emoji",
-                            "description",
-                        ]
-                    },
-                    "name",
-                    "points",
-                    "description",
-                ],
-                many=True,
-            )
+            estimates = Estimate.objects.filter(
+                workspace__slug=slug, project_id=project_id
+            ).prefetch_related("points").select_related("workspace", "project")
+            serializer = EstimateReadSerializer(estimates, many=True)
             return Response(serializer.data, status=status.HTTP_200_OK)
         except Exception as e:
             capture_exception(e)
@@ -106,31 +79,7 @@ class BulkEstimatePointEndpoint(BaseViewSet):
                     status=status.HTTP_400_BAD_REQUEST,
                 )
 
-            estimate_serializer = EstimateSerializer(
-                data=request.data.get("estimate"),
-                fields=[
-                    "id",
-                    "created_at",
-                    "created_by",
-                    "updated_at",
-                    "updated_by",
-                    "workspace",
-                    "project",
-                    {"workspace_detail": ["id", "name", "slug"]},
-                    {
-                        "project_detail": [
-                            "id",
-                            "name",
-                            "cover_image",
-                            "icon_prop",
-                            "emoji",
-                            "description",
-                        ]
-                    },
-                    "name",
-                    "description",
-                ],
-            )
+            estimate_serializer = EstimateSerializer(data=request.data.get("estimate"))
             if not estimate_serializer.is_valid():
                 return Response(
                     estimate_serializer.errors, status=status.HTTP_400_BAD_REQUEST
@@ -188,32 +137,7 @@ class BulkEstimatePointEndpoint(BaseViewSet):
             estimate = Estimate.objects.get(
                 pk=estimate_id, workspace__slug=slug, project_id=project_id
             )
-            serializer = EstimateSerializer(
-                estimate,
-                fields=[
-                    "id",
-                    "created_at",
-                    "created_by",
-                    "updated_at",
-                    "updated_by",
-                    "workspace",
-                    "project",
-                    {"workspace_detail": ["id", "name", "slug"]},
-                    {
-                        "project_detail": [
-                            "id",
-                            "name",
-                            "cover_image",
-                            "icon_prop",
-                            "emoji",
-                            "description",
-                        ]
-                    },
-                    "name",
-                    "points",
-                    "description",
-                ],
-            )
+            serializer = EstimateReadSerializer(estimate)
             return Response(
                 serializer.data,
                 status=status.HTTP_200_OK,
@@ -246,31 +170,7 @@ class BulkEstimatePointEndpoint(BaseViewSet):
             estimate = Estimate.objects.get(pk=estimate_id)
 
             estimate_serializer = EstimateSerializer(
-                estimate,
-                data=request.data.get("estimate"),
-                fields=[
-                    "id",
-                    "created_at",
-                    "created_by",
-                    "updated_at",
-                    "updated_by",
-                    "workspace",
-                    "project",
-                    {"workspace_detail": ["id", "name", "slug"]},
-                    {
-                        "project_detail": [
-                            "id",
-                            "name",
-                            "cover_image",
-                            "icon_prop",
-                            "emoji",
-                            "description",
-                        ]
-                    },
-                    "name",
-                    "description",
-                ],
-                partial=True,
+                estimate, data=request.data.get("estimate"), partial=True
             )
             if not estimate_serializer.is_valid():
                 return Response(
@@ -311,9 +211,7 @@ class BulkEstimatePointEndpoint(BaseViewSet):
 
             try:
                 EstimatePoint.objects.bulk_update(
-                    updated_estimate_points,
-                    ["value"],
-                    batch_size=10,
+                    updated_estimate_points, ["value"], batch_size=10,
                 )
             except IntegrityError as e:
                 return Response(
@@ -321,9 +219,7 @@ class BulkEstimatePointEndpoint(BaseViewSet):
                     status=status.HTTP_400_BAD_REQUEST,
                 )
 
-            estimate_point_serializer = EstimatePointSerializer(
-                estimate_points, many=True
-            )
+            estimate_point_serializer = EstimatePointSerializer(estimate_points, many=True)
             return Response(
                 {
                     "estimate": estimate_serializer.data,

apiserver/plane/api/views/exporter.py

@@ -1,124 +0,0 @@
-# Third Party imports
-from rest_framework.response import Response
-from rest_framework import status
-from sentry_sdk import capture_exception
-
-# Module imports
-from . import BaseAPIView
-from plane.api.permissions import WorkSpaceAdminPermission
-from plane.bgtasks.export_task import issue_export_task
-from plane.db.models import Project, ExporterHistory, Workspace
-
-from plane.api.serializers import ExporterHistorySerializer
-
-
-class ExportIssuesEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkSpaceAdminPermission,
-    ]
-    model = ExporterHistory
-    serializer_class = ExporterHistorySerializer
-
-    def post(self, request, slug):
-        try:
-            # Get the workspace
-            workspace = Workspace.objects.get(slug=slug)
-
-            provider = request.data.get("provider", False)
-            multiple = request.data.get("multiple", False)
-            project_ids = request.data.get("project", [])
-
-            if provider in ["csv", "xlsx", "json"]:
-                if not project_ids:
-                    project_ids = Project.objects.filter(
-                        workspace__slug=slug
-                    ).values_list("id", flat=True)
-                    project_ids = [str(project_id) for project_id in project_ids]
-
-                exporter = ExporterHistory.objects.create(
-                    workspace=workspace,
-                    project=project_ids,
-                    initiated_by=request.user,
-                    provider=provider,
-                )
-
-                issue_export_task.delay(
-                    provider=exporter.provider,
-                    workspace_id=workspace.id,
-                    project_ids=project_ids,
-                    token_id=exporter.token,
-                    multiple=multiple,
-                    slug=slug,
-                )
-                return Response(
-                    {
-                        "message": f"Once the export is ready you will be able to download it"
-                    },
-                    status=status.HTTP_200_OK,
-                )
-            else:
-                return Response(
-                    {"error": f"Provider '{provider}' not found."},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-        except Workspace.DoesNotExist:
-            return Response(
-                {"error": "Workspace does not exists"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-    def get(self, request, slug):
-        try:
-            exporter_history = ExporterHistory.objects.filter(
-                workspace__slug=slug
-            ).select_related("workspace", "initiated_by")
-
-            if request.GET.get("per_page", False) and request.GET.get("cursor", False):
-                return self.paginate(
-                    request=request,
-                    queryset=exporter_history,
-                    on_results=lambda exporter_history: ExporterHistorySerializer(
-                        exporter_history,
-                        fields=[
-                            "id",
-                            "created_by",
-                            "created_at",
-                            "updated_at",
-                            "updated_by",
-                            "initiated_by",
-                            "status",
-                            "url",
-                            "token",
-                            "project",
-                            "provider",
-                            {
-                                "initiated_by_detail": [
-                                    "id",
-                                    "first_name",
-                                    "last_name",
-                                    "avatar",
-                                    "is_bot",
-                                    "display_name",
-                                ]
-                            },
-                        ],
-                        many=True,
-                    ).data,
-                )
-            else:
-                return Response(
-                    {"error": "per_page and cursor are required"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )

apiserver/plane/api/views/gpt.py

@@ -14,7 +14,7 @@ from django.conf import settings
 from .base import BaseAPIView
 from plane.api.permissions import ProjectEntityPermission
 from plane.db.models import Workspace, Project
-from plane.api.serializers import ProjectSerializer, WorkSpaceSerializer
+from plane.api.serializers import ProjectLiteSerializer, WorkspaceLiteSerializer
 
 
 class GPTIntegrationEndpoint(BaseAPIView):
@@ -57,26 +57,8 @@ class GPTIntegrationEndpoint(BaseAPIView):
                 {
                     "response": text,
                     "response_html": text_html,
-                    "project_detail": ProjectSerializer(
-                        project,
-                        fields=[
-                            "id",
-                            "name",
-                            "cover_image",
-                            "icon_prop",
-                            "emoji",
-                            "description",
-                            "created_by",
-                            "updated_by",
-                            "created_at",
-                            "updated_at",
-                        ],
-                        read_only=True,
-                    ).data,
-                    "workspace_detail": WorkSpaceSerializer(
-                        workspace,
-                        fields=["id", "name", "slug"],
-                    ).data,
+                    "project_detail": ProjectLiteSerializer(project).data,
+                    "workspace_detail": WorkspaceLiteSerializer(workspace).data,
                 },
                 status=status.HTTP_200_OK,
             )

apiserver/plane/api/views/importer.py

@@ -42,6 +42,7 @@ from plane.utils.html_processor import strip_tags
 
 
 class ServiceIssueImportSummaryEndpoint(BaseAPIView):
+
     def get(self, request, slug, service):
         try:
             if service == "github":
@@ -176,47 +177,7 @@ class ImportServiceEndpoint(BaseAPIView):
                 )
 
                 service_importer.delay(service, importer.id)
-                serializer = ImporterSerializer(
-                    importer,
-                    fields=[
-                        "id",
-                        "created_by",
-                        "created_at",
-                        "updated_at",
-                        "updated_by",
-                        "workspace",
-                        "project",
-                        "service",
-                        "status",
-                        "initiated_by",
-                        "metadata",
-                        "config",
-                        "data",
-                        "token",
-                        "imported_data",
-                        {
-                            "initiated_by_detail": [
-                                "id",
-                                "first_name",
-                                "last_name",
-                                "avatar",
-                                "is_bot",
-                                "display_name",
-                            ],
-                        },
-                        {
-                            "project_detail": [
-                                "id",
-                                "name",
-                                "cover_image",
-                                "icon_prop",
-                                "emoji",
-                                "description",
-                            ]
-                        },
-                        {"workspace_detail": ["id", "name", "slug"]},
-                    ],
-                )
+                serializer = ImporterSerializer(importer)
                 return Response(serializer.data, status=status.HTTP_201_CREATED)
 
             if service == "jira":
@@ -252,47 +213,7 @@ class ImportServiceEndpoint(BaseAPIView):
                 )
 
                 service_importer.delay(service, importer.id)
-                serializer = ImporterSerializer(
-                    importer,
-                    fields=[
-                        "id",
-                        "created_by",
-                        "created_at",
-                        "updated_at",
-                        "updated_by",
-                        "workspace",
-                        "project",
-                        "service",
-                        "status",
-                        "initiated_by",
-                        "metadata",
-                        "config",
-                        "data",
-                        "token",
-                        "imported_data",
-                        {
-                            "initiated_by_detail": [
-                                "id",
-                                "first_name",
-                                "last_name",
-                                "avatar",
-                                "is_bot",
-                                "display_name",
-                            ],
-                        },
-                        {
-                            "project_detail": [
-                                "id",
-                                "name",
-                                "cover_image",
-                                "icon_prop",
-                                "emoji",
-                                "description",
-                            ]
-                        },
-                        {"workspace_detail": ["id", "name", "slug"]},
-                    ],
-                )
+                serializer = ImporterSerializer(importer)
                 return Response(serializer.data, status=status.HTTP_201_CREATED)
 
             return Response(
@@ -322,48 +243,7 @@ class ImportServiceEndpoint(BaseAPIView):
                 .order_by("-created_at")
                 .select_related("initiated_by", "project", "workspace")
             )
-            serializer = ImporterSerializer(
-                imports,
-                fields=[
-                    "id",
-                    "created_by",
-                    "created_at",
-                    "updated_at",
-                    "updated_by",
-                    "workspace",
-                    "project",
-                    "service",
-                    "status",
-                    "initiated_by",
-                    "metadata",
-                    "config",
-                    "data",
-                    "token",
-                    "imported_data",
-                    {
-                        "initiated_by_detail": [
-                            "id",
-                            "first_name",
-                            "last_name",
-                            "avatar",
-                            "is_bot",
-                            "display_name",
-                        ],
-                    },
-                    {
-                        "project_detail": [
-                            "id",
-                            "name",
-                            "cover_image",
-                            "icon_prop",
-                            "emoji",
-                            "description",
-                        ]
-                    },
-                    {"workspace_detail": ["id", "name", "slug"]},
-                ],
-                many=True,
-            )
+            serializer = ImporterSerializer(imports, many=True)
             return Response(serializer.data)
         except Exception as e:
             capture_exception(e)
@@ -404,49 +284,7 @@ class ImportServiceEndpoint(BaseAPIView):
             importer = Importer.objects.get(
                 pk=pk, service=service, workspace__slug=slug
             )
-            serializer = ImporterSerializer(
-                importer,
-                fields=[
-                    "id",
-                    "created_by",
-                    "created_at",
-                    "updated_at",
-                    "updated_by",
-                    "workspace",
-                    "project",
-                    "service",
-                    "status",
-                    "initiated_by",
-                    "metadata",
-                    "config",
-                    "data",
-                    "token",
-                    "imported_data",
-                    {
-                        "initiated_by_detail": [
-                            "id",
-                            "first_name",
-                            "last_name",
-                            "avatar",
-                            "is_bot",
-                            "display_name",
-                        ],
-                    },
-                    {
-                        "project_detail": [
-                            "id",
-                            "name",
-                            "cover_image",
-                            "icon_prop",
-                            "emoji",
-                            "description",
-                        ]
-                    },
-                    {"workspace_detail": ["id", "name", "slug"]},
-                ],
-                data=request.data,
-                partial=True,
-            )
+            serializer = ImporterSerializer(importer, data=request.data, partial=True)
             if serializer.is_valid():
                 serializer.save()
                 return Response(serializer.data, status=status.HTTP_200_OK)
@@ -494,7 +332,7 @@ class BulkImportIssuesEndpoint(BaseAPIView):
             # if there is no default state assign any random state
             if default_state is None:
                 default_state = State.objects.filter(
-                    ~Q(name="Triage"), project_id=project_id
+                    ~Q(name="Triage"), sproject_id=project_id
                 ).first()
 
             # Get the maximum sequence_id
@@ -620,7 +458,7 @@ class BulkImportIssuesEndpoint(BaseAPIView):
                         actor=request.user,
                         project_id=project_id,
                         workspace_id=project.workspace_id,
-                        comment=f"imported the issue from {service}",
+                        comment=f"{request.user.email} importer the issue from {service}",
                         verb="created",
                         created_by=request.user,
                     )

apiserver/plane/api/views/inbox.py

@@ -15,6 +15,7 @@ from sentry_sdk import capture_exception
 from .base import BaseViewSet
 from plane.api.permissions import ProjectBasePermission, ProjectLitePermission
 from plane.db.models import (
+    Project,
     Inbox,
     InboxIssue,
     Issue,
@@ -22,7 +23,6 @@ from plane.db.models import (
     IssueLink,
     IssueAttachment,
     ProjectMember,
-    ProjectDeployBoard,
 )
 from plane.api.serializers import (
     IssueSerializer,
@@ -152,22 +152,7 @@ class InboxIssueViewSet(BaseViewSet):
                     )
                 )
             )
-            issues_data = IssueStateInboxSerializer(
-                issues,
-                fields=[
-                    {
-                        "assignee_details": (
-                            "id",
-                            "first_name",
-                            "last_name",
-                            "avatar",
-                            "is_bot",
-                            "display_name",
-                        )
-                    }
-                ],
-                many=True,
-            ).data
+            issues_data = IssueStateInboxSerializer(issues, many=True).data
             return Response(
                 issues_data,
                 status=status.HTTP_200_OK,
@@ -237,19 +222,7 @@ class InboxIssueViewSet(BaseViewSet):
                 source=request.data.get("source", "in-app"),
             )
 
-            serializer = IssueStateInboxSerializer(
-                issue,
-                nested_fields={
-                    "assignee_details": (
-                        "id",
-                        "first_name",
-                        "last_name",
-                        "avatar",
-                        "is_bot",
-                        "display_name",
-                    )
-                },
-            )
+            serializer = IssueStateInboxSerializer(issue)
             return Response(serializer.data, status=status.HTTP_200_OK)
         except Exception as e:
             capture_exception(e)
@@ -264,17 +237,10 @@ class InboxIssueViewSet(BaseViewSet):
                 pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
             )
             # Get the project member
-            project_member = ProjectMember.objects.get(
-                workspace__slug=slug, project_id=project_id, member=request.user
-            )
+            project_member = ProjectMember.objects.get(workspace__slug=slug, project_id=project_id, member=request.user)
             # Only project members admins and created_by users can access this endpoint
-            if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(
-                request.user.id
-            ):
-                return Response(
-                    {"error": "You cannot edit inbox issues"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
+            if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(request.user.id):
+                return Response({"error": "You cannot edit inbox issues"}, status=status.HTTP_400_BAD_REQUEST)
 
             # Get issue data
             issue_data = request.data.pop("issue", False)
@@ -285,99 +251,15 @@ class InboxIssueViewSet(BaseViewSet):
                 )
                 # Only allow guests and viewers to edit name and description
                 if project_member.role <= 10:
-                    # viewers and guests since only viewers and guests
+                    # viewers and guests since only viewers and guests 
                     issue_data = {
                         "name": issue_data.get("name", issue.name),
-                        "description_html": issue_data.get(
-                            "description_html", issue.description_html
-                        ),
-                        "description": issue_data.get("description", issue.description),
+                        "description_html": issue_data.get("description_html", issue.description_html),
+                        "description": issue_data.get("description", issue.description)
                     }
 
                 issue_serializer = IssueCreateSerializer(
-                    issue,
-                    data=issue_data,
-                    fields=[
-                        {
-                            "created_by_detail": [
-                                "id",
-                                "first_name",
-                                "last_name",
-                                "avatar",
-                                "is_bot",
-                                "display_name",
-                            ]
-                        },
-                        {
-                            "state_detail": [
-                                "id",
-                                "created_by",
-                                "created_at",
-                                "updated_at",
-                                "updated_by",
-                                "name",
-                                "description",
-                                "color",
-                                "slug",
-                                "sequence",
-                                "group",
-                                "default",
-                                "project",
-                                "workspace",
-                                {"workspace_detail": ["id", "name", "slug"]},
-                                {
-                                    "project_detail": [
-                                        "id",
-                                        "name",
-                                        "cover_image",
-                                        "icon_prop",
-                                        "emoji",
-                                        "description",
-                                    ]
-                                },
-                            ],
-                        },
-                        {
-                            "project_detail": [
-                                "id",
-                                "name",
-                                "cover_image",
-                                "icon_prop",
-                                "emoji",
-                                "description",
-                            ]
-                        },
-                        {"workspace_detail": ["id", "name", "slug"]},
-                        "id",
-                        "created_at",
-                        "created_by",
-                        "updated_at",
-                        "updated_by",
-                        "workspace",
-                        "project",
-                        "assignees_list",
-                        "blockers_list",
-                        "labels_list",
-                        "blocks_list",
-                        "PRIORITY_CHOICES",
-                        "parent",
-                        "state",
-                        "estimate_point",
-                        "name",
-                        "description",
-                        "description_html",
-                        "description_stripped",
-                        "priority",
-                        "start_date",
-                        "target_date",
-                        "assignees",
-                        "sequence_id",
-                        "labels",
-                        "sort_order",
-                        "completed_at",
-                        "archived_at",
-                    ],
-                    partial=True,
+                    issue, data=issue_data, partial=True
                 )
 
                 if issue_serializer.is_valid():
@@ -405,30 +287,7 @@ class InboxIssueViewSet(BaseViewSet):
             # Only project admins and members can edit inbox issue attributes
             if project_member.role > 10:
                 serializer = InboxIssueSerializer(
-                    inbox_issue,
-                    fields=[
-                        {
-                            "project_detail": [
-                                "id",
-                                "name",
-                                "cover_image",
-                                "icon_prop",
-                                "emoji",
-                                "description",
-                            ]
-                        },
-                        "id",
-                        "created_at",
-                        "updated_at",
-                        "inbox",
-                        "issue",
-                        "status",
-                        "snoozed_till",
-                        "duplicate_to",
-                        "source",
-                    ],
-                    data=request.data,
-                    partial=True,
+                    inbox_issue, data=request.data, partial=True
                 )
 
                 if serializer.is_valid():
@@ -441,9 +300,7 @@ class InboxIssueViewSet(BaseViewSet):
                             project_id=project_id,
                         )
                         state = State.objects.filter(
-                            group="cancelled",
-                            workspace__slug=slug,
-                            project_id=project_id,
+                            group="cancelled", workspace__slug=slug, project_id=project_id
                         ).first()
                         if state is not None:
                             issue.state = state
@@ -461,9 +318,7 @@ class InboxIssueViewSet(BaseViewSet):
                         if issue.state.name == "Triage":
                             # Move to default state
                             state = State.objects.filter(
-                                workspace__slug=slug,
-                                project_id=project_id,
-                                default=True,
+                                workspace__slug=slug, project_id=project_id, default=True
                             ).first()
                             if state is not None:
                                 issue.state = state
@@ -472,9 +327,7 @@ class InboxIssueViewSet(BaseViewSet):
                     return Response(serializer.data, status=status.HTTP_200_OK)
                 return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
             else:
-                return Response(
-                    InboxIssueSerializer(inbox_issue).data, status=status.HTTP_200_OK
-                )
+                return Response(InboxIssueSerializer(inbox_issue).data, status=status.HTTP_200_OK)
         except InboxIssue.DoesNotExist:
             return Response(
                 {"error": "Inbox Issue does not exist"},
@@ -495,19 +348,7 @@ class InboxIssueViewSet(BaseViewSet):
             issue = Issue.objects.get(
                 pk=inbox_issue.issue_id, workspace__slug=slug, project_id=project_id
             )
-            serializer = IssueStateInboxSerializer(
-                issue,
-                nested_fields={
-                    "assignee_details": (
-                        "id",
-                        "first_name",
-                        "last_name",
-                        "avatar",
-                        "is_bot",
-                        "display_name",
-                    )
-                },
-            )
+            serializer = IssueStateInboxSerializer(issue)
             return Response(serializer.data, status=status.HTTP_200_OK)
         except Exception as e:
             capture_exception(e)
@@ -522,452 +363,18 @@ class InboxIssueViewSet(BaseViewSet):
                 pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
             )
             # Get the project member
-            project_member = ProjectMember.objects.get(
-                workspace__slug=slug, project_id=project_id, member=request.user
-            )
+            project_member = ProjectMember.objects.get(workspace__slug=slug, project_id=project_id, member=request.user)
 
-            if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(
-                request.user.id
-            ):
-                return Response(
-                    {"error": "You cannot delete inbox issue"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
+            if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(request.user.id):
+                return Response({"error": "You cannot delete inbox issue"}, status=status.HTTP_400_BAD_REQUEST)
 
             inbox_issue.delete()
             return Response(status=status.HTTP_204_NO_CONTENT)
         except InboxIssue.DoesNotExist:
-            return Response(
-                {"error": "Inbox Issue does not exists"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
+            return Response({"error": "Inbox Issue does not exists"}, status=status.HTTP_400_BAD_REQUEST)
         except Exception as e:
             capture_exception(e)
             return Response(
                 {"error": "Something went wrong please try again later"},
                 status=status.HTTP_400_BAD_REQUEST,
-            )
-
-
-class InboxIssuePublicViewSet(BaseViewSet):
-    serializer_class = InboxIssueSerializer
-    model = InboxIssue
-
-    filterset_fields = [
-        "status",
-    ]
-
-    def get_queryset(self):
-        project_deploy_board = ProjectDeployBoard.objects.get(
-            workspace__slug=self.kwargs.get("slug"),
-            project_id=self.kwargs.get("project_id"),
-        )
-        if project_deploy_board is not None:
-            return self.filter_queryset(
-                super()
-                .get_queryset()
-                .filter(
-                    Q(snoozed_till__gte=timezone.now()) | Q(snoozed_till__isnull=True),
-                    project_id=self.kwargs.get("project_id"),
-                    workspace__slug=self.kwargs.get("slug"),
-                    inbox_id=self.kwargs.get("inbox_id"),
-                )
-                .select_related("issue", "workspace", "project")
-            )
-        else:
-            return InboxIssue.objects.none()
-
-    def list(self, request, slug, project_id, inbox_id):
-        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(
-                workspace__slug=slug, project_id=project_id
-            )
-            if project_deploy_board.inbox is None:
-                return Response(
-                    {"error": "Inbox is not enabled for this Project Board"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            filters = issue_filters(request.query_params, "GET")
-            issues = (
-                Issue.objects.filter(
-                    issue_inbox__inbox_id=inbox_id,
-                    workspace__slug=slug,
-                    project_id=project_id,
-                )
-                .filter(**filters)
-                .annotate(bridge_id=F("issue_inbox__id"))
-                .select_related("workspace", "project", "state", "parent")
-                .prefetch_related("assignees", "labels")
-                .order_by("issue_inbox__snoozed_till", "issue_inbox__status")
-                .annotate(
-                    sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
-                    .order_by()
-                    .annotate(count=Func(F("id"), function="Count"))
-                    .values("count")
-                )
-                .annotate(
-                    link_count=IssueLink.objects.filter(issue=OuterRef("id"))
-                    .order_by()
-                    .annotate(count=Func(F("id"), function="Count"))
-                    .values("count")
-                )
-                .annotate(
-                    attachment_count=IssueAttachment.objects.filter(
-                        issue=OuterRef("id")
-                    )
-                    .order_by()
-                    .annotate(count=Func(F("id"), function="Count"))
-                    .values("count")
-                )
-                .prefetch_related(
-                    Prefetch(
-                        "issue_inbox",
-                        queryset=InboxIssue.objects.only(
-                            "status", "duplicate_to", "snoozed_till", "source"
-                        ),
-                    )
-                )
-            )
-            issues_data = IssueStateInboxSerializer(
-                issues,
-                nested_fields={
-                    "assignee_details": (
-                        "id",
-                        "first_name",
-                        "last_name",
-                        "avatar",
-                        "is_bot",
-                        "display_name",
-                    )
-                },
-                many=True,
-            ).data
-            return Response(
-                issues_data,
-                status=status.HTTP_200_OK,
-            )
-        except ProjectDeployBoard.DoesNotExist:
-            return Response(
-                {"error": "Project Deploy Board does not exist"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-    def create(self, request, slug, project_id, inbox_id):
-        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(
-                workspace__slug=slug, project_id=project_id
-            )
-            if project_deploy_board.inbox is None:
-                return Response(
-                    {"error": "Inbox is not enabled for this Project Board"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            if not request.data.get("issue", {}).get("name", False):
-                return Response(
-                    {"error": "Name is required"}, status=status.HTTP_400_BAD_REQUEST
-                )
-
-            # Check for valid priority
-            if not request.data.get("issue", {}).get("priority", None) in [
-                "low",
-                "medium",
-                "high",
-                "urgent",
-                None,
-            ]:
-                return Response(
-                    {"error": "Invalid priority"}, status=status.HTTP_400_BAD_REQUEST
-                )
-
-            # Create or get state
-            state, _ = State.objects.get_or_create(
-                name="Triage",
-                group="backlog",
-                description="Default state for managing all Inbox Issues",
-                project_id=project_id,
-                color="#ff7700",
-            )
-
-            # create an issue
-            issue = Issue.objects.create(
-                name=request.data.get("issue", {}).get("name"),
-                description=request.data.get("issue", {}).get("description", {}),
-                description_html=request.data.get("issue", {}).get(
-                    "description_html", "<p></p>"
-                ),
-                priority=request.data.get("issue", {}).get("priority", "low"),
-                project_id=project_id,
-                state=state,
-            )
-
-            # Create an Issue Activity
-            issue_activity.delay(
-                type="issue.activity.created",
-                requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
-                actor_id=str(request.user.id),
-                issue_id=str(issue.id),
-                project_id=str(project_id),
-                current_instance=None,
-            )
-            # create an inbox issue
-            InboxIssue.objects.create(
-                inbox_id=inbox_id,
-                project_id=project_id,
-                issue=issue,
-                source=request.data.get("source", "in-app"),
-            )
-
-            serializer = IssueStateInboxSerializer(
-                issue,
-                nested_fields={
-                    "assignee_details": (
-                        "id",
-                        "first_name",
-                        "last_name",
-                        "avatar",
-                        "is_bot",
-                        "display_name",
-                    )
-                },
-            )
-            return Response(serializer.data, status=status.HTTP_200_OK)
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-    def partial_update(self, request, slug, project_id, inbox_id, pk):
-        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(
-                workspace__slug=slug, project_id=project_id
-            )
-            if project_deploy_board.inbox is None:
-                return Response(
-                    {"error": "Inbox is not enabled for this Project Board"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            inbox_issue = InboxIssue.objects.get(
-                pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
-            )
-            # Get the project member
-            if str(inbox_issue.created_by_id) != str(request.user.id):
-                return Response(
-                    {"error": "You cannot edit inbox issues"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            # Get issue data
-            issue_data = request.data.pop("issue", False)
-
-            issue = Issue.objects.get(
-                pk=inbox_issue.issue_id, workspace__slug=slug, project_id=project_id
-            )
-            # viewers and guests since only viewers and guests
-            issue_data = {
-                "name": issue_data.get("name", issue.name),
-                "description_html": issue_data.get(
-                    "description_html", issue.description_html
-                ),
-                "description": issue_data.get("description", issue.description),
-            }
-
-            issue_serializer = IssueCreateSerializer(
-                issue,
-                data=issue_data,
-                fields=[
-                    {
-                        "created_by_detail": [
-                            "id",
-                            "first_name",
-                            "last_name",
-                            "avatar",
-                            "is_bot",
-                            "display_name",
-                        ]
-                    },
-                    {
-                        "state_detail": [
-                            "id",
-                            "created_by",
-                            "created_at",
-                            "updated_at",
-                            "updated_by",
-                            "name",
-                            "description",
-                            "color",
-                            "slug",
-                            "sequence",
-                            "group",
-                            "default",
-                            "project",
-                            "workspace",
-                            {"workspace_detail": ["id", "name", "slug"]},
-                            {
-                                "project_detail": [
-                                    "id",
-                                    "name",
-                                    "cover_image",
-                                    "icon_prop",
-                                    "emoji",
-                                    "description",
-                                ]
-                            },
-                        ],
-                    },
-                    {
-                        "project_detail": [
-                            "id",
-                            "name",
-                            "cover_image",
-                            "icon_prop",
-                            "emoji",
-                            "description",
-                        ]
-                    },
-                    {"workspace_detail": ["id", "name", "slug"]},
-                    "id",
-                    "created_at",
-                    "created_by",
-                    "updated_at",
-                    "updated_by",
-                    "workspace",
-                    "project",
-                    "assignees_list",
-                    "blockers_list",
-                    "labels_list",
-                    "blocks_list",
-                    "PRIORITY_CHOICES",
-                    "parent",
-                    "state",
-                    "estimate_point",
-                    "name",
-                    "description",
-                    "description_html",
-                    "description_stripped",
-                    "priority",
-                    "start_date",
-                    "target_date",
-                    "assignees",
-                    "sequence_id",
-                    "labels",
-                    "sort_order",
-                    "completed_at",
-                    "archived_at",
-                ],
-                partial=True,
-            )
-
-            if issue_serializer.is_valid():
-                current_instance = issue
-                # Log all the updates
-                requested_data = json.dumps(issue_data, cls=DjangoJSONEncoder)
-                if issue is not None:
-                    issue_activity.delay(
-                        type="issue.activity.updated",
-                        requested_data=requested_data,
-                        actor_id=str(request.user.id),
-                        issue_id=str(issue.id),
-                        project_id=str(project_id),
-                        current_instance=json.dumps(
-                            IssueSerializer(current_instance).data,
-                            cls=DjangoJSONEncoder,
-                        ),
-                    )
-                issue_serializer.save()
-                return Response(issue_serializer.data, status=status.HTTP_200_OK)
-            return Response(issue_serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-        except InboxIssue.DoesNotExist:
-            return Response(
-                {"error": "Inbox Issue does not exist"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-    def retrieve(self, request, slug, project_id, inbox_id, pk):
-        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(
-                workspace__slug=slug, project_id=project_id
-            )
-            if project_deploy_board.inbox is None:
-                return Response(
-                    {"error": "Inbox is not enabled for this Project Board"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            inbox_issue = InboxIssue.objects.get(
-                pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
-            )
-            issue = Issue.objects.get(
-                pk=inbox_issue.issue_id, workspace__slug=slug, project_id=project_id
-            )
-            serializer = IssueStateInboxSerializer(
-                issue,
-                nested_fields={
-                    "assignee_details": (
-                        "id",
-                        "first_name",
-                        "last_name",
-                        "avatar",
-                        "is_bot",
-                        "display_name",
-                    )
-                },
-            )
-            return Response(serializer.data, status=status.HTTP_200_OK)
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-    def destroy(self, request, slug, project_id, inbox_id, pk):
-        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(
-                workspace__slug=slug, project_id=project_id
-            )
-            if project_deploy_board.inbox is None:
-                return Response(
-                    {"error": "Inbox is not enabled for this Project Board"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            inbox_issue = InboxIssue.objects.get(
-                pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
-            )
-
-            if str(inbox_issue.created_by_id) != str(request.user.id):
-                return Response(
-                    {"error": "You cannot delete inbox issue"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            inbox_issue.delete()
-            return Response(status=status.HTTP_204_NO_CONTENT)
-        except InboxIssue.DoesNotExist:
-            return Response(
-                {"error": "Inbox Issue does not exists"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
+            )

apiserver/plane/api/views/integration/slack.py

@@ -20,17 +20,6 @@ class SlackProjectSyncViewSet(BaseViewSet):
     serializer_class = SlackProjectSyncSerializer
     model = SlackProjectSync
 
-    def get_queryset(self):
-        return (
-            super()
-            .get_queryset()
-            .filter(
-                workspace__slug=self.kwargs.get("slug"),
-                project_id=self.kwargs.get("project_id"),
-            )
-            .filter(project__project_projectmember__member=self.request.user)
-        )
-
     def create(self, request, slug, project_id, workspace_integration_id):
         try:
             serializer = SlackProjectSyncSerializer(data=request.data)
@@ -56,10 +45,7 @@ class SlackProjectSyncViewSet(BaseViewSet):
                 return Response(serializer.data, status=status.HTTP_200_OK)
             return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
         except IntegrityError:
-            return Response(
-                {"error": "Slack is already enabled for the project"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
+            return Response({"error": "Slack is already enabled for the project"}, status=status.HTTP_400_BAD_REQUEST)
         except WorkspaceIntegration.DoesNotExist:
             return Response(
                 {"error": "Workspace Integration does not exist"},

apiserver/plane/api/views/issue.py

@@ -48,7 +48,6 @@ from plane.api.serializers import (
     ProjectMemberLiteSerializer,
     IssueReactionSerializer,
     CommentReactionSerializer,
-    IssueVoteSerializer,
 )
 from plane.api.permissions import (
     WorkspaceEntityPermission,
@@ -71,8 +70,6 @@ from plane.db.models import (
     ProjectMember,
     IssueReaction,
     CommentReaction,
-    ProjectDeployBoard,
-    IssueVote,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
 from plane.utils.grouper import group_results
@@ -171,6 +168,7 @@ class IssueViewSet(BaseViewSet):
     def list(self, request, slug, project_id):
         try:
             filters = issue_filters(request.query_params, "GET")
+            print(filters)
 
             # Custom ordering for priority and state
             priority_order = ["urgent", "high", "medium", "low", None]
@@ -281,86 +279,6 @@ class IssueViewSet(BaseViewSet):
 
             serializer = IssueCreateSerializer(
                 data=request.data,
-                fields=[
-                    {
-                        "created_by_detail": [
-                            "id",
-                            "first_name",
-                            "last_name",
-                            "avatar",
-                            "is_bot",
-                            "display_name",
-                        ]
-                    },
-                    {
-                        "state_detail": [
-                            "id",
-                            "created_by",
-                            "created_at",
-                            "updated_at",
-                            "updated_by",
-                            "name",
-                            "description",
-                            "color",
-                            "slug",
-                            "sequence",
-                            "group",
-                            "default",
-                            "project",
-                            "workspace",
-                            {"workspace_detail": ["id", "name", "slug"]},
-                            {
-                                "project_detail": [
-                                    "id",
-                                    "name",
-                                    "cover_image",
-                                    "icon_prop",
-                                    "emoji",
-                                    "description",
-                                ]
-                            },
-                        ],
-                    },
-                    {
-                        "project_detail": [
-                            "id",
-                            "name",
-                            "cover_image",
-                            "icon_prop",
-                            "emoji",
-                            "description",
-                        ]
-                    },
-                    {"workspace_detail": ["id", "name", "slug"]},
-                    "id",
-                    "created_at",
-                    "created_by",
-                    "updated_at",
-                    "updated_by",
-                    "workspace",
-                    "project",
-                    "assignees_list",
-                    "blockers_list",
-                    "labels_list",
-                    "blocks_list",
-                    "PRIORITY_CHOICES",
-                    "parent",
-                    "state",
-                    "estimate_point",
-                    "name",
-                    "description",
-                    "description_html",
-                    "description_stripped",
-                    "priority",
-                    "start_date",
-                    "target_date",
-                    "assignees",
-                    "sequence_id",
-                    "labels",
-                    "sort_order",
-                    "completed_at",
-                    "archived_at",
-                ],
                 context={
                     "project_id": project_id,
                     "workspace_id": project.workspace_id,
@@ -443,14 +361,8 @@ class UserWorkSpaceIssues(BaseAPIView):
                     .annotate(count=Func(F("id"), function="Count"))
                     .values("count")
                 )
-                .prefetch_related(
-                    Prefetch(
-                        "issue_reactions",
-                        queryset=IssueReaction.objects.select_related("actor"),
-                    )
-                )
                 .filter(**filters)
-            ).distinct()
+            )
 
             # Priority Ordering
             if order_by_param == "priority" or order_by_param == "-priority":
@@ -573,34 +485,8 @@ class IssueActivityEndpoint(BaseAPIView):
                 .order_by("created_at")
                 .select_related("actor", "issue", "project", "workspace")
             )
-            issue_activities = IssueActivitySerializer(
-                issue_activities,
-                nested_fields={
-                    "actor_detail": (
-                        "id",
-                        "first_name",
-                        "last_name",
-                        "avatar",
-                        "is_bot",
-                        "display_name",
-                    )
-                },
-                many=True,
-            ).data
-            issue_comments = IssueCommentSerializer(
-                issue_comments,
-                nested_fields={
-                    "actor_detail": (
-                        "id",
-                        "first_name",
-                        "last_name",
-                        "avatar",
-                        "is_bot",
-                        "display_name",
-                    )
-                },
-                many=True,
-            ).data
+            issue_activities = IssueActivitySerializer(issue_activities, many=True).data
+            issue_comments = IssueCommentSerializer(issue_comments, many=True).data
 
             result_list = sorted(
                 chain(issue_activities, issue_comments),
@@ -628,9 +514,6 @@ class IssueCommentViewSet(BaseViewSet):
         "workspace__id",
     ]
 
-    # def get_serializer_class(self):
-    #     return IssueCommentSerializer(nested_fields={"actor_detail":("id", "first_name", "last_name", "avatar", "is_bot", "display_name")})
-
     def perform_create(self, serializer):
         serializer.save(
             project_id=self.kwargs.get("project_id"),
@@ -659,19 +542,7 @@ class IssueCommentViewSet(BaseViewSet):
                 issue_id=str(self.kwargs.get("issue_id", None)),
                 project_id=str(self.kwargs.get("project_id", None)),
                 current_instance=json.dumps(
-                    IssueCommentSerializer(
-                        current_instance,
-                        nested_fields={
-                            "actor_detail": (
-                                "id",
-                                "first_name",
-                                "last_name",
-                                "avatar",
-                                "is_bot",
-                                "display_name",
-                            )
-                        },
-                    ).data,
+                    IssueCommentSerializer(current_instance).data,
                     cls=DjangoJSONEncoder,
                 ),
             )
@@ -692,19 +563,7 @@ class IssueCommentViewSet(BaseViewSet):
                 issue_id=str(self.kwargs.get("issue_id", None)),
                 project_id=str(self.kwargs.get("project_id", None)),
                 current_instance=json.dumps(
-                    IssueCommentSerializer(
-                        current_instance,
-                        nested_fields={
-                            "actor_detail": (
-                                "id",
-                                "first_name",
-                                "last_name",
-                                "avatar",
-                                "is_bot",
-                                "display_name",
-                            )
-                        },
-                    ).data,
+                    IssueCommentSerializer(current_instance).data,
                     cls=DjangoJSONEncoder,
                 ),
             )
@@ -884,27 +743,21 @@ class SubIssuesEndpoint(BaseAPIView):
                     .annotate(count=Func(F("id"), function="Count"))
                     .values("count")
                 )
-                .prefetch_related(
-                    Prefetch(
-                        "issue_reactions",
-                        queryset=IssueReaction.objects.select_related("actor"),
-                    )
-                )
             )
 
             state_distribution = (
-                State.objects.filter(
-                    workspace__slug=slug, state_issue__parent_id=issue_id
+                State.objects.filter(~Q(name="Triage"), workspace__slug=slug)
+                .annotate(
+                    state_count=Count(
+                        "state_issue",
+                        filter=Q(state_issue__parent_id=issue_id),
+                    )
                 )
-                .annotate(state_group=F("group"))
-                .values("state_group")
-                .annotate(state_count=Count("state_group"))
-                .order_by("state_group")
+                .order_by("group")
+                .values("group", "state_count")
             )
 
-            result = {
-                item["state_group"]: item["state_count"] for item in state_distribution
-            }
+            result = {item["group"]: item["state_count"] for item in state_distribution}
 
             serializer = IssueLiteSerializer(
                 sub_issues,
@@ -1592,449 +1445,3 @@ class CommentReactionViewSet(BaseViewSet):
                 {"error": "Something went wrong please try again later"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
-
-
-class IssueCommentPublicViewSet(BaseViewSet):
-    serializer_class = IssueCommentSerializer
-    model = IssueComment
-
-    filterset_fields = [
-        "issue__id",
-        "workspace__id",
-    ]
-
-    def get_queryset(self):
-        project_deploy_board = ProjectDeployBoard.objects.get(
-            workspace__slug=self.kwargs.get("slug"),
-            project_id=self.kwargs.get("project_id"),
-        )
-        if project_deploy_board.comments:
-            return self.filter_queryset(
-                super()
-                .get_queryset()
-                .filter(workspace__slug=self.kwargs.get("slug"))
-                .filter(issue_id=self.kwargs.get("issue_id"))
-                .select_related("project")
-                .select_related("workspace")
-                .select_related("issue")
-                .distinct()
-            )
-        else:
-            return IssueComment.objects.none()
-
-    def create(self, request, slug, project_id, issue_id):
-        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(
-                workspace__slug=slug, project_id=project_id
-            )
-
-            if not project_deploy_board.comments:
-                return Response(
-                    {"error": "Comments are not enabled for this project"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            access = (
-                "INTERNAL"
-                if ProjectMember.objects.filter(
-                    project_id=project_id, member=request.user
-                ).exists()
-                else "EXTERNAL"
-            )
-
-            serializer = IssueCommentSerializer(
-                data=request.data,
-                nested_fields={
-                    "actor_detail": (
-                        "id",
-                        "first_name",
-                        "last_name",
-                        "avatar",
-                        "is_bot",
-                        "display_name",
-                    )
-                },
-            )
-            if serializer.is_valid():
-                serializer.save(
-                    project_id=project_id,
-                    issue_id=issue_id,
-                    actor=request.user,
-                    access=access,
-                )
-                issue_activity.delay(
-                    type="comment.activity.created",
-                    requested_data=json.dumps(serializer.data, cls=DjangoJSONEncoder),
-                    actor_id=str(request.user.id),
-                    issue_id=str(issue_id),
-                    project_id=str(project_id),
-                    current_instance=None,
-                )
-                return Response(serializer.data, status=status.HTTP_201_CREATED)
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-    def partial_update(self, request, slug, project_id, issue_id, pk):
-        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(
-                workspace__slug=slug, project_id=project_id
-            )
-
-            if not project_deploy_board.comments:
-                return Response(
-                    {"error": "Comments are not enabled for this project"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-            comment = IssueComment.objects.get(
-                workspace__slug=slug, pk=pk, actor=request.user
-            )
-            serializer = IssueCommentSerializer(
-                comment,
-                data=request.data,
-                nested_fields={
-                    "actor_detail": (
-                        "id",
-                        "first_name",
-                        "last_name",
-                        "avatar",
-                        "is_bot",
-                        "display_name",
-                    )
-                },
-                partial=True,
-            )
-            if serializer.is_valid():
-                serializer.save()
-                issue_activity.delay(
-                    type="comment.activity.updated",
-                    requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
-                    actor_id=str(request.user.id),
-                    issue_id=str(issue_id),
-                    project_id=str(project_id),
-                    current_instance=json.dumps(
-                        IssueCommentSerializer(
-                            comment,
-                            nested_fields={
-                                "actor_detail": (
-                                    "id",
-                                    "first_name",
-                                    "last_name",
-                                    "avatar",
-                                    "is_bot",
-                                    "display_name",
-                                )
-                            },
-                        ).data,
-                        cls=DjangoJSONEncoder,
-                    ),
-                )
-                return Response(serializer.data, status=status.HTTP_200_OK)
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-        except (IssueComment.DoesNotExist, ProjectDeployBoard.DoesNotExist):
-            return Response(
-                {"error": "IssueComent Does not exists"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-    def destroy(self, request, slug, project_id, issue_id, pk):
-        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(
-                workspace__slug=slug, project_id=project_id
-            )
-
-            if not project_deploy_board.comments:
-                return Response(
-                    {"error": "Comments are not enabled for this project"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-            comment = IssueComment.objects.get(
-                workspace__slug=slug, pk=pk, project_id=project_id, actor=request.user
-            )
-            issue_activity.delay(
-                type="comment.activity.deleted",
-                requested_data=json.dumps({"comment_id": str(pk)}),
-                actor_id=str(request.user.id),
-                issue_id=str(issue_id),
-                project_id=str(project_id),
-                current_instance=json.dumps(
-                    IssueCommentSerializer(
-                        comment,
-                        nested_fields={
-                            "actor_detail": (
-                                "id",
-                                "first_name",
-                                "last_name",
-                                "avatar",
-                                "is_bot",
-                                "display_name",
-                            )
-                        },
-                    ).data,
-                    cls=DjangoJSONEncoder,
-                ),
-            )
-            comment.delete()
-            return Response(status=status.HTTP_204_NO_CONTENT)
-        except (IssueComment.DoesNotExist, ProjectDeployBoard.DoesNotExist):
-            return Response(
-                {"error": "IssueComent Does not exists"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-
-class IssueReactionPublicViewSet(BaseViewSet):
-    serializer_class = IssueReactionSerializer
-    model = IssueReaction
-
-    def get_queryset(self):
-        project_deploy_board = ProjectDeployBoard.objects.get(
-            workspace__slug=self.kwargs.get("slug"),
-            project_id=self.kwargs.get("project_id"),
-        )
-        if project_deploy_board.reactions:
-            return (
-                super()
-                .get_queryset()
-                .filter(workspace__slug=self.kwargs.get("slug"))
-                .filter(project_id=self.kwargs.get("project_id"))
-                .filter(issue_id=self.kwargs.get("issue_id"))
-                .order_by("-created_at")
-                .distinct()
-            )
-        else:
-            return IssueReaction.objects.none()
-
-    def create(self, request, slug, project_id, issue_id):
-        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(
-                workspace__slug=slug, project_id=project_id
-            )
-
-            if not project_deploy_board.reactions:
-                return Response(
-                    {"error": "Reactions are not enabled for this project board"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            serializer = IssueReactionSerializer(data=request.data)
-            if serializer.is_valid():
-                serializer.save(
-                    project_id=project_id, issue_id=issue_id, actor=request.user
-                )
-                return Response(serializer.data, status=status.HTTP_201_CREATED)
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-        except ProjectDeployBoard.DoesNotExist:
-            return Response(
-                {"error": "Project board does not exist"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-    def destroy(self, request, slug, project_id, issue_id, reaction_code):
-        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(
-                workspace__slug=slug, project_id=project_id
-            )
-
-            if not project_deploy_board.reactions:
-                return Response(
-                    {"error": "Reactions are not enabled for this project board"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-            issue_reaction = IssueReaction.objects.get(
-                workspace__slug=slug,
-                issue_id=issue_id,
-                reaction=reaction_code,
-                actor=request.user,
-            )
-            issue_reaction.delete()
-            return Response(status=status.HTTP_204_NO_CONTENT)
-        except IssueReaction.DoesNotExist:
-            return Response(
-                {"error": "Issue reaction does not exist"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-
-class CommentReactionPublicViewSet(BaseViewSet):
-    serializer_class = CommentReactionSerializer
-    model = CommentReaction
-
-    def get_queryset(self):
-        project_deploy_board = ProjectDeployBoard.objects.get(
-            workspace__slug=self.kwargs.get("slug"),
-            project_id=self.kwargs.get("project_id"),
-        )
-        if project_deploy_board.reactions:
-            return (
-                super()
-                .get_queryset()
-                .filter(workspace__slug=self.kwargs.get("slug"))
-                .filter(project_id=self.kwargs.get("project_id"))
-                .filter(comment_id=self.kwargs.get("comment_id"))
-                .order_by("-created_at")
-                .distinct()
-            )
-        else:
-            return CommentReaction.objects.none()
-
-    def create(self, request, slug, project_id, comment_id):
-        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(
-                workspace__slug=slug, project_id=project_id
-            )
-
-            if not project_deploy_board.reactions:
-                return Response(
-                    {"error": "Reactions are not enabled for this board"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            serializer = CommentReactionSerializer(data=request.data)
-            if serializer.is_valid():
-                serializer.save(
-                    project_id=project_id, comment_id=comment_id, actor=request.user
-                )
-                return Response(serializer.data, status=status.HTTP_201_CREATED)
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-        except ProjectDeployBoard.DoesNotExist:
-            return Response(
-                {"error": "Project board does not exist"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-    def destroy(self, request, slug, project_id, comment_id, reaction_code):
-        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(
-                workspace__slug=slug, project_id=project_id
-            )
-            if not project_deploy_board.reactions:
-                return Response(
-                    {"error": "Reactions are not enabled for this board"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            comment_reaction = CommentReaction.objects.get(
-                project_id=project_id,
-                workspace__slug=slug,
-                comment_id=comment_id,
-                reaction=reaction_code,
-                actor=request.user,
-            )
-            comment_reaction.delete()
-            return Response(status=status.HTTP_204_NO_CONTENT)
-        except CommentReaction.DoesNotExist:
-            return Response(
-                {"error": "Comment reaction does not exist"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-
-class IssueVotePublicViewSet(BaseViewSet):
-    model = IssueVote
-    serializer_class = IssueVoteSerializer
-
-    def get_queryset(self):
-        return (
-            super()
-            .get_queryset()
-            .filter(issue_id=self.kwargs.get("issue_id"))
-            .filter(workspace__slug=self.kwargs.get("slug"))
-            .filter(project_id=self.kwargs.get("project_id"))
-        )
-
-    def create(self, request, slug, project_id, issue_id):
-        try:
-            issue_vote, _ = IssueVote.objects.get_or_create(
-                actor_id=request.user.id,
-                project_id=project_id,
-                issue_id=issue_id,
-                vote=request.data.get("vote", 1),
-            )
-            serializer = IssueVoteSerializer(issue_vote)
-            return Response(serializer.data, status=status.HTTP_201_CREATED)
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-    def destroy(self, request, slug, project_id, issue_id):
-        try:
-            issue_vote = IssueVote.objects.get(
-                workspace__slug=slug,
-                project_id=project_id,
-                issue_id=issue_id,
-                actor_id=request.user.id,
-            )
-            issue_vote.delete()
-            return Response(status=status.HTTP_204_NO_CONTENT)
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-
-class ExportIssuesEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkSpaceAdminPermission,
-    ]
-
-    def post(self, request, slug):
-        try:
-            issue_export_task.delay(
-                email=request.user.email,
-                data=request.data,
-                slug=slug,
-                exporter_name=request.user.first_name,
-            )
-
-            return Response(
-                {
-                    "message": f"Once the export is ready it will be emailed to you at {str(request.user.email)}"
-                },
-                status=status.HTTP_200_OK,
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )

apiserver/plane/api/views/module.py

@@ -53,8 +53,6 @@ class ModuleViewSet(BaseViewSet):
         )
 
     def get_queryset(self):
-        order_by = self.request.GET.get("order_by", "sort_order")
-
         subquery = ModuleFavorite.objects.filter(
             user=self.request.user,
             module_id=OuterRef("pk"),
@@ -108,7 +106,7 @@ class ModuleViewSet(BaseViewSet):
                     filter=Q(issue_module__issue__state__group="backlog"),
                 )
             )
-            .order_by(order_by, "name")
+            .order_by("-is_favorite", "name")
         )
 
     def perform_destroy(self, instance):
@@ -175,9 +173,8 @@ class ModuleViewSet(BaseViewSet):
                 .annotate(first_name=F("assignees__first_name"))
                 .annotate(last_name=F("assignees__last_name"))
                 .annotate(assignee_id=F("assignees__id"))
-                .annotate(display_name=F("assignees__display_name"))
                 .annotate(avatar=F("assignees__avatar"))
-                .values("first_name", "last_name", "assignee_id", "avatar", "display_name")
+                .values("first_name", "last_name", "assignee_id", "avatar")
                 .annotate(total_issues=Count("assignee_id"))
                 .annotate(
                     completed_issues=Count(

apiserver/plane/api/views/page.py

@@ -301,7 +301,7 @@ class CreateIssueFromPageBlockEndpoint(BaseAPIView):
                 issue=issue,
                 actor=request.user,
                 project_id=project_id,
-                comment=f"created the issue from {page_block.name} block",
+                comment=f"{request.user.email} created the issue from {page_block.name} block",
                 verb="created",
             )
 

apiserver/plane/api/views/people.py

@@ -147,18 +147,7 @@ class UserActivityEndpoint(BaseAPIView, BasePaginator):
                 request=request,
                 queryset=queryset,
                 on_results=lambda issue_activities: IssueActivitySerializer(
-                    issue_activities,
-                    nested_fields={
-                        "actor_detail": (
-                            "id",
-                            "first_name",
-                            "last_name",
-                            "avatar",
-                            "is_bot",
-                            "display_name",
-                        )
-                    },
-                    many=True,
+                    issue_activities, many=True
                 ).data,
             )
         except Exception as e:

apiserver/plane/api/views/project.py

@@ -5,21 +5,7 @@ from datetime import datetime
 # Django imports
 from django.core.exceptions import ValidationError
 from django.db import IntegrityError
-from django.db.models import (
-    Q,
-    Exists,
-    OuterRef,
-    Func,
-    F,
-    Max,
-    CharField,
-    Func,
-    Subquery,
-    Prefetch,
-    When,
-    Case,
-    Value,
-)
+from django.db.models import Q, Exists, OuterRef, Func, F, Min, Subquery
 from django.core.validators import validate_email
 from django.conf import settings
 
@@ -27,7 +13,6 @@ from django.conf import settings
 from rest_framework.response import Response
 from rest_framework import status
 from rest_framework import serializers
-from rest_framework.permissions import AllowAny
 from sentry_sdk import capture_exception
 
 # Module imports
@@ -38,16 +23,9 @@ from plane.api.serializers import (
     ProjectDetailSerializer,
     ProjectMemberInviteSerializer,
     ProjectFavoriteSerializer,
-    IssueLiteSerializer,
-    ProjectDeployBoardSerializer,
-    ProjectMemberAdminSerializer,
 )
 
-from plane.api.permissions import (
-    ProjectBasePermission,
-    ProjectEntityPermission,
-    ProjectMemberPermission,
-)
+from plane.api.permissions import ProjectBasePermission
 
 from plane.db.models import (
     Project,
@@ -70,17 +48,9 @@ from plane.db.models import (
     IssueAssignee,
     ModuleMember,
     Inbox,
-    ProjectDeployBoard,
-    Issue,
-    IssueReaction,
-    IssueLink,
-    IssueAttachment,
-    Label,
 )
 
 from plane.bgtasks.project_invitation_task import project_invitation
-from plane.utils.grouper import group_results
-from plane.utils.issue_filters import issue_filters
 
 
 class ProjectViewSet(BaseViewSet):
@@ -91,10 +61,10 @@ class ProjectViewSet(BaseViewSet):
         ProjectBasePermission,
     ]
 
-    # def get_serializer_class(self, *args, **kwargs):
-    #     if self.action == "update" or self.action == "partial_update":
-    #         return ProjectSerializer(fields=['id', {'workspace_detail': ["id", "name", "slug"]}, 'created_at', 'updated_at', 'name', 'description', 'description_text', 'description_html', 'network', 'identifier', 'emoji', 'icon_prop', 'module_view', 'cycle_view', 'issue_views_view', 'page_view', 'inbox_view', 'cover_image', 'archive_in', 'close_in', 'created_by', 'updated_by', 'workspace', 'default_assignee', 'project_lead', 'estimate', 'default_state', 'sort_order'],)
-    #     return ProjectDetailSerializer
+    def get_serializer_class(self, *args, **kwargs):
+        if self.action == "update" or self.action == "partial_update":
+            return ProjectSerializer
+        return ProjectDetailSerializer
 
     def get_queryset(self):
         subquery = ProjectFavorite.objects.filter(
@@ -122,9 +92,7 @@ class ProjectViewSet(BaseViewSet):
                 )
             )
             .annotate(
-                total_members=ProjectMember.objects.filter(
-                    project_id=OuterRef("id"), member__is_bot=False
-                )
+                total_members=ProjectMember.objects.filter(project_id=OuterRef("id"))
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
@@ -141,20 +109,6 @@ class ProjectViewSet(BaseViewSet):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .annotate(
-                member_role=ProjectMember.objects.filter(
-                    project_id=OuterRef("pk"),
-                    member_id=self.request.user.id,
-                ).values("role")
-            )
-            .annotate(
-                is_deployed=Exists(
-                    ProjectDeployBoard.objects.filter(
-                        project_id=OuterRef("pk"),
-                        workspace__slug=self.kwargs.get("slug"),
-                    )
-                )
-            )
             .distinct()
         )
 
@@ -216,38 +170,7 @@ class ProjectViewSet(BaseViewSet):
             workspace = Workspace.objects.get(slug=slug)
 
             serializer = ProjectSerializer(
-                data={**request.data},
-                fields=[
-                    "id",
-                    {"workspace_detail": ["id", "name", "slug"]},
-                    "created_at",
-                    "updated_at",
-                    "name",
-                    "description",
-                    "description_text",
-                    "description_html",
-                    "network",
-                    "identifier",
-                    "emoji",
-                    "icon_prop",
-                    "module_view",
-                    "cycle_view",
-                    "issue_views_view",
-                    "page_view",
-                    "inbox_view",
-                    "cover_image",
-                    "archive_in",
-                    "close_in",
-                    "created_by",
-                    "updated_by",
-                    "workspace",
-                    "default_assignee",
-                    "project_lead",
-                    "estimate",
-                    "default_state",
-                    "sort_order",
-                ],
-                context={"workspace_id": workspace.id},
+                data={**request.data}, context={"workspace_id": workspace.id}
             )
             if serializer.is_valid():
                 serializer.save()
@@ -257,9 +180,7 @@ class ProjectViewSet(BaseViewSet):
                     project_id=serializer.data["id"], member=request.user, role=20
                 )
 
-                if serializer.data["project_lead"] is not None and str(
-                    serializer.data["project_lead"]
-                ) != str(request.user.id):
+                if serializer.data["project_lead"] is not None:
                     ProjectMember.objects.create(
                         project_id=serializer.data["id"],
                         member_id=serializer.data["project_lead"],
@@ -361,36 +282,6 @@ class ProjectViewSet(BaseViewSet):
             serializer = ProjectSerializer(
                 project,
                 data={**request.data},
-                fields=[
-                    "id",
-                    {"workspace_detail": ["id", "name", "slug"]},
-                    "created_at",
-                    "updated_at",
-                    "name",
-                    "description",
-                    "description_text",
-                    "description_html",
-                    "network",
-                    "identifier",
-                    "emoji",
-                    "icon_prop",
-                    "module_view",
-                    "cycle_view",
-                    "issue_views_view",
-                    "page_view",
-                    "inbox_view",
-                    "cover_image",
-                    "archive_in",
-                    "close_in",
-                    "created_by",
-                    "updated_by",
-                    "workspace",
-                    "default_assignee",
-                    "project_lead",
-                    "estimate",
-                    "default_state",
-                    "sort_order",
-                ],
                 context={"workspace_id": workspace.id},
                 partial=True,
             )
@@ -456,9 +347,7 @@ class InviteProjectEndpoint(BaseAPIView):
             validate_email(email)
             # Check if user is already a member of workspace
             if ProjectMember.objects.filter(
-                project_id=project_id,
-                member__email=email,
-                member__is_bot=False,
+                project_id=project_id, member__email=email
             ).exists():
                 return Response(
                     {"error": "User is already member of workspace"},
@@ -562,14 +451,14 @@ class UserProjectInvitationsViewset(BaseViewSet):
 
 
 class ProjectMemberViewSet(BaseViewSet):
-    serializer_class = ProjectMemberAdminSerializer
+    serializer_class = ProjectMemberSerializer
     model = ProjectMember
     permission_classes = [
         ProjectBasePermission,
     ]
 
     search_fields = [
-        "member__display_name",
+        "member__email",
         "member__first_name",
     ]
 
@@ -715,19 +604,17 @@ class AddMemberToProjectEndpoint(BaseAPIView):
 
             project_members = (
                 ProjectMember.objects.filter(
-                    workspace__slug=slug,
+                    workspace=self.workspace,
                     member_id__in=[member.get("member_id") for member in members],
                 )
-                .values("member_id", "sort_order")
-                .order_by("sort_order")
+                .values("member_id")
+                .annotate(sort_order_min=Min("sort_order"))
             )
 
             for member in members:
                 sort_order = [
                     project_member.get("sort_order")
                     for project_member in project_members
-                    if str(project_member.get("member_id"))
-                    == str(member.get("member_id"))
                 ]
                 bulk_project_members.append(
                     ProjectMember(
@@ -930,11 +817,26 @@ class ProjectJoinEndpoint(BaseAPIView):
                 member=request.user, workspace__slug=slug
             )
 
+            smallest_sort_order = (
+                ProjectMember.objects.filter(
+                    workspace__slug=slug, member=request.user
+                )
+                .aggregate(smallest=Min("sort_order"))
+                .get("smallest", 65535)
+            )
+
+            if smallest_sort_order is None:
+                smallest_sort_order = 55535
+            else:
+                smallest_sort_order = smallest_sort_order - 10000
+
+
             workspace_role = workspace_member.role
             workspace = workspace_member.workspace
 
-            ProjectMember.objects.bulk_create(
-                [
+            bulk_project_members = []
+            for project_id in project_ids:
+                bulk_project_members.append(
                     ProjectMember(
                         project_id=project_id,
                         member=request.user,
@@ -943,9 +845,14 @@ class ProjectJoinEndpoint(BaseAPIView):
                         else (15 if workspace_role == 10 else workspace_role),
                         workspace=workspace,
                         created_by=request.user,
+                        sort_order=smallest_sort_order,
                     )
-                    for project_id in project_ids
-                ],
+                )
+
+                smallest_sort_order = smallest_sort_order - 10000
+
+            ProjectMember.objects.bulk_create(
+                bulk_project_members,
                 ignore_conflicts=True,
             )
 
@@ -1095,255 +1002,3 @@ class ProjectFavoritesViewSet(BaseViewSet):
                 {"error": "Something went wrong please try again later"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
-
-
-class ProjectDeployBoardViewSet(BaseViewSet):
-    permission_classes = [
-        ProjectMemberPermission,
-    ]
-    serializer_class = ProjectDeployBoardSerializer
-    model = ProjectDeployBoard
-
-    def get_queryset(self):
-        return (
-            super()
-            .get_queryset()
-            .filter(
-                workspace__slug=self.kwargs.get("slug"),
-                project_id=self.kwargs.get("project_id"),
-            )
-            .select_related("project")
-        )
-
-    def create(self, request, slug, project_id):
-        try:
-            comments = request.data.get("comments", False)
-            reactions = request.data.get("reactions", False)
-            inbox = request.data.get("inbox", None)
-            votes = request.data.get("votes", False)
-            views = request.data.get(
-                "views",
-                {
-                    "list": True,
-                    "kanban": True,
-                    "calendar": True,
-                    "gantt": True,
-                    "spreadsheet": True,
-                },
-            )
-
-            project_deploy_board, _ = ProjectDeployBoard.objects.get_or_create(
-                anchor=f"{slug}/{project_id}",
-                project_id=project_id,
-            )
-            project_deploy_board.comments = comments
-            project_deploy_board.reactions = reactions
-            project_deploy_board.inbox = inbox
-            project_deploy_board.votes = votes
-            project_deploy_board.views = views
-
-            project_deploy_board.save()
-
-            serializer = ProjectDeployBoardSerializer(project_deploy_board)
-            return Response(serializer.data, status=status.HTTP_200_OK)
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-
-class ProjectMemberEndpoint(BaseAPIView):
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-
-    def get(self, request, slug, project_id):
-        try:
-            project_members = ProjectMember.objects.filter(
-                project_id=project_id,
-                workspace__slug=slug,
-                member__is_bot=False,
-            ).select_related("project", "member")
-            serializer = ProjectMemberSerializer(project_members, many=True)
-            return Response(serializer.data, status=status.HTTP_200_OK)
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-
-class ProjectDeployBoardPublicSettingsEndpoint(BaseAPIView):
-    permission_classes = [
-        AllowAny,
-    ]
-
-    def get(self, request, slug, project_id):
-        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(
-                workspace__slug=slug, project_id=project_id
-            )
-            serializer = ProjectDeployBoardSerializer(project_deploy_board)
-            return Response(serializer.data, status=status.HTTP_200_OK)
-        except ProjectDeployBoard.DoesNotExist:
-            return Response(
-                {"error": "Project Deploy Board does not exists"},
-                status=status.HTTP_404_NOT_FOUND,
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-
-class ProjectDeployBoardIssuesPublicEndpoint(BaseAPIView):
-    permission_classes = [
-        AllowAny,
-    ]
-
-    def get(self, request, slug, project_id):
-        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(
-                workspace__slug=slug, project_id=project_id
-            )
-
-            filters = issue_filters(request.query_params, "GET")
-
-            # Custom ordering for priority and state
-            priority_order = ["urgent", "high", "medium", "low", None]
-            state_order = ["backlog", "unstarted", "started", "completed", "cancelled"]
-
-            order_by_param = request.GET.get("order_by", "-created_at")
-
-            issue_queryset = (
-                Issue.issue_objects.annotate(
-                    sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
-                    .order_by()
-                    .annotate(count=Func(F("id"), function="Count"))
-                    .values("count")
-                )
-                .filter(project_id=project_id)
-                .filter(workspace__slug=slug)
-                .select_related("project", "workspace", "state", "parent")
-                .prefetch_related("assignees", "labels")
-                .prefetch_related(
-                    Prefetch(
-                        "issue_reactions",
-                        queryset=IssueReaction.objects.select_related("actor"),
-                    )
-                )
-                .filter(**filters)
-                .annotate(cycle_id=F("issue_cycle__cycle_id"))
-                .annotate(module_id=F("issue_module__module_id"))
-                .annotate(
-                    link_count=IssueLink.objects.filter(issue=OuterRef("id"))
-                    .order_by()
-                    .annotate(count=Func(F("id"), function="Count"))
-                    .values("count")
-                )
-                .annotate(
-                    attachment_count=IssueAttachment.objects.filter(
-                        issue=OuterRef("id")
-                    )
-                    .order_by()
-                    .annotate(count=Func(F("id"), function="Count"))
-                    .values("count")
-                )
-            )
-
-            # Priority Ordering
-            if order_by_param == "priority" or order_by_param == "-priority":
-                priority_order = (
-                    priority_order
-                    if order_by_param == "priority"
-                    else priority_order[::-1]
-                )
-                issue_queryset = issue_queryset.annotate(
-                    priority_order=Case(
-                        *[
-                            When(priority=p, then=Value(i))
-                            for i, p in enumerate(priority_order)
-                        ],
-                        output_field=CharField(),
-                    )
-                ).order_by("priority_order")
-
-            # State Ordering
-            elif order_by_param in [
-                "state__name",
-                "state__group",
-                "-state__name",
-                "-state__group",
-            ]:
-                state_order = (
-                    state_order
-                    if order_by_param in ["state__name", "state__group"]
-                    else state_order[::-1]
-                )
-                issue_queryset = issue_queryset.annotate(
-                    state_order=Case(
-                        *[
-                            When(state__group=state_group, then=Value(i))
-                            for i, state_group in enumerate(state_order)
-                        ],
-                        default=Value(len(state_order)),
-                        output_field=CharField(),
-                    )
-                ).order_by("state_order")
-            # assignee and label ordering
-            elif order_by_param in [
-                "labels__name",
-                "-labels__name",
-                "assignees__first_name",
-                "-assignees__first_name",
-            ]:
-                issue_queryset = issue_queryset.annotate(
-                    max_values=Max(
-                        order_by_param[1::]
-                        if order_by_param.startswith("-")
-                        else order_by_param
-                    )
-                ).order_by(
-                    "-max_values" if order_by_param.startswith("-") else "max_values"
-                )
-            else:
-                issue_queryset = issue_queryset.order_by(order_by_param)
-
-            issues = IssueLiteSerializer(issue_queryset, many=True).data
-
-            states = State.objects.filter(
-                workspace__slug=slug, project_id=project_id
-            ).values("name", "group", "color", "id")
-
-            labels = Label.objects.filter(
-                workspace__slug=slug, project_id=project_id
-            ).values("id", "name", "color", "parent")
-
-            # Grouping the results
-            group_by = request.GET.get("group_by", False)
-            if group_by:
-                issues = group_results(issues, group_by)
-
-            return Response(
-                {
-                    "issues": issues,
-                    "states": states,
-                    "labels": labels,
-                },
-                status=status.HTTP_200_OK,
-            )
-        except ProjectDeployBoard.DoesNotExist:
-            return Response(
-                {"error": "Board does not exists"}, status=status.HTTP_404_NOT_FOUND
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )

apiserver/plane/api/views/state.py

@@ -42,36 +42,7 @@ class StateViewSet(BaseViewSet):
 
     def create(self, request, slug, project_id):
         try:
-            serializer = StateSerializer(
-                data=request.data,
-                fields=[
-                    "id",
-                    "created_by",
-                    "created_at",
-                    "updated_at",
-                    "updated_by",
-                    "name",
-                    "description",
-                    "color",
-                    "slug",
-                    "sequence",
-                    "group",
-                    "default",
-                    "project",
-                    "workspace",
-                    {"workspace_detail": ["id", "name", "slug"]},
-                    {
-                        "project_detail": [
-                            "id",
-                            "name",
-                            "cover_image",
-                            "icon_prop",
-                            "emoji",
-                            "description",
-                        ]
-                    },
-                ],
-            )
+            serializer = StateSerializer(data=request.data)
             if serializer.is_valid():
                 serializer.save(project_id=project_id)
                 return Response(serializer.data, status=status.HTTP_200_OK)
@@ -91,37 +62,7 @@ class StateViewSet(BaseViewSet):
     def list(self, request, slug, project_id):
         try:
             state_dict = dict()
-            states = StateSerializer(
-                self.get_queryset(),
-                fields=[
-                    "id",
-                    "created_by",
-                    "created_at",
-                    "updated_at",
-                    "updated_by",
-                    "name",
-                    "description",
-                    "color",
-                    "slug",
-                    "sequence",
-                    "group",
-                    "default",
-                    "project",
-                    "workspace",
-                    {"workspace_detail": ["id", "name", "slug"]},
-                    {
-                        "project_detail": [
-                            "id",
-                            "name",
-                            "cover_image",
-                            "icon_prop",
-                            "emoji",
-                            "description",
-                        ]
-                    },
-                ],
-                many=True,
-            ).data
+            states = StateSerializer(self.get_queryset(), many=True).data
 
             for key, value in groupby(
                 sorted(states, key=lambda state: state["group"]),
@@ -141,9 +82,7 @@ class StateViewSet(BaseViewSet):
         try:
             state = State.objects.get(
                 ~Q(name="Triage"),
-                pk=pk,
-                project_id=project_id,
-                workspace__slug=slug,
+                pk=pk, project_id=project_id, workspace__slug=slug,
             )
 
             if state.default:

apiserver/plane/api/views/view.py

@@ -19,7 +19,6 @@ from plane.db.models import (
     IssueView,
     Issue,
     IssueViewFavorite,
-    IssueReaction,
 )
 from plane.utils.issue_filters import issue_filters
 
@@ -78,12 +77,6 @@ class ViewIssuesEndpoint(BaseAPIView):
                 .select_related("parent")
                 .prefetch_related("assignees")
                 .prefetch_related("labels")
-                .prefetch_related(
-                    Prefetch(
-                        "issue_reactions",
-                        queryset=IssueReaction.objects.select_related("actor"),
-                    )
-                )
             )
 
             serializer = IssueLiteSerializer(issues, many=True)

apiserver/plane/api/views/workspace.py

@@ -42,7 +42,7 @@ from plane.api.serializers import (
     WorkSpaceMemberSerializer,
     TeamSerializer,
     WorkSpaceMemberInviteSerializer,
-    UserSerializer,
+    UserLiteSerializer,
     ProjectMemberSerializer,
     WorkspaceThemeSerializer,
     IssueActivitySerializer,
@@ -75,7 +75,6 @@ from plane.db.models import (
     Label,
     WorkspaceMember,
     CycleIssue,
-    IssueReaction,
 )
 from plane.api.permissions import (
     WorkSpaceBasePermission,
@@ -106,9 +105,7 @@ class WorkSpaceViewSet(BaseViewSet):
 
     def get_queryset(self):
         member_count = (
-            WorkspaceMember.objects.filter(
-                workspace=OuterRef("id"), member__is_bot=False
-            )
+            WorkspaceMember.objects.filter(workspace=OuterRef("id"))
             .order_by()
             .annotate(count=Func(F("id"), function="Count"))
             .values("count")
@@ -163,8 +160,8 @@ class WorkSpaceViewSet(BaseViewSet):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        # Handling unique integrity error for now
-        # TODO: Extend this to handle other common errors which are not automatically handled by APIException
+        ## Handling unique integrity error for now
+        ## TODO: Extend this to handle other common errors which are not automatically handled by APIException
         except IntegrityError as e:
             if "already exists" in str(e):
                 return Response(
@@ -193,9 +190,7 @@ class UserWorkSpacesEndpoint(BaseAPIView):
     def get(self, request):
         try:
             member_count = (
-                WorkspaceMember.objects.filter(
-                    workspace=OuterRef("id"), member__is_bot=False
-                )
+                WorkspaceMember.objects.filter(workspace=OuterRef("id"))
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
@@ -299,31 +294,7 @@ class InviteWorkspaceEndpoint(BaseAPIView):
                     {
                         "error": "Some users are already member of workspace",
                         "workspace_users": WorkSpaceMemberSerializer(
-                            workspace_members,
-                            fields=[
-                                "id",
-                                "created_by",
-                                "created_at",
-                                "updated_at",
-                                "updated_by",
-                                "name",
-                                "logo",
-                                "owner",
-                                "slug",
-                                "organization_size",
-                                {"workspace": ["id", "name", "slug"]},
-                                {
-                                    "member": [
-                                        "id",
-                                        "first_name",
-                                        "last_name",
-                                        "avatar",
-                                        "is_bot",
-                                        "display_name",
-                                    ]
-                                },
-                            ],
-                            many=True,
+                            workspace_members, many=True
                         ).data,
                     },
                     status=status.HTTP_400_BAD_REQUEST,
@@ -573,7 +544,7 @@ class WorkSpaceMemberViewSet(BaseViewSet):
     ]
 
     search_fields = [
-        "member__display_name",
+        "member__email",
         "member__first_name",
     ]
 
@@ -614,32 +585,7 @@ class WorkSpaceMemberViewSet(BaseViewSet):
                 )
 
             serializer = WorkSpaceMemberSerializer(
-                workspace_member,
-                data=request.data,
-                partial=True,
-                fields=[
-                    "id",
-                    "created_by",
-                    "created_at",
-                    "updated_at",
-                    "updated_by",
-                    "name",
-                    "logo",
-                    "owner",
-                    "slug",
-                    "organization_size",
-                    {"workspace": ["id", "name", "slug"]},
-                    {
-                        "member": [
-                            "id",
-                            "first_name",
-                            "last_name",
-                            "avatar",
-                            "is_bot",
-                            "display_name",
-                        ]
-                    },
-                ],
+                workspace_member, data=request.data, partial=True
             )
 
             if serializer.is_valid():
@@ -677,9 +623,7 @@ class WorkSpaceMemberViewSet(BaseViewSet):
             if (
                 workspace_member.role == 20
                 and WorkspaceMember.objects.filter(
-                    workspace__slug=slug,
-                    role=20,
-                    member__is_bot=False,
+                    workspace__slug=slug, role=20
                 ).count()
                 == 1
             ):
@@ -745,7 +689,7 @@ class TeamMemberViewSet(BaseViewSet):
     ]
 
     search_fields = [
-        "member__display_name",
+        "member__email",
         "member__first_name",
     ]
 
@@ -773,18 +717,7 @@ class TeamMemberViewSet(BaseViewSet):
                 users = list(set(request.data.get("members", [])).difference(members))
                 users = User.objects.filter(pk__in=users)
 
-                serializer = UserSerializer(
-                    users,
-                    fields=[
-                        "id",
-                        "first_name",
-                        "last_name",
-                        "avatar",
-                        "is_bot",
-                        "display_name",
-                    ],
-                    many=True,
-                )
+                serializer = UserLiteSerializer(users, many=True)
                 return Response(
                     {
                         "error": f"{len(users)} of the member(s) are not a part of the workspace",
@@ -850,95 +783,14 @@ class UserLastProjectWithWorkspaceEndpoint(BaseAPIView):
                 )
 
             workspace = Workspace.objects.get(pk=last_workspace_id)
-            workspace_serializer = WorkSpaceSerializer(
-                workspace,
-                fields=[
-                    "id",
-                    {
-                        "owner": [
-                            "id",
-                            "first_name",
-                            "last_name",
-                            "avatar",
-                            "is_bot",
-                            "display_name",
-                        ]
-                    },
-                    "created_at",
-                    "updated_at",
-                    "name",
-                    "logo",
-                    "slug",
-                    "organization_size",
-                    "created_by",
-                    "updated_by",
-                ],
-            )
+            workspace_serializer = WorkSpaceSerializer(workspace)
 
             project_member = ProjectMember.objects.filter(
                 workspace_id=last_workspace_id, member=request.user
             ).select_related("workspace", "project", "member", "workspace__owner")
 
             project_member_serializer = ProjectMemberSerializer(
-                project_member,
-                fields=[
-                    "id",
-                    {
-                        "workspace": [
-                            "id",
-                            {
-                                "owner": [
-                                    "id",
-                                    "first_name",
-                                    "last_name",
-                                    "avatar",
-                                    "is_bot",
-                                    "display_name",
-                                ]
-                            },
-                            "created_at",
-                            "updated_at",
-                            "name",
-                            "logo",
-                            "slug",
-                            "organization_size",
-                            "created_by",
-                            "updated_by",
-                        ]
-                    },
-                    {
-                        "project": [
-                            "id",
-                            "identifier",
-                            "name",
-                            "cover_image",
-                            "icon_prop",
-                            "emoji",
-                            "description",
-                        ]
-                    },
-                    {
-                        "member": [
-                            "id",
-                            "first_name",
-                            "last_name",
-                            "avatar",
-                            "is_bot",
-                            "display_name",
-                        ]
-                    },
-                    "created_at",
-                    "updated_at",
-                    "comment",
-                    "role",
-                    "view_props",
-                    "default_props",
-                    "preferences",
-                    "sort_order",
-                    "created_by",
-                    "updated_by",
-                ],
-                many=True,
+                project_member, many=True
             )
 
             return Response(
@@ -965,32 +817,7 @@ class WorkspaceMemberUserEndpoint(BaseAPIView):
             workspace_member = WorkspaceMember.objects.get(
                 member=request.user, workspace__slug=slug
             )
-            serializer = WorkSpaceMemberSerializer(
-                workspace_member,
-                fields=[
-                    "id",
-                    "created_by",
-                    "created_at",
-                    "updated_at",
-                    "updated_by",
-                    "name",
-                    "logo",
-                    "owner",
-                    "slug",
-                    "organization_size",
-                    {"workspace": ["id", "name", "slug"]},
-                    {
-                        "member": [
-                            "id",
-                            "first_name",
-                            "last_name",
-                            "avatar",
-                            "is_bot",
-                            "display_name",
-                        ]
-                    },
-                ],
-            )
+            serializer = WorkSpaceMemberSerializer(workspace_member)
             return Response(serializer.data, status=status.HTTP_200_OK)
         except (Workspace.DoesNotExist, WorkspaceMember.DoesNotExist):
             return Response({"error": "Forbidden"}, status=status.HTTP_403_FORBIDDEN)
@@ -1159,11 +986,11 @@ class UserWorkspaceDashboardEndpoint(BaseAPIView):
 
             upcoming_issues = Issue.issue_objects.filter(
                 ~Q(state__group__in=["completed", "cancelled"]),
-                start_date__gte=timezone.now(),
+                target_date__gte=timezone.now(),
                 workspace__slug=slug,
                 assignees__in=[request.user],
                 completed_at__isnull=True,
-            ).values("id", "name", "workspace__slug", "project_id", "start_date")
+            ).values("id", "name", "workspace__slug", "project_id", "target_date")
 
             return Response(
                 {
@@ -1220,6 +1047,7 @@ class WorkspaceThemeViewSet(BaseViewSet):
 
 
 class WorkspaceUserProfileStatsEndpoint(BaseAPIView):
+
     def get(self, request, slug, user_id):
         try:
             filters = issue_filters(request.query_params, "GET")
@@ -1317,18 +1145,14 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):
             upcoming_cycles = CycleIssue.objects.filter(
                 workspace__slug=slug,
                 cycle__start_date__gt=timezone.now().date(),
-                issue__assignees__in=[
-                    user_id,
-                ],
+                issue__assignees__in=[user_id,]
             ).values("cycle__name", "cycle__id", "cycle__project_id")
 
             present_cycle = CycleIssue.objects.filter(
                 workspace__slug=slug,
                 cycle__start_date__lt=timezone.now().date(),
                 cycle__end_date__gt=timezone.now().date(),
-                issue__assignees__in=[
-                    user_id,
-                ],
+                issue__assignees__in=[user_id,]
             ).values("cycle__name", "cycle__id", "cycle__project_id")
 
             return Response(
@@ -1341,7 +1165,7 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):
                     "pending_issues": pending_issues_count,
                     "subscribed_issues": subscribed_issues_count,
                     "present_cycles": present_cycle,
-                    "upcoming_cycles": upcoming_cycles,
+                    "upcoming_cycles": upcoming_cycles, 
                 }
             )
         except Exception as e:
@@ -1359,6 +1183,7 @@ class WorkspaceUserActivityEndpoint(BaseAPIView):
 
     def get(self, request, slug, user_id):
         try:
+
             projects = request.query_params.getlist("project", [])
 
             queryset = IssueActivity.objects.filter(
@@ -1374,18 +1199,7 @@ class WorkspaceUserActivityEndpoint(BaseAPIView):
                 request=request,
                 queryset=queryset,
                 on_results=lambda issue_activities: IssueActivitySerializer(
-                    issue_activities,
-                    nested_fields={
-                        "actor_detail": (
-                            "id",
-                            "first_name",
-                            "last_name",
-                            "avatar",
-                            "is_bot",
-                            "display_name",
-                        )
-                    },
-                    many=True,
+                    issue_activities, many=True
                 ).data,
             )
         except Exception as e:
@@ -1397,13 +1211,12 @@ class WorkspaceUserActivityEndpoint(BaseAPIView):
 
 
 class WorkspaceUserProfileEndpoint(BaseAPIView):
+
     def get(self, request, slug, user_id):
         try:
             user_data = User.objects.get(pk=user_id)
 
-            requesting_workspace_member = WorkspaceMember.objects.get(
-                workspace__slug=slug, member=request.user
-            )
+            requesting_workspace_member = WorkspaceMember.objects.get(workspace__slug=slug, member=request.user)
             projects = []
             if requesting_workspace_member.role >= 10:
                 projects = (
@@ -1413,8 +1226,7 @@ class WorkspaceUserProfileEndpoint(BaseAPIView):
                     )
                     .annotate(
                         created_issues=Count(
-                            "project_issue",
-                            filter=Q(project_issue__created_by_id=user_id),
+                            "project_issue", filter=Q(project_issue__created_by_id=user_id)
                         )
                     )
                     .annotate(
@@ -1469,7 +1281,6 @@ class WorkspaceUserProfileEndpoint(BaseAPIView):
                         "cover_image": user_data.cover_image,
                         "date_joined": user_data.date_joined,
                         "user_timezone": user_data.user_timezone,
-                        "display_name": user_data.display_name,
                     },
                 },
                 status=status.HTTP_200_OK,
@@ -1510,12 +1321,6 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):
                 )
                 .select_related("project", "workspace", "state", "parent")
                 .prefetch_related("assignees", "labels")
-                .prefetch_related(
-                    Prefetch(
-                        "issue_reactions",
-                        queryset=IssueReaction.objects.select_related("actor"),
-                    )
-                )
                 .order_by("-created_at")
                 .annotate(
                     link_count=IssueLink.objects.filter(issue=OuterRef("id"))
@@ -1593,7 +1398,7 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):
 
             issues = IssueLiteSerializer(issue_queryset, many=True).data
 
-            # Grouping the results
+            ## Grouping the results
             group_by = request.GET.get("group_by", False)
             if group_by:
                 return Response(
@@ -1627,50 +1432,3 @@ class WorkspaceLabelsEndpoint(BaseAPIView):
                 {"error": "Something went wrong please try again later"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
-
-
-class WorkspaceMembersEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkspaceEntityPermission,
-    ]
-
-    def get(self, request, slug):
-        try:
-            workspace_members = WorkspaceMember.objects.filter(
-                workspace__slug=slug,
-                member__is_bot=False,
-            ).select_related("workspace", "member")
-            serializer = WorkSpaceMemberSerializer(
-                workspace_members,
-                fields=[
-                    "id",
-                    "created_by",
-                    "created_at",
-                    "updated_at",
-                    "updated_by",
-                    "name",
-                    "logo",
-                    "owner",
-                    "slug",
-                    "organization_size",
-                    {"workspace": ["id", "name", "slug"]},
-                    {
-                        "member": [
-                            "id",
-                            "first_name",
-                            "last_name",
-                            "avatar",
-                            "is_bot",
-                            "display_name",
-                        ]
-                    },
-                ],
-                many=True,
-            )
-            return Response(serializer.data, status=status.HTTP_200_OK)
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )

apiserver/plane/bgtasks/analytic_plot_export.py

@@ -21,7 +21,7 @@ row_mapping = {
     "state__name": "State",
     "state__group": "State Group",
     "labels__name": "Label",
-    "assignees__display_name": "Assignee Name",
+    "assignees__email": "Assignee Name",
     "start_date": "Start Date",
     "target_date": "Due Date",
     "completed_at": "Completed At",
@@ -51,12 +51,12 @@ def analytic_export_task(email, data, slug):
         segmented = segment
 
         assignee_details = {}
-        if x_axis in ["assignees__id"] or segment in ["assignees__id"]:
+        if x_axis in ["assignees__email"] or segment in ["assignees__email"]:
             assignee_details = (
                 Issue.issue_objects.filter(workspace__slug=slug, **filters, assignees__avatar__isnull=False)
                 .order_by("assignees__id")
                 .distinct("assignees__id")
-                .values("assignees__avatar", "assignees__display_name", "assignees__first_name", "assignees__last_name", "assignees__id")
+                .values("assignees__avatar", "assignees__email", "assignees__first_name", "assignees__last_name")
             )
 
         if segment:
@@ -93,19 +93,19 @@ def analytic_export_task(email, data, slug):
                     else:
                         generated_row.append("0")
                 # x-axis replacement for names
-                if x_axis in ["assignees__id"]:
-                    assignee = [user for user in assignee_details if str(user.get("assignees__id")) == str(item)]
+                if x_axis in ["assignees__email"]:
+                    assignee = [user for user in assignee_details if str(user.get("assignees__email")) == str(item)]
                     if len(assignee):
                         generated_row[0] = str(assignee[0].get("assignees__first_name")) + " " + str(assignee[0].get("assignees__last_name"))
                 rows.append(tuple(generated_row))
 
-            # If segment is ["assignees__display_name"] then replace segment_zero rows with first and last names
-            if segmented in ["assignees__id"]:
+            # If segment is ["assignees__email"] then replace segment_zero rows with first and last names
+            if segmented in ["assignees__email"]:
                 for index, segm in enumerate(row_zero[2:]):
                     # find the name of the user
-                    assignee = [user for user in assignee_details if str(user.get("assignees__id")) == str(segm)]
+                    assignee = [user for user in assignee_details if str(user.get("assignees__email")) == str(segm)]
                     if len(assignee):
-                        row_zero[index + 2] = str(assignee[0].get("assignees__first_name")) + " " + str(assignee[0].get("assignees__last_name"))
+                        row_zero[index] = str(assignee[0].get("assignees__first_name")) + " " + str(assignee[0].get("assignees__last_name"))
 
             rows = [tuple(row_zero)] + rows
             csv_buffer = io.StringIO()
@@ -141,8 +141,8 @@ def analytic_export_task(email, data, slug):
                             else distribution.get(item)[0].get("estimate  "),
                         ]
                 # x-axis replacement to names
-                if x_axis in ["assignees__id"]:
-                    assignee = [user for user in assignee_details if str(user.get("assignees__id")) == str(item)]
+                if x_axis in ["assignees__email"]:
+                    assignee = [user for user in assignee_details if str(user.get("assignees__email")) == str(item)]
                     if len(assignee):
                         row[0] = str(assignee[0].get("assignees__first_name")) + " " + str(assignee[0].get("assignees__last_name"))
 

apiserver/plane/bgtasks/export_task.py

@@ -1,346 +0,0 @@
-# Python imports
-import csv
-import io
-import json
-import boto3
-import zipfile
-
-# Django imports
-from django.conf import settings
-from django.utils import timezone
-
-# Third party imports
-from celery import shared_task
-from sentry_sdk import capture_exception
-from botocore.client import Config
-from openpyxl import Workbook
-
-# Module imports
-from plane.db.models import Issue, ExporterHistory
-
-
-def dateTimeConverter(time):
-    if time:
-        return time.strftime("%a, %d %b %Y %I:%M:%S %Z%z")
-
-def dateConverter(time):
-    if time:
-        return time.strftime("%a, %d %b %Y")    
-
-def create_csv_file(data):
-    csv_buffer = io.StringIO()
-    csv_writer = csv.writer(csv_buffer, delimiter=",", quoting=csv.QUOTE_ALL)
-
-    for row in data:
-        csv_writer.writerow(row)
-
-    csv_buffer.seek(0)
-    return csv_buffer.getvalue()
-
-
-def create_json_file(data):
-    return json.dumps(data)
-
-
-def create_xlsx_file(data):
-    workbook = Workbook()
-    sheet = workbook.active
-
-    for row in data:
-        sheet.append(row)
-
-    xlsx_buffer = io.BytesIO()
-    workbook.save(xlsx_buffer)
-    xlsx_buffer.seek(0)
-    return xlsx_buffer.getvalue()
-
-
-def create_zip_file(files):
-    zip_buffer = io.BytesIO()
-    with zipfile.ZipFile(zip_buffer, "w", zipfile.ZIP_DEFLATED) as zipf:
-        for filename, file_content in files:
-            zipf.writestr(filename, file_content)
-
-    zip_buffer.seek(0)
-    return zip_buffer
-
-
-def upload_to_s3(zip_file, workspace_id, token_id, slug):
-    s3 = boto3.client(
-        "s3",
-        region_name="ap-south-1",
-        aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
-        aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY,
-        config=Config(signature_version="s3v4"),
-    )
-    file_name = f"{workspace_id}/export-{slug}-{token_id[:6]}-{timezone.now()}.zip"
-
-    s3.upload_fileobj(
-        zip_file,
-        settings.AWS_S3_BUCKET_NAME,
-        file_name,
-        ExtraArgs={"ACL": "public-read", "ContentType": "application/zip"},
-    )
-
-    expires_in = 7 * 24 * 60 * 60
-    presigned_url = s3.generate_presigned_url(
-        "get_object",
-        Params={"Bucket": settings.AWS_S3_BUCKET_NAME, "Key": file_name},
-        ExpiresIn=expires_in,
-    )
-
-    exporter_instance = ExporterHistory.objects.get(token=token_id)
-
-    if presigned_url:
-        exporter_instance.url = presigned_url
-        exporter_instance.status = "completed"
-        exporter_instance.key = file_name
-    else:
-        exporter_instance.status = "failed"
-
-    exporter_instance.save(update_fields=["status", "url","key"])
-
-
-def generate_table_row(issue):
-    return [
-        f"""{issue["project__identifier"]}-{issue["sequence_id"]}""",
-        issue["project__name"],
-        issue["name"],
-        issue["description_stripped"],
-        issue["state__name"],
-        issue["priority"],
-        f"{issue['created_by__first_name']} {issue['created_by__last_name']}"
-        if issue["created_by__first_name"] and issue["created_by__last_name"]
-        else "",
-        f"{issue['assignees__first_name']} {issue['assignees__last_name']}"
-        if issue["assignees__first_name"] and issue["assignees__last_name"]
-        else "",
-        issue["labels__name"],
-        issue["issue_cycle__cycle__name"],
-        dateConverter(issue["issue_cycle__cycle__start_date"]),
-        dateConverter(issue["issue_cycle__cycle__end_date"]),
-        issue["issue_module__module__name"],
-        dateConverter(issue["issue_module__module__start_date"]),
-        dateConverter(issue["issue_module__module__target_date"]),
-        dateTimeConverter(issue["created_at"]),
-        dateTimeConverter(issue["updated_at"]),
-        dateTimeConverter(issue["completed_at"]),
-        dateTimeConverter(issue["archived_at"]),
-    ]
-
-
-def generate_json_row(issue):
-    return {
-        "ID": f"""{issue["project__identifier"]}-{issue["sequence_id"]}""",
-        "Project": issue["project__name"],
-        "Name": issue["name"],
-        "Description": issue["description_stripped"],
-        "State": issue["state__name"],
-        "Priority": issue["priority"],
-        "Created By": f"{issue['created_by__first_name']} {issue['created_by__last_name']}"
-        if issue["created_by__first_name"] and issue["created_by__last_name"]
-        else "",
-        "Assignee": f"{issue['assignees__first_name']} {issue['assignees__last_name']}"
-        if issue["assignees__first_name"] and issue["assignees__last_name"]
-        else "",
-        "Labels": issue["labels__name"],
-        "Cycle Name": issue["issue_cycle__cycle__name"],
-        "Cycle Start Date":  dateConverter(issue["issue_cycle__cycle__start_date"]),
-        "Cycle End Date": dateConverter(issue["issue_cycle__cycle__end_date"]),
-        "Module Name": issue["issue_module__module__name"],
-        "Module Start Date": dateConverter(issue["issue_module__module__start_date"]),
-        "Module Target Date": dateConverter(issue["issue_module__module__target_date"]),
-        "Created At": dateTimeConverter(issue["created_at"]),
-        "Updated At": dateTimeConverter(issue["updated_at"]),
-        "Completed At": dateTimeConverter(issue["completed_at"]),
-        "Archived At": dateTimeConverter(issue["archived_at"]),
-    }
-
-
-def update_json_row(rows, row):
-    matched_index = next(
-        (
-            index
-            for index, existing_row in enumerate(rows)
-            if existing_row["ID"] == row["ID"]
-        ),
-        None,
-    )
-
-    if matched_index is not None:
-        existing_assignees, existing_labels = (
-            rows[matched_index]["Assignee"],
-            rows[matched_index]["Labels"],
-        )
-        assignee, label = row["Assignee"], row["Labels"]
-
-        if assignee is not None and assignee not in existing_assignees:
-            rows[matched_index]["Assignee"] += f", {assignee}"
-        if label is not None and label not in existing_labels:
-            rows[matched_index]["Labels"] += f", {label}"
-    else:
-        rows.append(row)
-
-
-def update_table_row(rows, row):
-    matched_index = next(
-        (index for index, existing_row in enumerate(rows) if existing_row[0] == row[0]),
-        None,
-    )
-
-    if matched_index is not None:
-        existing_assignees, existing_labels = rows[matched_index][7:9]
-        assignee, label = row[7:9]
-
-        if assignee is not None and assignee not in existing_assignees:
-            rows[matched_index][7] += f", {assignee}"
-        if label is not None and label not in existing_labels:
-            rows[matched_index][8] += f", {label}"
-    else:
-        rows.append(row)
-
-
-def generate_csv(header, project_id, issues, files):
-    """
-    Generate CSV export for all the passed issues.
-    """
-    rows = [
-        header,
-    ]
-    for issue in issues:
-        row = generate_table_row(issue)
-        update_table_row(rows, row)
-    csv_file = create_csv_file(rows)
-    files.append((f"{project_id}.csv", csv_file))
-
-
-def generate_json(header, project_id, issues, files):
-    rows = []
-    for issue in issues:
-        row = generate_json_row(issue)
-        update_json_row(rows, row)
-    json_file = create_json_file(rows)
-    files.append((f"{project_id}.json", json_file))
-
-
-def generate_xlsx(header, project_id, issues, files):
-    rows = [header]
-    for issue in issues:
-        row = generate_table_row(issue)
-        update_table_row(rows, row)
-    xlsx_file = create_xlsx_file(rows)
-    files.append((f"{project_id}.xlsx", xlsx_file))
-
-
-@shared_task
-def issue_export_task(provider, workspace_id, project_ids, token_id, multiple, slug):
-    try:
-        exporter_instance = ExporterHistory.objects.get(token=token_id)
-        exporter_instance.status = "processing"
-        exporter_instance.save(update_fields=["status"])
-
-        workspace_issues = (
-            (
-                Issue.objects.filter(
-                    workspace__id=workspace_id, project_id__in=project_ids
-                )
-                .select_related("project", "workspace", "state", "parent", "created_by")
-                .prefetch_related(
-                    "assignees", "labels", "issue_cycle__cycle", "issue_module__module"
-                )
-                .values(
-                    "id",
-                    "project__identifier",
-                    "project__name",
-                    "project__id",
-                    "sequence_id",
-                    "name",
-                    "description_stripped",
-                    "priority",
-                    "state__name",
-                    "created_at",
-                    "updated_at",
-                    "completed_at",
-                    "archived_at",
-                    "issue_cycle__cycle__name",
-                    "issue_cycle__cycle__start_date",
-                    "issue_cycle__cycle__end_date",
-                    "issue_module__module__name",
-                    "issue_module__module__start_date",
-                    "issue_module__module__target_date",
-                    "created_by__first_name",
-                    "created_by__last_name",
-                    "assignees__first_name",
-                    "assignees__last_name",
-                    "labels__name",
-                )
-            )
-            .order_by("project__identifier","sequence_id")
-            .distinct()
-        )
-        # CSV header
-        header = [
-            "ID",
-            "Project",
-            "Name",
-            "Description",
-            "State",
-            "Priority",
-            "Created By",
-            "Assignee",
-            "Labels",
-            "Cycle Name",
-            "Cycle Start Date",
-            "Cycle End Date",
-            "Module Name",
-            "Module Start Date",
-            "Module Target Date",
-            "Created At",
-            "Updated At",
-            "Completed At",
-            "Archived At",
-        ]
-
-        EXPORTER_MAPPER = {
-            "csv": generate_csv,
-            "json": generate_json,
-            "xlsx": generate_xlsx,
-        }
-
-        files = []
-        if multiple:
-            for project_id in project_ids:
-                issues = workspace_issues.filter(project__id=project_id)
-                exporter = EXPORTER_MAPPER.get(provider)
-                if exporter is not None:
-                    exporter(
-                        header,
-                        project_id,
-                        issues,
-                        files,
-                    )
-
-        else:
-            exporter = EXPORTER_MAPPER.get(provider)
-            if exporter is not None:
-                exporter(
-                    header,
-                    workspace_id,
-                    workspace_issues,
-                    files,
-                )
-
-        zip_buffer = create_zip_file(files)
-        upload_to_s3(zip_buffer, workspace_id, token_id, slug)
-
-    except Exception as e:
-        exporter_instance = ExporterHistory.objects.get(token=token_id)
-        exporter_instance.status = "failed"
-        exporter_instance.reason = str(e)
-        exporter_instance.save(update_fields=["status", "reason"])
-
-        # Print logs if in DEBUG mode
-        if settings.DEBUG:
-            print(e)
-        capture_exception(e)
-        return

apiserver/plane/bgtasks/exporter_expired_task.py

@@ -1,38 +0,0 @@
-# Python imports
-import boto3
-from datetime import timedelta
-
-# Django imports
-from django.conf import settings
-from django.utils import timezone
-from django.db.models import Q
-
-# Third party imports
-from celery import shared_task
-from botocore.client import Config
-
-# Module imports
-from plane.db.models import ExporterHistory
-
-
-@shared_task
-def delete_old_s3_link():
-    # Get a list of keys and IDs to process
-    expired_exporter_history = ExporterHistory.objects.filter(
-        Q(url__isnull=False) & Q(created_at__lte=timezone.now() - timedelta(days=8))
-    ).values_list("key", "id")
-
-    s3 = boto3.client(
-        "s3",
-        region_name="ap-south-1",
-        aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
-        aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY,
-        config=Config(signature_version="s3v4"),
-    )
-
-    for file_name, exporter_id in expired_exporter_history:
-        # Delete object from S3
-        if file_name:
-            s3.delete_object(Bucket=settings.AWS_S3_BUCKET_NAME, Key=file_name)
-
-        ExporterHistory.objects.filter(id=exporter_id).update(url=None)

apiserver/plane/bgtasks/importer_task.py

@@ -161,47 +161,7 @@ def service_importer(service, importer_id):
         if settings.PROXY_BASE_URL:
             headers = {"Content-Type": "application/json"}
             import_data_json = json.dumps(
-                ImporterSerializer(
-                    importer,
-                    fields=[
-                        "id",
-                        "created_by",
-                        "created_at",
-                        "updated_at",
-                        "updated_by",
-                        "workspace",
-                        "project",
-                        "service",
-                        "status",
-                        "initiated_by",
-                        "metadata",
-                        "config",
-                        "data",
-                        "token",
-                        "imported_data",
-                        {
-                            "initiated_by_detail": [
-                                "id",
-                                "first_name",
-                                "last_name",
-                                "avatar",
-                                "is_bot",
-                                "display_name",
-                            ],
-                        },
-                        {
-                            "project_detail": [
-                                "id",
-                                "name",
-                                "cover_image",
-                                "icon_prop",
-                                "emoji",
-                                "description",
-                            ]
-                        },
-                        {"workspace_detail": ["id", "name", "slug"]},
-                    ],
-                ).data,
+                ImporterSerializer(importer).data,
                 cls=DjangoJSONEncoder,
             )
             res = requests.post(

apiserver/plane/bgtasks/issue_activites_task.py

@@ -48,7 +48,7 @@ def track_name(
                 field="name",
                 project=project,
                 workspace=project.workspace,
-                comment=f"updated the name to {requested_data.get('name')}",
+                comment=f"{actor.email} updated the name to {requested_data.get('name')}",
             )
         )
 
@@ -75,7 +75,7 @@ def track_parent(
                     field="parent",
                     project=project,
                     workspace=project.workspace,
-                    comment=f"updated the parent issue to None",
+                    comment=f"{actor.email} updated the parent issue to None",
                     old_identifier=old_parent.id,
                     new_identifier=None,
                 )
@@ -95,7 +95,7 @@ def track_parent(
                     field="parent",
                     project=project,
                     workspace=project.workspace,
-                    comment=f"updated the parent issue to {new_parent.name}",
+                    comment=f"{actor.email} updated the parent issue to {new_parent.name}",
                     old_identifier=old_parent.id if old_parent is not None else None,
                     new_identifier=new_parent.id,
                 )
@@ -123,7 +123,7 @@ def track_priority(
                     field="priority",
                     project=project,
                     workspace=project.workspace,
-                    comment=f"updated the priority to None",
+                    comment=f"{actor.email} updated the priority to None",
                 )
             )
         else:
@@ -137,7 +137,7 @@ def track_priority(
                     field="priority",
                     project=project,
                     workspace=project.workspace,
-                    comment=f"updated the priority to {requested_data.get('priority')}",
+                    comment=f"{actor.email} updated the priority to {requested_data.get('priority')}",
                 )
             )
 
@@ -165,7 +165,7 @@ def track_state(
                 field="state",
                 project=project,
                 workspace=project.workspace,
-                comment=f"updated the state to {new_state.name}",
+                comment=f"{actor.email} updated the state to {new_state.name}",
                 old_identifier=old_state.id,
                 new_identifier=new_state.id,
             )
@@ -184,24 +184,19 @@ def track_description(
     if current_instance.get("description_html") != requested_data.get(
         "description_html"
     ):
-        last_activity = IssueActivity.objects.filter(issue_id=issue_id).order_by("-created_at").first()
-        if(last_activity is not None and last_activity.field == "description" and actor.id == last_activity.actor_id):
-            last_activity.created_at = timezone.now()
-            last_activity.save(update_fields=["created_at"])
-        else:
-                issue_activities.append(
-                    IssueActivity(
-                        issue_id=issue_id,
-                        actor=actor,
-                        verb="updated",
-                        old_value=current_instance.get("description_html"),
-                        new_value=requested_data.get("description_html"),
-                        field="description",
-                        project=project,
-                        workspace=project.workspace,
-                        comment=f"updated the description to {requested_data.get('description_html')}",
-                    )
-                )
+        issue_activities.append(
+            IssueActivity(
+                issue_id=issue_id,
+                actor=actor,
+                verb="updated",
+                old_value=current_instance.get("description_html"),
+                new_value=requested_data.get("description_html"),
+                field="description",
+                project=project,
+                workspace=project.workspace,
+                comment=f"{actor.email} updated the description to {requested_data.get('description_html')}",
+            )
+        )
 
 
 # Track changes in issue target date
@@ -225,7 +220,7 @@ def track_target_date(
                     field="target_date",
                     project=project,
                     workspace=project.workspace,
-                    comment=f"updated the target date to None",
+                    comment=f"{actor.email} updated the target date to None",
                 )
             )
         else:
@@ -239,7 +234,7 @@ def track_target_date(
                     field="target_date",
                     project=project,
                     workspace=project.workspace,
-                    comment=f"updated the target date to {requested_data.get('target_date')}",
+                    comment=f"{actor.email} updated the target date to {requested_data.get('target_date')}",
                 )
             )
 
@@ -265,7 +260,7 @@ def track_start_date(
                     field="start_date",
                     project=project,
                     workspace=project.workspace,
-                    comment=f"updated the start date to None",
+                    comment=f"{actor.email} updated the start date to None",
                 )
             )
         else:
@@ -279,7 +274,7 @@ def track_start_date(
                     field="start_date",
                     project=project,
                     workspace=project.workspace,
-                    comment=f"updated the start date to {requested_data.get('start_date')}",
+                    comment=f"{actor.email} updated the start date to {requested_data.get('start_date')}",
                 )
             )
 
@@ -308,7 +303,7 @@ def track_labels(
                         field="labels",
                         project=project,
                         workspace=project.workspace,
-                        comment=f"added label {label.name}",
+                        comment=f"{actor.email} added label {label.name}",
                         new_identifier=label.id,
                         old_identifier=None,
                     )
@@ -329,7 +324,7 @@ def track_labels(
                         field="labels",
                         project=project,
                         workspace=project.workspace,
-                        comment=f"removed label {label.name}",
+                        comment=f"{actor.email} removed label {label.name}",
                         old_identifier=label.id,
                         new_identifier=None,
                     )
@@ -358,12 +353,12 @@ def track_assignees(
                         actor=actor,
                         verb="updated",
                         old_value="",
-                        new_value=assignee.display_name,
+                        new_value=assignee.email,
                         field="assignees",
                         project=project,
                         workspace=project.workspace,
-                        comment=f"added assignee {assignee.display_name}",
-                        new_identifier=assignee.id,
+                        comment=f"{actor.email} added assignee {assignee.email}",
+                        new_identifier=actor.id,
                     )
                 )
 
@@ -379,13 +374,13 @@ def track_assignees(
                         issue_id=issue_id,
                         actor=actor,
                         verb="updated",
-                        old_value=assignee.display_name,
+                        old_value=assignee.email,
                         new_value="",
                         field="assignees",
                         project=project,
                         workspace=project.workspace,
-                        comment=f"removed assignee {assignee.display_name}",
-                        old_identifier=assignee.id,
+                        comment=f"{actor.email} removed assignee {assignee.email}",
+                        old_identifier=actor.id,
                     )
                 )
 
@@ -424,7 +419,7 @@ def track_blocks(
                         field="blocks",
                         project=project,
                         workspace=project.workspace,
-                        comment=f"added blocking issue {project.identifier}-{issue.sequence_id}",
+                        comment=f"{actor.email} added blocking issue {issue.project.identifier}-{issue.sequence_id}",
                         new_identifier=issue.id,
                     )
                 )
@@ -446,7 +441,7 @@ def track_blocks(
                         field="blocks",
                         project=project,
                         workspace=project.workspace,
-                        comment=f"removed blocking issue {project.identifier}-{issue.sequence_id}",
+                        comment=f"{actor.email} removed blocking issue {issue.project.identifier}-{issue.sequence_id}",
                         old_identifier=issue.id,
                     )
                 )
@@ -486,7 +481,7 @@ def track_blockings(
                         field="blocking",
                         project=project,
                         workspace=project.workspace,
-                        comment=f"added blocked by issue {project.identifier}-{issue.sequence_id}",
+                        comment=f"{actor.email} added blocked by issue {issue.project.identifier}-{issue.sequence_id}",
                         new_identifier=issue.id,
                     )
                 )
@@ -508,7 +503,7 @@ def track_blockings(
                         field="blocking",
                         project=project,
                         workspace=project.workspace,
-                        comment=f"removed blocked by issue {project.identifier}-{issue.sequence_id}",
+                        comment=f"{actor.email} removed blocked by issue {issue.project.identifier}-{issue.sequence_id}",
                         old_identifier=issue.id,
                     )
                 )
@@ -522,7 +517,7 @@ def create_issue_activity(
             issue_id=issue_id,
             project=project,
             workspace=project.workspace,
-            comment=f"created the issue",
+            comment=f"{actor.email} created the issue",
             verb="created",
             actor=actor,
         )
@@ -544,7 +539,7 @@ def track_estimate_points(
                     field="estimate_point",
                     project=project,
                     workspace=project.workspace,
-                    comment=f"updated the estimate point to None",
+                    comment=f"{actor.email} updated the estimate point to None",
                 )
             )
         else:
@@ -558,7 +553,7 @@ def track_estimate_points(
                     field="estimate_point",
                     project=project,
                     workspace=project.workspace,
-                    comment=f"updated the estimate point to {requested_data.get('estimate_point')}",
+                    comment=f"{actor.email} updated the estimate point to {requested_data.get('estimate_point')}",
                 )
             )
 
@@ -572,7 +567,7 @@ def track_archive_at(
                 issue_id=issue_id,
                 project=project,
                 workspace=project.workspace,
-                comment=f"has restored the issue",
+                comment=f"{actor.email} has restored the issue",
                 verb="updated",
                 actor=actor,
                 field="archived_at",
@@ -666,7 +661,7 @@ def delete_issue_activity(
         IssueActivity(
             project=project,
             workspace=project.workspace,
-            comment=f"deleted the issue",
+            comment=f"{actor.email} deleted the issue",
             verb="deleted",
             actor=actor,
             field="issue",
@@ -687,7 +682,7 @@ def create_comment_activity(
             issue_id=issue_id,
             project=project,
             workspace=project.workspace,
-            comment=f"created a comment",
+            comment=f"{actor.email} created a comment",
             verb="created",
             actor=actor,
             field="comment",
@@ -712,7 +707,7 @@ def update_comment_activity(
                 issue_id=issue_id,
                 project=project,
                 workspace=project.workspace,
-                comment=f"updated a comment",
+                comment=f"{actor.email} updated a comment",
                 verb="updated",
                 actor=actor,
                 field="comment",
@@ -733,7 +728,7 @@ def delete_comment_activity(
             issue_id=issue_id,
             project=project,
             workspace=project.workspace,
-            comment=f"deleted the comment",
+            comment=f"{actor.email} deleted the comment",
             verb="deleted",
             actor=actor,
             field="comment",
@@ -771,7 +766,7 @@ def create_cycle_issue_activity(
                 field="cycles",
                 project=project,
                 workspace=project.workspace,
-                comment=f"updated cycle from {old_cycle.name} to {new_cycle.name}",
+                comment=f"{actor.email} updated cycle from {old_cycle.name} to {new_cycle.name}",
                 old_identifier=old_cycle.id,
                 new_identifier=new_cycle.id,
             )
@@ -792,7 +787,7 @@ def create_cycle_issue_activity(
                 field="cycles",
                 project=project,
                 workspace=project.workspace,
-                comment=f"added cycle {cycle.name}",
+                comment=f"{actor.email} added cycle {cycle.name}",
                 new_identifier=cycle.id,
             )
         )
@@ -821,7 +816,7 @@ def delete_cycle_issue_activity(
                 field="cycles",
                 project=project,
                 workspace=project.workspace,
-                comment=f"removed this issue from {cycle.name if cycle is not None else None}",
+                comment=f"{actor.email} removed this issue from {cycle.name if cycle is not None else None}",
                 old_identifier=cycle.id if cycle is not None else None,
             )
         )
@@ -857,7 +852,7 @@ def create_module_issue_activity(
                 field="modules",
                 project=project,
                 workspace=project.workspace,
-                comment=f"updated module from {old_module.name} to {new_module.name}",
+                comment=f"{actor.email} updated module from {old_module.name} to {new_module.name}",
                 old_identifier=old_module.id,
                 new_identifier=new_module.id,
             )
@@ -877,7 +872,7 @@ def create_module_issue_activity(
                 field="modules",
                 project=project,
                 workspace=project.workspace,
-                comment=f"added module {module.name}",
+                comment=f"{actor.email} added module {module.name}",
                 new_identifier=module.id,
             )
         )
@@ -906,7 +901,7 @@ def delete_module_issue_activity(
                 field="modules",
                 project=project,
                 workspace=project.workspace,
-                comment=f"removed this issue from {module.name if module is not None else None}",
+                comment=f"{actor.email} removed this issue from {module.name if module is not None else None}",
                 old_identifier=module.id if module is not None else None,
             )
         )
@@ -925,7 +920,7 @@ def create_link_activity(
             issue_id=issue_id,
             project=project,
             workspace=project.workspace,
-            comment=f"created a link",
+            comment=f"{actor.email} created a link",
             verb="created",
             actor=actor,
             field="link",
@@ -949,7 +944,7 @@ def update_link_activity(
                 issue_id=issue_id,
                 project=project,
                 workspace=project.workspace,
-                comment=f"updated a link",
+                comment=f"{actor.email} updated a link",
                 verb="updated",
                 actor=actor,
                 field="link",
@@ -974,7 +969,7 @@ def delete_link_activity(
             issue_id=issue_id,
             project=project,
             workspace=project.workspace,
-            comment=f"deleted the link",
+            comment=f"{actor.email} deleted the link",
             verb="deleted",
             actor=actor,
             field="link",
@@ -997,7 +992,7 @@ def create_attachment_activity(
             issue_id=issue_id,
             project=project,
             workspace=project.workspace,
-            comment=f"created an attachment",
+            comment=f"{actor.email} created an attachment",
             verb="created",
             actor=actor,
             field="attachment",
@@ -1015,7 +1010,7 @@ def delete_attachment_activity(
             issue_id=issue_id,
             project=project,
             workspace=project.workspace,
-            comment=f"deleted the attachment",
+            comment=f"{actor.email} deleted the attachment",
             verb="deleted",
             actor=actor,
             field="attachment",
@@ -1103,7 +1098,7 @@ def issue_activity(
                     for issue_activity in issue_activities_created:
                         headers = {"Content-Type": "application/json"}
                         issue_activity_json = json.dumps(
-                            IssueActivitySerializer(issue_activity,fields=[{"actor_detail":["id", "first_name", "last_name", "avatar", "is_bot", "display_name"]}]).data,
+                            IssueActivitySerializer(issue_activity).data,
                             cls=DjangoJSONEncoder,
                         )
                         _ = requests.post(

apiserver/plane/celery.py

@@ -20,10 +20,6 @@ app.conf.beat_schedule = {
         "task": "plane.bgtasks.issue_automation_task.archive_and_close_old_issues",
         "schedule": crontab(hour=0, minute=0),
     },
-    "check-every-day-to-delete_exporter_history": {
-        "task": "plane.bgtasks.exporter_expired_task.delete_old_s3_link",
-        "schedule": crontab(hour=0, minute=0),
-    },
 }
 
 # Load task modules from all registered Django app configs.

apiserver/plane/db/migrations/0040_projectmember_preferences_user_cover_image_and_more.py

@@ -67,15 +67,5 @@ class Migration(migrations.Migration):
                 'ordering': ('-created_at',),
                 'unique_together': {('comment', 'actor', 'reaction')},
             },
-        ),       
-        migrations.AlterField(
-            model_name='project',
-            name='identifier',
-            field=models.CharField(max_length=12, verbose_name='Project Identifier'),
-        ),
-        migrations.AlterField(
-            model_name='projectidentifier',
-            name='name',
-            field=models.CharField(max_length=12),
         ),
     ]

apiserver/plane/db/migrations/0041_cycle_sort_order_issuecomment_access_and_more.py

@@ -1,243 +0,0 @@
-# Generated by Django 4.2.3 on 2023-08-14 07:12
-
-from django.conf import settings
-import django.contrib.postgres.fields
-from django.db import migrations, models
-import django.db.models.deletion
-import plane.db.models.exporter
-import plane.db.models.project
-import uuid
-import random
-import string
-
-def generate_display_name(apps, schema_editor):
-    UserModel = apps.get_model("db", "User")
-    updated_users = []
-    for obj in UserModel.objects.all():
-        obj.display_name = (
-            obj.email.split("@")[0]
-            if len(obj.email.split("@"))
-            else "".join(random.choice(string.ascii_letters) for _ in range(6))
-        )
-        updated_users.append(obj)
-    UserModel.objects.bulk_update(updated_users, ["display_name"], batch_size=100)
-
-
-def rectify_field_issue_activity(apps, schema_editor):
-    Model = apps.get_model("db", "IssueActivity")
-    updated_activity = []
-    for obj in Model.objects.filter(field="assignee"):
-        obj.field = "assignees"
-        updated_activity.append(obj)
-
-    Model.objects.bulk_update(updated_activity, ["field"], batch_size=100)
-
-
-def update_assignee_issue_activity(apps, schema_editor):
-    Model = apps.get_model("db", "IssueActivity")
-    updated_activity = []
-
-    # Get all the users
-    User = apps.get_model("db", "User")
-    users = User.objects.values("id", "email", "display_name")
-
-    for obj in Model.objects.filter(field="assignees"):
-        if bool(obj.new_value) and not bool(obj.old_value):
-            # Get user from list
-            assigned_user = [
-                user for user in users if user.get("email") == obj.new_value
-            ]
-            if assigned_user:
-                obj.new_value = assigned_user[0].get("display_name")
-                obj.new_identifier = assigned_user[0].get("id")
-                # Update the comment
-                words = obj.comment.split()
-                words[-1] = assigned_user[0].get("display_name")
-                obj.comment = " ".join(words)
-
-        if bool(obj.old_value) and not bool(obj.new_value):
-            # Get user from list
-            assigned_user = [
-                user for user in users if user.get("email") == obj.old_value
-            ]
-            if assigned_user:
-                obj.old_value = assigned_user[0].get("display_name")
-                obj.old_identifier = assigned_user[0].get("id")
-                # Update the comment
-                words = obj.comment.split()
-                words[-1] = assigned_user[0].get("display_name")
-                obj.comment = " ".join(words)
-
-        updated_activity.append(obj)
-
-    Model.objects.bulk_update(
-        updated_activity,
-        ["old_value", "new_value", "old_identifier", "new_identifier", "comment"],
-        batch_size=200,
-    )
-
-
-def update_name_activity(apps, schema_editor):
-    Model = apps.get_model("db", "IssueActivity")
-    update_activity = []
-    for obj in Model.objects.filter(field="name"):
-        obj.comment = obj.comment.replace("start date", "name")
-        update_activity.append(obj)
-
-    Model.objects.bulk_update(update_activity, ["comment"], batch_size=1000)
-
-
-def random_cycle_order(apps, schema_editor):
-    CycleModel = apps.get_model("db", "Cycle")
-    updated_cycles = []
-    for obj in CycleModel.objects.all():
-        obj.sort_order = random.randint(1, 65536)
-        updated_cycles.append(obj)
-    CycleModel.objects.bulk_update(updated_cycles, ["sort_order"], batch_size=100)
-
-
-def random_module_order(apps, schema_editor):
-    ModuleModel = apps.get_model("db", "Module")
-    updated_modules = []
-    for obj in ModuleModel.objects.all():
-        obj.sort_order = random.randint(1, 65536)
-        updated_modules.append(obj)
-    ModuleModel.objects.bulk_update(updated_modules, ["sort_order"], batch_size=100)
-
-
-def update_user_issue_properties(apps, schema_editor):
-    IssuePropertyModel = apps.get_model("db", "IssueProperty")
-    updated_issue_properties = []
-    for obj in IssuePropertyModel.objects.all():
-        obj.properties["start_date"] = True
-        updated_issue_properties.append(obj)
-    IssuePropertyModel.objects.bulk_update(
-        updated_issue_properties, ["properties"], batch_size=100
-    )
-
-
-def workspace_member_properties(apps, schema_editor):
-    WorkspaceMemberModel = apps.get_model("db", "WorkspaceMember")
-    updated_workspace_members = []
-    for obj in WorkspaceMemberModel.objects.all():
-        obj.view_props["properties"]["start_date"] = True
-        obj.default_props["properties"]["start_date"] = True
-        updated_workspace_members.append(obj)
-
-    WorkspaceMemberModel.objects.bulk_update(
-        updated_workspace_members, ["view_props", "default_props"], batch_size=100
-    )
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0040_projectmember_preferences_user_cover_image_and_more'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='cycle',
-            name='sort_order',
-            field=models.FloatField(default=65535),
-        ),
-        migrations.AddField(
-            model_name='issuecomment',
-            name='access',
-            field=models.CharField(choices=[('INTERNAL', 'INTERNAL'), ('EXTERNAL', 'EXTERNAL')], default='INTERNAL', max_length=100),
-        ),
-        migrations.AddField(
-            model_name='module',
-            name='sort_order',
-            field=models.FloatField(default=65535),
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='display_name',
-            field=models.CharField(default='', max_length=255),
-        ),
-        migrations.CreateModel(
-            name='ExporterHistory',
-            fields=[
-                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
-                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
-                ('id', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
-                ('project', django.contrib.postgres.fields.ArrayField(base_field=models.UUIDField(default=uuid.uuid4), blank=True, null=True, size=None)),
-                ('provider', models.CharField(choices=[('json', 'json'), ('csv', 'csv'), ('xlsx', 'xlsx')], max_length=50)),
-                ('status', models.CharField(choices=[('queued', 'Queued'), ('processing', 'Processing'), ('completed', 'Completed'), ('failed', 'Failed')], default='queued', max_length=50)),
-                ('reason', models.TextField(blank=True)),
-                ('key', models.TextField(blank=True)),
-                ('url', models.URLField(blank=True, max_length=800, null=True)),
-                ('token', models.CharField(default=plane.db.models.exporter.generate_token, max_length=255, unique=True)),
-                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
-                ('initiated_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workspace_exporters', to=settings.AUTH_USER_MODEL)),
-                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Last Modified By')),
-                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workspace_exporters', to='db.workspace')),
-            ],
-            options={
-                'verbose_name': 'Exporter',
-                'verbose_name_plural': 'Exporters',
-                'db_table': 'exporters',
-                'ordering': ('-created_at',),
-            },
-        ),
-        migrations.CreateModel(
-            name='ProjectDeployBoard',
-            fields=[
-                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
-                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
-                ('id', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
-                ('anchor', models.CharField(db_index=True, default=plane.db.models.project.get_anchor, max_length=255, unique=True)),
-                ('comments', models.BooleanField(default=False)),
-                ('reactions', models.BooleanField(default=False)),
-                ('votes', models.BooleanField(default=False)),
-                ('views', models.JSONField(default=plane.db.models.project.get_default_views)),
-                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
-                ('inbox', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='bord_inbox', to='db.inbox')),
-                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_%(class)s', to='db.project')),
-                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Last Modified By')),
-                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workspace_%(class)s', to='db.workspace')),
-            ],
-            options={
-                'verbose_name': 'Project Deploy Board',
-                'verbose_name_plural': 'Project Deploy Boards',
-                'db_table': 'project_deploy_boards',
-                'ordering': ('-created_at',),
-                'unique_together': {('project', 'anchor')},
-            },
-        ),
-        migrations.CreateModel(
-            name='IssueVote',
-            fields=[
-                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
-                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
-                ('id', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
-                ('vote', models.IntegerField(choices=[(-1, 'DOWNVOTE'), (1, 'UPVOTE')])),
-                ('actor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='votes', to=settings.AUTH_USER_MODEL)),
-                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
-                ('issue', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='votes', to='db.issue')),
-                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_%(class)s', to='db.project')),
-                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Last Modified By')),
-                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workspace_%(class)s', to='db.workspace')),
-            ],
-            options={
-                'verbose_name': 'Issue Vote',
-                'verbose_name_plural': 'Issue Votes',
-                'db_table': 'issue_votes',
-                'ordering': ('-created_at',),
-                'unique_together': {('issue', 'actor')},
-            },
-        ),
-        migrations.AlterField(
-            model_name='modulelink',
-            name='title',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.RunPython(generate_display_name),
-        migrations.RunPython(rectify_field_issue_activity),
-        migrations.RunPython(update_assignee_issue_activity),
-        migrations.RunPython(update_name_activity),
-        migrations.RunPython(random_cycle_order),
-        migrations.RunPython(random_module_order),
-        migrations.RunPython(update_user_issue_properties),
-        migrations.RunPython(workspace_member_properties),
-    ]

apiserver/plane/db/models/__init__.py

@@ -18,7 +18,6 @@ from .project import (
     ProjectMemberInvite,
     ProjectIdentifier,
     ProjectFavorite,
-    ProjectDeployBoard,
 )
 
 from .issue import (
@@ -37,7 +36,6 @@ from .issue import (
     IssueSubscriber,
     IssueReaction,
     CommentReaction,
-    IssueVote,
 )
 
 from .asset import FileAsset
@@ -74,6 +72,4 @@ from .inbox import Inbox, InboxIssue
 
 from .analytic import AnalyticView
 
-from .notification import Notification
-
-from .exporter import ExporterHistory
+from .notification import Notification

apiserver/plane/db/models/cycle.py

@@ -17,7 +17,6 @@ class Cycle(ProjectBaseModel):
         related_name="owned_by_cycle",
     )
     view_props = models.JSONField(default=dict)
-    sort_order = models.FloatField(default=65535)
 
     class Meta:
         verbose_name = "Cycle"
@@ -25,17 +24,6 @@ class Cycle(ProjectBaseModel):
         db_table = "cycles"
         ordering = ("-created_at",)
 
-    def save(self, *args, **kwargs):
-        if self._state.adding:
-            smallest_sort_order = Cycle.objects.filter(
-                project=self.project
-            ).aggregate(smallest=models.Min("sort_order"))["smallest"]
-
-            if smallest_sort_order is not None:
-                self.sort_order = smallest_sort_order - 10000
-
-        super(Cycle, self).save(*args, **kwargs)
-
     def __str__(self):
         """Return name of the cycle"""
         return f"{self.name} <{self.project.name}>"

apiserver/plane/db/models/exporter.py

@@ -1,56 +0,0 @@
-import uuid
-
-# Python imports
-from uuid import uuid4
-
-# Django imports
-from django.db import models
-from django.conf import settings
-from django.contrib.postgres.fields import ArrayField
-
-# Module imports
-from . import BaseModel
-
-def generate_token():
-    return uuid4().hex
-
-class ExporterHistory(BaseModel):
-    workspace = models.ForeignKey(
-        "db.WorkSpace", on_delete=models.CASCADE, related_name="workspace_exporters"
-    )
-    project = ArrayField(models.UUIDField(default=uuid.uuid4), blank=True, null=True)
-    provider = models.CharField(
-        max_length=50,
-        choices=(
-            ("json", "json"),
-            ("csv", "csv"),
-            ("xlsx", "xlsx"),
-        ),
-    )
-    status = models.CharField(
-        max_length=50,
-        choices=(
-            ("queued", "Queued"),
-            ("processing", "Processing"),
-            ("completed", "Completed"),
-            ("failed", "Failed"),
-        ),
-        default="queued",
-    )
-    reason = models.TextField(blank=True)
-    key = models.TextField(blank=True)
-    url = models.URLField(max_length=800, blank=True, null=True)
-    token = models.CharField(max_length=255, default=generate_token, unique=True)
-    initiated_by = models.ForeignKey(
-        settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="workspace_exporters"
-    )
-
-    class Meta:
-        verbose_name = "Exporter"
-        verbose_name_plural = "Exporters"
-        db_table = "exporters"
-        ordering = ("-created_at",)
-
-    def __str__(self):
-        """Return name of the service"""
-        return f"{self.provider} <{self.workspace.name}>"

apiserver/plane/db/models/issue.py

@@ -108,7 +108,11 @@ class Issue(ProjectBaseModel):
                         ~models.Q(name="Triage"), project=self.project
                     ).first()
                     self.state = random_state
+                    if random_state.group == "started":
+                        self.start_date = timezone.now().date()
                 else:
+                    if default_state.group == "started":
+                        self.start_date = timezone.now().date()
                     self.state = default_state
             except ImportError:
                 pass
@@ -123,6 +127,8 @@ class Issue(ProjectBaseModel):
                     PageBlock.objects.filter(issue_id=self.id).filter().update(
                         completed_at=timezone.now()
                     )
+                elif self.state.group == "started":
+                    self.start_date = timezone.now().date()
                 else:
                     PageBlock.objects.filter(issue_id=self.id).filter().update(
                         completed_at=None
@@ -147,6 +153,9 @@ class Issue(ProjectBaseModel):
             if largest_sort_order is not None:
                 self.sort_order = largest_sort_order + 10000
 
+            # If adding it to started state
+            if self.state.group == "started":
+                self.start_date = timezone.now().date()
         # Strip the html tags using html parser
         self.description_stripped = (
             None
@@ -301,14 +310,6 @@ class IssueComment(ProjectBaseModel):
         related_name="comments",
         null=True,
     )
-    access = models.CharField(
-        choices=(
-            ("INTERNAL", "INTERNAL"),
-            ("EXTERNAL", "EXTERNAL"),
-        ),
-        default="INTERNAL",
-        max_length=100,
-    )
 
     def save(self, *args, **kwargs):
         self.comment_stripped = (
@@ -424,14 +425,13 @@ class IssueSubscriber(ProjectBaseModel):
 
 
 class IssueReaction(ProjectBaseModel):
+
     actor = models.ForeignKey(
         settings.AUTH_USER_MODEL,
         on_delete=models.CASCADE,
         related_name="issue_reactions",
     )
-    issue = models.ForeignKey(
-        Issue, on_delete=models.CASCADE, related_name="issue_reactions"
-    )
+    issue = models.ForeignKey(Issue, on_delete=models.CASCADE, related_name="issue_reactions")
     reaction = models.CharField(max_length=20)
 
     class Meta:
@@ -446,14 +446,13 @@ class IssueReaction(ProjectBaseModel):
 
 
 class CommentReaction(ProjectBaseModel):
+
     actor = models.ForeignKey(
         settings.AUTH_USER_MODEL,
         on_delete=models.CASCADE,
         related_name="comment_reactions",
     )
-    comment = models.ForeignKey(
-        IssueComment, on_delete=models.CASCADE, related_name="comment_reactions"
-    )
+    comment = models.ForeignKey(IssueComment, on_delete=models.CASCADE, related_name="comment_reactions")
     reaction = models.CharField(max_length=20)
 
     class Meta:
@@ -467,27 +466,6 @@ class CommentReaction(ProjectBaseModel):
         return f"{self.issue.name} {self.actor.email}"
 
 
-class IssueVote(ProjectBaseModel):
-    issue = models.ForeignKey(Issue, on_delete=models.CASCADE, related_name="votes")
-    actor = models.ForeignKey(
-        settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="votes"
-    )
-    vote = models.IntegerField(
-        choices=(
-            (-1, "DOWNVOTE"),
-            (1, "UPVOTE"),
-        )
-    )
-    class Meta:
-        unique_together = ["issue", "actor"]
-        verbose_name = "Issue Vote"
-        verbose_name_plural = "Issue Votes"
-        db_table = "issue_votes"
-        ordering = ("-created_at",)
-
-    def __str__(self):
-        return f"{self.issue.name} {self.actor.email}"
-
 
 # TODO: Find a better method to save the model
 @receiver(post_save, sender=Issue)

apiserver/plane/db/models/module.py

@@ -40,7 +40,6 @@ class Module(ProjectBaseModel):
         through_fields=("module", "member"),
     )
     view_props = models.JSONField(default=dict)
-    sort_order = models.FloatField(default=65535)
 
     class Meta:
         unique_together = ["name", "project"]
@@ -49,17 +48,6 @@ class Module(ProjectBaseModel):
         db_table = "modules"
         ordering = ("-created_at",)
 
-    def save(self, *args, **kwargs):
-        if self._state.adding:
-            smallest_sort_order = Module.objects.filter(
-                project=self.project
-            ).aggregate(smallest=models.Min("sort_order"))["smallest"]
-
-            if smallest_sort_order is not None:
-                self.sort_order = smallest_sort_order - 10000
-
-        super(Module, self).save(*args, **kwargs)
-
     def __str__(self):
         return f"{self.name} {self.start_date} {self.target_date}"
 
@@ -98,7 +86,7 @@ class ModuleIssue(ProjectBaseModel):
 
 
 class ModuleLink(ProjectBaseModel):
-    title = models.CharField(max_length=255, blank=True, null=True)
+    title = models.CharField(max_length=255, null=True)
     url = models.URLField()
     module = models.ForeignKey(
         Module, on_delete=models.CASCADE, related_name="link_module"

apiserver/plane/db/models/project.py

@@ -1,6 +1,3 @@
-# Python imports
-from uuid import uuid4
-
 # Django imports
 from django.db import models
 from django.conf import settings
@@ -34,9 +31,12 @@ def get_default_props():
         "showEmptyGroups": True,
     }
 
-
 def get_default_preferences():
-    return {"pages": {"block_display": True}}
+    return {
+        "pages": {
+            "block_display": True
+        }
+    }
 
 
 class Project(BaseModel):
@@ -157,6 +157,7 @@ class ProjectMember(ProjectBaseModel):
     preferences = models.JSONField(default=get_default_preferences)
     sort_order = models.FloatField(default=65535)
 
+
     def save(self, *args, **kwargs):
         if self._state.adding:
             smallest_sort_order = ProjectMember.objects.filter(
@@ -216,41 +217,3 @@ class ProjectFavorite(ProjectBaseModel):
     def __str__(self):
         """Return user of the project"""
         return f"{self.user.email} <{self.project.name}>"
-
-
-def get_anchor():
-    return uuid4().hex
-
-
-def get_default_views():
-    return {
-        "list": True,
-        "kanban": True,
-        "calendar": True,
-        "gantt": True,
-        "spreadsheet": True,
-    }
-
-
-class ProjectDeployBoard(ProjectBaseModel):
-    anchor = models.CharField(
-        max_length=255, default=get_anchor, unique=True, db_index=True
-    )
-    comments = models.BooleanField(default=False)
-    reactions = models.BooleanField(default=False)
-    inbox = models.ForeignKey(
-        "db.Inbox", related_name="bord_inbox", on_delete=models.SET_NULL, null=True
-    )
-    votes = models.BooleanField(default=False)
-    views = models.JSONField(default=get_default_views)
-
-    class Meta:
-        unique_together = ["project", "anchor"]
-        verbose_name = "Project Deploy Board"
-        verbose_name_plural = "Project Deploy Boards"
-        db_table = "project_deploy_boards"
-        ordering = ("-created_at",)
-
-    def __str__(self):
-        """Return project and anchor"""
-        return f"{self.anchor} <{self.project.name}>"

apiserver/plane/db/models/user.py

@@ -1,7 +1,6 @@
 # Python imports
+from enum import unique
 import uuid
-import string
-import random
 
 # Django imports
 from django.db import models
@@ -19,7 +18,6 @@ from sentry_sdk import capture_exception
 from slack_sdk import WebClient
 from slack_sdk.errors import SlackApiError
 
-
 def get_default_onboarding():
     return {
         "profile_complete": False,
@@ -28,7 +26,6 @@ def get_default_onboarding():
         "workspace_join": False,
     }
 
-
 class User(AbstractBaseUser, PermissionsMixin):
     id = models.UUIDField(
         default=uuid.uuid4, unique=True, editable=False, db_index=True, primary_key=True
@@ -84,7 +81,6 @@ class User(AbstractBaseUser, PermissionsMixin):
     role = models.CharField(max_length=300, null=True, blank=True)
     is_bot = models.BooleanField(default=False)
     theme = models.JSONField(default=dict)
-    display_name = models.CharField(max_length=255, default="")
     is_tour_completed = models.BooleanField(default=False)
     onboarding_step = models.JSONField(default=get_default_onboarding)
 
@@ -111,13 +107,6 @@ class User(AbstractBaseUser, PermissionsMixin):
             self.token = uuid.uuid4().hex + uuid.uuid4().hex
             self.token_updated_at = timezone.now()
 
-        if not self.display_name:
-            self.display_name = (
-                self.email.split("@")[0]
-                if len(self.email.split("@"))
-                else "".join(random.choice(string.ascii_letters) for _ in range(6))
-            )
-
         if self.is_superuser:
             self.is_staff = True
 

apiserver/plane/db/models/workspace.py

@@ -33,7 +33,6 @@ def get_default_props():
             "estimate": True,
             "created_on": True,
             "updated_on": True,
-            "start_date": True,
         },
         "showEmptyGroups": True,
     }

apiserver/plane/settings/common.py

@@ -214,4 +214,4 @@ SIMPLE_JWT = {
 CELERY_TIMEZONE = TIME_ZONE
 CELERY_TASK_SERIALIZER = 'json'
 CELERY_ACCEPT_CONTENT = ['application/json']
-CELERY_IMPORTS = ("plane.bgtasks.issue_automation_task","plane.bgtasks.exporter_expired_task")
+CELERY_IMPORTS = ("plane.bgtasks.issue_automation_task",)

apiserver/plane/utils/issue_filters.py

@@ -124,11 +124,10 @@ def filter_created_at(params, filter, method):
     else:
         if params.get("created_at", None) and len(params.get("created_at")):
             for query in params.get("created_at"):
-                created_at_query = query.split(";")
-                if len(created_at_query) == 2 and "after" in created_at_query:
-                    filter["created_at__date__gte"] = created_at_query[0]
+                if query.get("timeline", "after") == "after":
+                    filter["created_at__date__gte"] = query.get("datetime")
                 else:
-                    filter["created_at__date__lte"] = created_at_query[0]
+                    filter["created_at__date__lte"] = query.get("datetime")
     return filter
 
 
@@ -145,11 +144,10 @@ def filter_updated_at(params, filter, method):
     else:
         if params.get("updated_at", None) and len(params.get("updated_at")):
             for query in params.get("updated_at"):
-                updated_at_query = query.split(";")
-                if len(updated_at_query) == 2 and "after" in updated_at_query:
-                    filter["updated_at__date__gte"] = updated_at_query[0]
+                if query.get("timeline", "after") == "after":
+                    filter["updated_at__date__gte"] = query.get("datetime")
                 else:
-                    filter["updated_at__date__lte"] = updated_at_query[0]
+                    filter["updated_at__date__lte"] = query.get("datetime")
     return filter
 
 
@@ -166,11 +164,10 @@ def filter_start_date(params, filter, method):
     else:
         if params.get("start_date", None) and len(params.get("start_date")):
             for query in params.get("start_date"):
-                start_date_query = query.split(";")
-                if len(start_date_query) == 2 and "after" in start_date_query:
-                    filter["start_date__gte"] = start_date_query[0]
+                if query.get("timeline", "after") == "after":
+                    filter["start_date__gte"] = query.get("datetime")
                 else:
-                    filter["start_date__lte"] = start_date_query[0]
+                    filter["start_date__lte"] = query.get("datetime")
     return filter
 
 
@@ -187,11 +184,10 @@ def filter_target_date(params, filter, method):
     else:
         if params.get("target_date", None) and len(params.get("target_date")):
             for query in params.get("target_date"):
-                target_date_query = query.split(";")
-                if len(target_date_query) == 2 and "after" in target_date_query:
-                    filter["target_date__gt"] = target_date_query[0]
+                if query.get("timeline", "after") == "after":
+                    filter["target_date__gt"] = query.get("datetime")
                 else:
-                    filter["target_date__lt"] = target_date_query[0]
+                    filter["target_date__lt"] = query.get("datetime")
 
     return filter
 
@@ -209,11 +205,10 @@ def filter_completed_at(params, filter, method):
     else:
         if params.get("completed_at", None) and len(params.get("completed_at")):
             for query in params.get("completed_at"):
-                completed_at_query = query.split(";")
-                if len(completed_at_query) == 2 and "after" in completed_at_query:
-                    filter["completed_at__date__gte"] = completed_at_query[0]
+                if query.get("timeline", "after") == "after":
+                    filter["completed_at__date__gte"] = query.get("datetime")
                 else:
-                    filter["completed_at__lte"] = completed_at_query[0]
+                    filter["completed_at__lte"] = query.get("datetime")
     return filter
 
 
@@ -297,16 +292,9 @@ def filter_subscribed_issues(params, filter, method):
     return filter
 
 
-def filter_start_target_date_issues(params, filter, method):
-    start_target_date = params.get("start_target_date", "false")
-    if start_target_date == "true":
-        filter["target_date__isnull"] = False
-        filter["start_date__isnull"] = False
-    return filter
-
-
 def issue_filters(query_params, method):
     filter = dict()
+    print(query_params)
 
     ISSUE_FILTER = {
         "state": filter_state,
@@ -330,7 +318,6 @@ def issue_filters(query_params, method):
         "inbox_status": filter_inbox_status,
         "sub_issue": filter_sub_issue_toggle,
         "subscriber":  filter_subscribed_issues,
-        "start_target_date": filter_start_target_date_issues,
     }
 
     for key, value in ISSUE_FILTER.items():

apiserver/requirements/base.txt

@@ -32,5 +32,4 @@ celery==5.3.1
 django_celery_beat==2.5.0
 psycopg-binary==3.1.9
 psycopg-c==3.1.9
-scout-apm==2.26.1
-openpyxl==3.1.2
+scout-apm==2.26.1

apiserver/templates/emails/exports/issues.html

@@ -1,9 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-    Dear {{username}},<br/>
-    Your requested Issue's data has been successfully exported from Plane. The export includes all relevant information about issues you requested from your selected projects.</br>
-    Please find the attachment and download the CSV file. If you have any questions or need further assistance, please don't hesitate to contact our support team at <a href = "mailto: engineering@plane.com">engineering@plane.so</a>. We're here to help!</br>
-    Thank you for using Plane. We hope this export will aid you in effectively managing your projects.</br>
-    Regards,
-    Team Plane
-</html>

apps/app/components/analytics/custom-analytics/graph/custom-tooltip.tsx

@@ -14,17 +14,17 @@ type Props = {
 export const CustomTooltip: React.FC<Props> = ({ datum, analytics, params }) => {
   let tooltipValue: string | number = "";
 
-  const renderAssigneeName = (assigneeId: string): string => {
-    const assignee = analytics.extras.assignee_details.find((a) => a.assignees__id === assigneeId);
-
-    if (!assignee) return "No assignee";
-
-    return assignee.assignees__display_name || "No assignee";
-  };
-
   if (params.segment) {
     if (DATE_KEYS.includes(params.segment)) tooltipValue = renderMonthAndYear(datum.id);
-    else tooltipValue = datum.id;
+    else if (params.segment === "assignees__email") {
+      const assignee = analytics.extras.assignee_details.find(
+        (a) => a.assignees__email === datum.id
+      );
+
+      if (assignee)
+        tooltipValue = assignee.assignees__first_name + " " + assignee.assignees__last_name;
+      else tooltipValue = "No assignees";
+    } else tooltipValue = datum.id;
   } else {
     if (DATE_KEYS.includes(params.x_axis)) tooltipValue = datum.indexValue;
     else tooltipValue = datum.id === "count" ? "Issue count" : "Estimate";
@@ -49,10 +49,7 @@ export const CustomTooltip: React.FC<Props> = ({ datum, analytics, params }) =>
             : ""
         }`}
       >
-        {params.segment === "assignees__id"
-          ? renderAssigneeName(tooltipValue.toString())
-          : tooltipValue}
-        :
+        {tooltipValue}:
       </span>
       <span>{datum.value}</span>
     </div>

apps/app/components/analytics/custom-analytics/graph/index.tsx

@@ -29,14 +29,6 @@ export const AnalyticsGraph: React.FC<Props> = ({
   yAxisKey,
   fullScreen,
 }) => {
-  const renderAssigneeName = (assigneeId: string): string => {
-    const assignee = analytics.extras.assignee_details.find((a) => a.assignees__id === assigneeId);
-
-    if (!assignee) return "?";
-
-    return assignee.assignees__display_name || "?";
-  };
-
   const generateYAxisTickValues = () => {
     if (!analytics) return [];
 
@@ -78,17 +70,17 @@ export const AnalyticsGraph: React.FC<Props> = ({
       height={fullScreen ? "400px" : "300px"}
       margin={{
         right: 20,
-        bottom: params.x_axis === "assignees__id" ? 50 : longestXAxisLabel.length * 5 + 20,
+        bottom: params.x_axis === "assignees__email" ? 50 : longestXAxisLabel.length * 5 + 20,
       }}
       axisBottom={{
         tickSize: 0,
         tickPadding: 10,
         tickRotation: barGraphData.data.length > 7 ? -45 : 0,
         renderTick:
-          params.x_axis === "assignees__id"
+          params.x_axis === "assignees__email"
             ? (datum) => {
                 const avatar = analytics.extras.assignee_details?.find(
-                  (a) => a?.assignees__display_name === datum?.value
+                  (a) => a?.assignees__email === datum?.value
                 )?.assignees__avatar;
 
                 if (avatar && avatar !== "")
@@ -109,11 +101,7 @@ export const AnalyticsGraph: React.FC<Props> = ({
                     <g transform={`translate(${datum.x},${datum.y})`}>
                       <circle cy={18} r={8} fill="#374151" />
                       <text x={0} y={21} textAnchor="middle" fontSize={9} fill="#ffffff">
-                        {params.x_axis === "assignees__id"
-                          ? datum.value && datum.value !== "None"
-                            ? renderAssigneeName(datum.value)[0].toUpperCase()
-                            : "?"
-                          : datum.value && datum.value !== "None"
+                        {datum.value && datum.value !== "None"
                           ? `${datum.value}`.toUpperCase()[0]
                           : "?"}
                       </text>

apps/app/components/analytics/custom-analytics/sidebar.tsx

@@ -277,7 +277,9 @@ export const AnalyticsSidebar: React.FC<Props> = ({
                   <div className="space-y-4 mt-4">
                     <div className="flex items-center gap-2 text-xs">
                       <h6 className="text-custom-text-200">Lead</h6>
-                      <span>{cycleDetails.owned_by?.display_name}</span>
+                      <span>
+                        {cycleDetails.owned_by?.first_name} {cycleDetails.owned_by?.last_name}
+                      </span>
                     </div>
                     <div className="flex items-center gap-2 text-xs">
                       <h6 className="text-custom-text-200">Start Date</h6>
@@ -303,7 +305,10 @@ export const AnalyticsSidebar: React.FC<Props> = ({
                   <div className="space-y-4 mt-4">
                     <div className="flex items-center gap-2 text-xs">
                       <h6 className="text-custom-text-200">Lead</h6>
-                      <span>{moduleDetails.lead_detail?.display_name}</span>
+                      <span>
+                        {moduleDetails.lead_detail?.first_name}{" "}
+                        {moduleDetails.lead_detail?.last_name}
+                      </span>
                     </div>
                     <div className="flex items-center gap-2 text-xs">
                       <h6 className="text-custom-text-200">Start Date</h6>

apps/app/components/analytics/custom-analytics/table.tsx

@@ -22,12 +22,15 @@ type Props = {
 };
 
 export const AnalyticsTable: React.FC<Props> = ({ analytics, barGraphData, params, yAxisKey }) => {
-  const renderAssigneeName = (assigneeId: string): string => {
-    const assignee = analytics.extras.assignee_details.find((a) => a.assignees__id === assigneeId);
+  const renderAssigneeName = (email: string): string => {
+    const assignee = analytics.extras.assignee_details.find((a) => a.assignees__email === email);
 
     if (!assignee) return "No assignee";
 
-    return assignee.assignees__display_name || "No assignee";
+    if (assignee.assignees__first_name !== "")
+      return assignee.assignees__first_name + " " + assignee.assignees__last_name;
+
+    return email;
   };
 
   return (
@@ -62,10 +65,10 @@ export const AnalyticsTable: React.FC<Props> = ({ analytics, barGraphData, param
                             }}
                           />
                         )}
-                        {params.segment === "assignees__id"
-                          ? renderAssigneeName(key)
-                          : DATE_KEYS.includes(params.segment ?? "")
+                        {DATE_KEYS.includes(params.segment ?? "")
                           ? renderMonthAndYear(key)
+                          : params.segment === "assignees__email"
+                          ? renderAssigneeName(key)
                           : key}
                       </div>
                     </th>
@@ -105,7 +108,7 @@ export const AnalyticsTable: React.FC<Props> = ({ analytics, barGraphData, param
                         }}
                       />
                     )}
-                    {params.x_axis === "assignees__id"
+                    {params.x_axis === "assignees__email"
                       ? renderAssigneeName(`${item.name}`)
                       : addSpaceIfCamelCase(`${item.name}`)}
                   </td>

apps/app/components/analytics/scope-and-demand/leaderboard.tsx

@@ -1,38 +1,22 @@
-// ui
-import { ProfileEmptyState } from "components/ui";
-// image
-import emptyUsers from "public/empty-state/empty_users.svg";
-
 type Props = {
   users: {
     avatar: string | null;
-    display_name: string | null;
+    email: string | null;
     firstName: string;
     lastName: string;
     count: number;
-    id: string;
   }[];
   title: string;
-  emptyStateMessage: string;
-  workspaceSlug: string;
 };
 
-export const AnalyticsLeaderboard: React.FC<Props> = ({
-  users,
-  title,
-  emptyStateMessage,
-  workspaceSlug,
-}) => (
+export const AnalyticsLeaderboard: React.FC<Props> = ({ users, title }) => (
   <div className="p-3 border border-custom-border-200 rounded-[10px]">
     <h6 className="text-base font-medium">{title}</h6>
     {users.length > 0 ? (
       <div className="mt-3 space-y-3">
         {users.map((user) => (
-          <a
-            key={user.display_name ?? "None"}
-            href={`/${workspaceSlug}/profile/${user.id}`}
-            target="_blank"
-            rel="noopener noreferrer"
+          <div
+            key={user.email ?? "None"}
             className="flex items-start justify-between gap-4 text-xs"
           >
             <div className="flex items-center gap-2">
@@ -41,26 +25,24 @@ export const AnalyticsLeaderboard: React.FC<Props> = ({
                   <img
                     src={user.avatar}
                     className="absolute top-0 left-0 h-full w-full object-cover rounded-full"
-                    alt={user.display_name ?? "None"}
+                    alt={user.email ?? "None"}
                   />
                 </div>
               ) : (
                 <div className="grid place-items-center flex-shrink-0 rounded-full bg-gray-700 text-[11px] capitalize text-white h-4 w-4">
-                  {user.display_name !== "" ? user?.display_name?.[0] : "?"}
+                  {user.firstName !== "" ? user.firstName[0] : "?"}
                 </div>
               )}
               <span className="break-words text-custom-text-200">
-                {user.display_name !== "" ? `${user.display_name}` : "No assignee"}
+                {user.firstName !== "" ? `${user.firstName} ${user.lastName}` : "No assignee"}
               </span>
             </div>
             <span className="flex-shrink-0">{user.count}</span>
-          </a>
+          </div>
         ))}
       </div>
     ) : (
-      <div className="px-7 py-4">
-        <ProfileEmptyState title="No Data yet" description={emptyStateMessage} image={emptyUsers} />
-      </div>
+      <div className="text-custom-text-200 text-center text-sm py-8">No matching data found.</div>
     )}
   </div>
 );

apps/app/components/analytics/scope-and-demand/scope-and-demand.tsx

@@ -56,28 +56,22 @@ export const ScopeAndDemand: React.FC<Props> = ({ fullScreen = true }) => {
               <AnalyticsLeaderboard
                 users={defaultAnalytics.most_issue_created_user?.map((user) => ({
                   avatar: user?.created_by__avatar,
+                  email: user?.created_by__email,
                   firstName: user?.created_by__first_name,
                   lastName: user?.created_by__last_name,
-                  display_name: user?.created_by__display_name,
                   count: user?.count,
-                  id: user?.created_by__id,
                 }))}
                 title="Most issues created"
-                emptyStateMessage="Co-workers and the number issues created by them appears here."
-                workspaceSlug={workspaceSlug?.toString() ?? ""}
               />
               <AnalyticsLeaderboard
                 users={defaultAnalytics.most_issue_closed_user?.map((user) => ({
                   avatar: user?.assignees__avatar,
+                  email: user?.assignees__email,
                   firstName: user?.assignees__first_name,
                   lastName: user?.assignees__last_name,
-                  display_name: user?.assignees__display_name,
                   count: user?.count,
-                  id: user?.assignees__id,
                 }))}
                 title="Most issues closed"
-                emptyStateMessage="Co-workers and the number issues closed by them appears here."
-                workspaceSlug={workspaceSlug?.toString() ?? ""}
               />
               <div className={fullScreen ? "md:col-span-2" : ""}>
                 <AnalyticsYearWiseIssues defaultAnalytics={defaultAnalytics} />

apps/app/components/analytics/scope-and-demand/scope.tsx

@@ -1,7 +1,5 @@
 // ui
-import { BarGraph, ProfileEmptyState } from "components/ui";
-// image
-import emptyBarGraph from "public/empty-state/empty_bar_graph.svg";
+import { BarGraph } from "components/ui";
 // types
 import { IDefaultAnalyticsResponse } from "types";
 
@@ -18,20 +16,23 @@ export const AnalyticsScope: React.FC<Props> = ({ defaultAnalytics }) => (
         {defaultAnalytics.pending_issue_user.length > 0 ? (
           <BarGraph
             data={defaultAnalytics.pending_issue_user}
-            indexBy="assignees__display_name"
+            indexBy="assignees__email"
             keys={["count"]}
             height="250px"
             colors={() => `#f97316`}
             customYAxisTickValues={defaultAnalytics.pending_issue_user.map((d) => d.count)}
             tooltip={(datum) => {
               const assignee = defaultAnalytics.pending_issue_user.find(
-                (a) => a.assignees__display_name === `${datum.indexValue}`
+                (a) => a.assignees__email === `${datum.indexValue}`
               );
 
               return (
                 <div className="rounded-md border border-custom-border-200 bg-custom-background-80 p-2 text-xs">
                   <span className="font-medium text-custom-text-200">
-                    {assignee ? assignee.assignees__display_name : "No assignee"}:{" "}
+                    {assignee
+                      ? assignee.assignees__first_name + " " + assignee.assignees__last_name
+                      : "No assignee"}
+                    :{" "}
                   </span>
                   {datum.value}
                 </div>
@@ -72,12 +73,8 @@ export const AnalyticsScope: React.FC<Props> = ({ defaultAnalytics }) => (
             }}
           />
         ) : (
-          <div className="px-7 py-4">
-            <ProfileEmptyState
-              title="No Data yet"
-              description="Analysis of pending issues by co-workers appears here."
-              image={emptyBarGraph}
-            />
+          <div className="text-custom-text-200 text-center text-sm py-8">
+            No matching data found.
           </div>
         )}
       </div>

apps/app/components/analytics/scope-and-demand/year-wise-issues.tsx

@@ -1,7 +1,5 @@
 // ui
-import { LineGraph, ProfileEmptyState } from "components/ui";
-// image
-import emptyGraph from "public/empty-state/empty_graph.svg";
+import { LineGraph } from "components/ui";
 // types
 import { IDefaultAnalyticsResponse } from "types";
 // constants
@@ -50,13 +48,7 @@ export const AnalyticsYearWiseIssues: React.FC<Props> = ({ defaultAnalytics }) =
         enableArea
       />
     ) : (
-      <div className="px-7 py-4">
-        <ProfileEmptyState
-          title="No Data yet"
-          description="Close issues to view analysis of the same in the form of a graph."
-          image={emptyGraph}
-        />
-      </div>
+      <div className="text-custom-text-200 text-center text-sm py-8">No matching data found.</div>
     )}
   </div>
 );

apps/app/components/command-palette/change-interface-theme.tsx

@@ -5,51 +5,31 @@ import { Command } from "cmdk";
 import { THEMES_OBJ } from "constants/themes";
 import { useTheme } from "next-themes";
 import { SettingIcon } from "components/icons";
-import userService from "services/user.service";
-import useUser from "hooks/use-user";
-// helper
-import { unsetCustomCssVariables } from "helpers/theme.helper";
-// mobx react lite
-import { observer } from "mobx-react-lite";
-// mobx store
-import { useMobxStore } from "lib/mobx/store-provider";
 
 type Props = {
   setIsPaletteOpen: Dispatch<SetStateAction<boolean>>;
 };
 
-export const ChangeInterfaceTheme: React.FC<Props> = observer(({ setIsPaletteOpen }) => {
-  const store: any = useMobxStore();
-
+export const ChangeInterfaceTheme: React.FC<Props> = ({ setIsPaletteOpen }) => {
   const [mounted, setMounted] = useState(false);
-
   const { setTheme } = useTheme();
 
-  const { user, mutateUser } = useUser();
-
-  const updateUserTheme = (newTheme: string) => {
-    if (!user) return;
-    setTheme(newTheme);
-    return store.user
-      .updateCurrentUserSettings({ theme: { ...user.theme, theme: newTheme } })
-      .then((response: any) => response)
-      .catch((error: any) => error);
-  };
-
   // useEffect only runs on the client, so now we can safely show the UI
   useEffect(() => {
     setMounted(true);
   }, []);
 
-  if (!mounted) return null;
+  if (!mounted) {
+    return null;
+  }
 
   return (
     <>
-      {THEMES_OBJ.filter((t) => t.value !== "custom").map((theme) => (
+      {THEMES_OBJ.map((theme) => (
         <Command.Item
           key={theme.value}
           onSelect={() => {
-            updateUserTheme(theme.value);
+            setTheme(theme.value);
             setIsPaletteOpen(false);
           }}
           className="focus:outline-none"
@@ -62,4 +42,4 @@ export const ChangeInterfaceTheme: React.FC<Props> = observer(({ setIsPaletteOpe
       ))}
     </>
   );
-});
+};

apps/app/components/command-palette/command-k.tsx

@@ -354,8 +354,8 @@ export const CommandK: React.FC<Props> = ({ deleteIssue, isPaletteOpen, setIsPal
                               <Command.Item
                                 key={item.id}
                                 onSelect={() => {
-                                  setIsPaletteOpen(false);
                                   router.push(currentSection.path(item));
+                                  setIsPaletteOpen(false);
                                 }}
                                 value={`${key}-${item?.name}`}
                                 className="focus:outline-none"
@@ -379,7 +379,6 @@ export const CommandK: React.FC<Props> = ({ deleteIssue, isPaletteOpen, setIsPal
                         <Command.Group heading="Issue actions">
                           <Command.Item
                             onSelect={() => {
-                              setIsPaletteOpen(false);
                               setPlaceholder("Change state...");
                               setSearchTerm("");
                               setPages([...pages, "change-issue-state"]);
@@ -461,7 +460,6 @@ export const CommandK: React.FC<Props> = ({ deleteIssue, isPaletteOpen, setIsPal
                       <Command.Group heading="Issue">
                         <Command.Item
                           onSelect={() => {
-                            setIsPaletteOpen(false);
                             const e = new KeyboardEvent("keydown", {
                               key: "c",
                             });
@@ -481,7 +479,6 @@ export const CommandK: React.FC<Props> = ({ deleteIssue, isPaletteOpen, setIsPal
                         <Command.Group heading="Project">
                           <Command.Item
                             onSelect={() => {
-                              setIsPaletteOpen(false);
                               const e = new KeyboardEvent("keydown", {
                                 key: "p",
                               });
@@ -503,7 +500,6 @@ export const CommandK: React.FC<Props> = ({ deleteIssue, isPaletteOpen, setIsPal
                           <Command.Group heading="Cycle">
                             <Command.Item
                               onSelect={() => {
-                                setIsPaletteOpen(false);
                                 const e = new KeyboardEvent("keydown", {
                                   key: "q",
                                 });
@@ -521,7 +517,6 @@ export const CommandK: React.FC<Props> = ({ deleteIssue, isPaletteOpen, setIsPal
                           <Command.Group heading="Module">
                             <Command.Item
                               onSelect={() => {
-                                setIsPaletteOpen(false);
                                 const e = new KeyboardEvent("keydown", {
                                   key: "m",
                                 });
@@ -539,7 +534,6 @@ export const CommandK: React.FC<Props> = ({ deleteIssue, isPaletteOpen, setIsPal
                           <Command.Group heading="View">
                             <Command.Item
                               onSelect={() => {
-                                setIsPaletteOpen(false);
                                 const e = new KeyboardEvent("keydown", {
                                   key: "v",
                                 });
@@ -557,7 +551,6 @@ export const CommandK: React.FC<Props> = ({ deleteIssue, isPaletteOpen, setIsPal
                           <Command.Group heading="Page">
                             <Command.Item
                               onSelect={() => {
-                                setIsPaletteOpen(false);
                                 const e = new KeyboardEvent("keydown", {
                                   key: "d",
                                 });
@@ -575,12 +568,11 @@ export const CommandK: React.FC<Props> = ({ deleteIssue, isPaletteOpen, setIsPal
                           {projectDetails && projectDetails.inbox_view && (
                             <Command.Group heading="Inbox">
                               <Command.Item
-                                onSelect={() => {
-                                  setIsPaletteOpen(false);
+                                onSelect={() =>
                                   redirect(
                                     `/${workspaceSlug}/projects/${projectId}/inbox/${inboxList?.[0]?.id}`
-                                  );
-                                }}
+                                  )
+                                }
                                 className="focus:outline-none"
                               >
                                 <div className="flex items-center gap-2 text-custom-text-200">
@@ -739,21 +731,12 @@ export const CommandK: React.FC<Props> = ({ deleteIssue, isPaletteOpen, setIsPal
                         </div>
                       </Command.Item>
                       <Command.Item
-                        onSelect={() => redirect(`/${workspaceSlug}/settings/imports`)}
+                        onSelect={() => redirect(`/${workspaceSlug}/settings/import-export`)}
                         className="focus:outline-none"
                       >
                         <div className="flex items-center gap-2 text-custom-text-200">
                           <SettingIcon className="h-4 w-4 text-custom-text-200" />
-                          Import
-                        </div>
-                      </Command.Item>
-                      <Command.Item
-                        onSelect={() => redirect(`/${workspaceSlug}/settings/exports`)}
-                        className="focus:outline-none"
-                      >
-                        <div className="flex items-center gap-2 text-custom-text-200">
-                          <SettingIcon className="h-4 w-4 text-custom-text-200" />
-                          Export
+                          Import/Export
                         </div>
                       </Command.Item>
                     </>

apps/app/components/command-palette/command-pallette.tsx

@@ -1,8 +1,11 @@
 import React, { useCallback, useEffect, useState } from "react";
 
 import { useRouter } from "next/router";
+
 import useSWR from "swr";
+
 // hooks
+import useTheme from "hooks/use-theme";
 import useToast from "hooks/use-toast";
 import useUser from "hooks/use-user";
 // components
@@ -21,14 +24,8 @@ import issuesService from "services/issues.service";
 import inboxService from "services/inbox.service";
 // fetch keys
 import { INBOX_LIST, ISSUE_DETAILS } from "constants/fetch-keys";
-// mobx store
-import { useMobxStore } from "lib/mobx/store-provider";
-import { observable } from "mobx";
-import { observer } from "mobx-react-lite";
-
-export const CommandPalette: React.FC = observer(() => {
-  const store: any = useMobxStore();
 
+export const CommandPalette: React.FC = () => {
   const [isPaletteOpen, setIsPaletteOpen] = useState(false);
   const [isIssueModalOpen, setIsIssueModalOpen] = useState(false);
   const [isProjectModalOpen, setIsProjectModalOpen] = useState(false);
@@ -46,12 +43,13 @@ export const CommandPalette: React.FC = observer(() => {
   const { user } = useUser();
 
   const { setToastAlert } = useToast();
+  const { toggleCollapsed } = useTheme();
 
   const { data: issueDetails } = useSWR(
     workspaceSlug && projectId && issueId ? ISSUE_DETAILS(issueId as string) : null,
     workspaceSlug && projectId && issueId
       ? () =>
-        issuesService.retrieve(workspaceSlug as string, projectId as string, issueId as string)
+          issuesService.retrieve(workspaceSlug as string, projectId as string, issueId as string)
       : null
   );
 
@@ -76,52 +74,53 @@ export const CommandPalette: React.FC = observer(() => {
 
   const handleKeyDown = useCallback(
     (e: KeyboardEvent) => {
+      const singleShortcutKeys = ["p", "v", "d", "h", "q", "m"];
       const { key, ctrlKey, metaKey, altKey, shiftKey } = e;
       if (!key) return;
-
       const keyPressed = key.toLowerCase();
-      const cmdClicked = ctrlKey || metaKey;
-      // if on input, textarea or editor, don't do anything
       if (
-        e.target instanceof HTMLTextAreaElement ||
-        e.target instanceof HTMLInputElement ||
-        (e.target as Element).classList?.contains("ProseMirror")
-      )
-        return;
-
-        if (cmdClicked) {
-          if (keyPressed === "k") {
-            e.preventDefault();
-            setIsPaletteOpen(true);
-          } else if (keyPressed === "c" && altKey) {
+        !(e.target instanceof HTMLTextAreaElement) &&
+        !(e.target instanceof HTMLInputElement) &&
+        !(e.target as Element).classList?.contains("remirror-editor")
+      ) {
+        if ((ctrlKey || metaKey) && keyPressed === "k") {
+          e.preventDefault();
+          setIsPaletteOpen(true);
+        } else if ((ctrlKey || metaKey) && keyPressed === "c") {
+          if (altKey) {
             e.preventDefault();
             copyIssueUrlToClipboard();
-          } else if (keyPressed === "b") {
-            e.preventDefault();
-            store.theme.setSidebarCollapsed(!store?.theme?.sidebarCollapsed);
-          }
-        } else {
-          if (keyPressed === "c") {
-            setIsIssueModalOpen(true);
-          } else if (keyPressed === "p") {
-            setIsProjectModalOpen(true);
-          } else if (keyPressed === "v") {
-            setIsCreateViewModalOpen(true);
-          } else if (keyPressed === "d") {
-            setIsCreateUpdatePageModalOpen(true);
-          } else if (keyPressed === "h") {
-            setIsShortcutsModalOpen(true);
-          } else if (keyPressed === "q") {
-            setIsCreateCycleModalOpen(true);
-          } else if (keyPressed === "m") {
-            setIsCreateModuleModalOpen(true);
-          } else if (keyPressed === "backspace" || keyPressed === "delete") {
-            e.preventDefault();
-            setIsBulkDeleteIssuesModalOpen(true);
           }
+        } else if (keyPressed === "c") {
+          e.preventDefault();
+          setIsIssueModalOpen(true);
+        } else if ((ctrlKey || metaKey) && keyPressed === "b") {
+          e.preventDefault();
+          toggleCollapsed();
+        } else if (key === "Delete") {
+          e.preventDefault();
+          setIsBulkDeleteIssuesModalOpen(true);
+        } else if (
+          singleShortcutKeys.includes(keyPressed) &&
+          (ctrlKey || metaKey || altKey || shiftKey)
+        ) {
+          e.preventDefault();
+        } else if (keyPressed === "p") {
+          setIsProjectModalOpen(true);
+        } else if (keyPressed === "v") {
+          setIsCreateViewModalOpen(true);
+        } else if (keyPressed === "d") {
+          setIsCreateUpdatePageModalOpen(true);
+        } else if (keyPressed === "h") {
+          setIsShortcutsModalOpen(true);
+        } else if (keyPressed === "q") {
+          setIsCreateCycleModalOpen(true);
+        } else if (keyPressed === "m") {
+          setIsCreateModuleModalOpen(true);
         }
+      }
     },
-    [copyIssueUrlToClipboard]
+    [toggleCollapsed, copyIssueUrlToClipboard]
   );
 
   useEffect(() => {
@@ -196,4 +195,4 @@ export const CommandPalette: React.FC = observer(() => {
       />
     </>
   );
-})
+};

apps/app/components/command-palette/issue/change-issue-assignee.tsx

@@ -34,12 +34,15 @@ export const ChangeIssueAssignee: React.FC<Props> = ({ setIsPaletteOpen, issue,
   const options =
     members?.map(({ member }) => ({
       value: member.id,
-      query: member.display_name,
+      query:
+        (member.first_name && member.first_name !== "" ? member.first_name : member.email) +
+          " " +
+          member.last_name ?? "",
       content: (
         <>
           <div className="flex items-center gap-2">
             <Avatar user={member} />
-            {member.display_name}
+            {member.first_name && member.first_name !== "" ? member.first_name : member.email}
           </div>
           {issue.assignees.includes(member.id) && (
             <div>

apps/app/components/core/activity.tsx

@@ -35,22 +35,6 @@ const IssueLink = ({ activity }: { activity: IIssueActivity }) => {
   );
 };
 
-const UserLink = ({ activity }: { activity: IIssueActivity }) => {
-  const router = useRouter();
-  const { workspaceSlug } = router.query;
-
-  return (
-    <a
-      href={`/${workspaceSlug}/profile/${activity.new_identifier ?? activity.old_identifier}`}
-      target="_blank"
-      rel="noopener noreferrer"
-      className="font-medium text-custom-text-100 inline-flex items-center hover:underline"
-    >
-      {activity.new_value && activity.new_value !== "" ? activity.new_value : activity.old_value}
-    </a>
-  );
-};
-
 const activityDetails: {
   [key: string]: {
     message: (activity: IIssueActivity, showIssue: boolean) => React.ReactNode;
@@ -62,7 +46,8 @@ const activityDetails: {
       if (activity.old_value === "")
         return (
           <>
-            added a new assignee <UserLink activity={activity} />
+            added a new assignee{" "}
+            <span className="font-medium text-custom-text-100">{activity.new_value}</span>
             {showIssue && (
               <>
                 {" "}
@@ -75,7 +60,8 @@ const activityDetails: {
       else
         return (
           <>
-            removed the assignee <UserLink activity={activity} />
+            removed the assignee{" "}
+            <span className="font-medium text-custom-text-100">{activity.old_value}</span>
             {showIssue && (
               <>
                 {" "}
@@ -442,40 +428,6 @@ const activityDetails: {
     ),
     icon: <Icon iconName="signal_cellular_alt" className="!text-sm" aria-hidden="true" />,
   },
-  start_date: {
-    message: (activity, showIssue) => {
-      if (!activity.new_value)
-        return (
-          <>
-            removed the start date
-            {showIssue && (
-              <>
-                {" "}
-                from <IssueLink activity={activity} />
-              </>
-            )}
-            .
-          </>
-        );
-      else
-        return (
-          <>
-            set the start date to{" "}
-            <span className="font-medium text-custom-text-100">
-              {renderShortDateWithYearFormat(activity.new_value)}
-            </span>
-            {showIssue && (
-              <>
-                {" "}
-                for <IssueLink activity={activity} />
-              </>
-            )}
-            .
-          </>
-        );
-    },
-    icon: <Icon iconName="calendar_today" className="!text-sm" aria-hidden="true" />,
-  },
   state: {
     message: (activity, showIssue) => (
       <>
@@ -529,7 +481,7 @@ const activityDetails: {
 };
 
 export const ActivityIcon = ({ activity }: { activity: IIssueActivity }) => (
-  <>{activityDetails[activity.field as keyof typeof activityDetails]?.icon}</>
+  <>{activityDetails[activity.field as keyof typeof activityDetails].icon}</>
 );
 
 export const ActivityMessage = ({
@@ -540,6 +492,6 @@ export const ActivityMessage = ({
   showIssue?: boolean;
 }) => (
   <>
-    {activityDetails[activity.field as keyof typeof activityDetails]?.message(activity, showIssue)}
+    {activityDetails[activity.field as keyof typeof activityDetails].message(activity, showIssue)}
   </>
 );

apps/app/components/core/feeds.tsx

@@ -0,0 +1,331 @@
+import React from "react";
+
+import Link from "next/link";
+
+// icons
+import {
+  ArrowTopRightOnSquareIcon,
+  ChatBubbleLeftEllipsisIcon,
+  Squares2X2Icon,
+} from "@heroicons/react/24/outline";
+import { BlockedIcon, BlockerIcon } from "components/icons";
+import { Icon } from "components/ui";
+// helpers
+import { renderShortDateWithYearFormat, timeAgo } from "helpers/date-time.helper";
+import { addSpaceIfCamelCase } from "helpers/string.helper";
+// types
+import RemirrorRichTextEditor from "components/rich-text-editor";
+
+const activityDetails: {
+  [key: string]: {
+    message?: string;
+    icon: JSX.Element;
+  };
+} = {
+  assignee: {
+    message: "removed the assignee",
+    icon: <Icon iconName="group" className="!text-sm" aria-hidden="true" />,
+  },
+  assignees: {
+    message: "added a new assignee",
+    icon: <Icon iconName="group" className="!text-sm" aria-hidden="true" />,
+  },
+  blocks: {
+    message: "marked this issue being blocked by",
+    icon: <BlockedIcon height="12" width="12" color="#6b7280" />,
+  },
+  blocking: {
+    message: "marked this issue is blocking",
+    icon: <BlockerIcon height="12" width="12" color="#6b7280" />,
+  },
+  cycles: {
+    message: "set the cycle to",
+    icon: <Icon iconName="contrast" className="!text-sm" aria-hidden="true" />,
+  },
+  labels: {
+    icon: <Icon iconName="sell" className="!text-sm" aria-hidden="true" />,
+  },
+  modules: {
+    message: "set the module to",
+    icon: <Icon iconName="dataset" className="!text-sm" aria-hidden="true" />,
+  },
+  state: {
+    message: "set the state to",
+    icon: <Squares2X2Icon className="h-3 w-3 text-custom-text-200" aria-hidden="true" />,
+  },
+  priority: {
+    message: "set the priority to",
+    icon: <Icon iconName="signal_cellular_alt" className="!text-sm" aria-hidden="true" />,
+  },
+  name: {
+    message: "set the name to",
+    icon: <Icon iconName="chat" className="!text-sm" aria-hidden="true" />,
+  },
+  description: {
+    message: "updated the description.",
+    icon: <Icon iconName="chat" className="!text-sm" aria-hidden="true" />,
+  },
+  estimate_point: {
+    message: "set the estimate point to",
+    icon: <Icon iconName="change_history" className="!text-sm" aria-hidden="true" />,
+  },
+  target_date: {
+    message: "set the due date to",
+    icon: <Icon iconName="calendar_today" className="!text-sm" aria-hidden="true" />,
+  },
+  parent: {
+    message: "set the parent to",
+    icon: <Icon iconName="supervised_user_circle" className="!text-sm" aria-hidden="true" />,
+  },
+  issue: {
+    message: "deleted the issue.",
+    icon: <Icon iconName="delete" className="!text-sm" aria-hidden="true" />,
+  },
+  estimate: {
+    message: "updated the estimate",
+    icon: <Icon iconName="change_history" className="!text-sm" aria-hidden="true" />,
+  },
+  link: {
+    message: "updated the link",
+    icon: <Icon iconName="link" className="!text-sm" aria-hidden="true" />,
+  },
+  attachment: {
+    message: "updated the attachment",
+    icon: <Icon iconName="attach_file" className="!text-sm" aria-hidden="true" />,
+  },
+  archived_at: {
+    message: "archived",
+    icon: <Icon iconName="archive" className="!text-sm text-custom-text-200" aria-hidden="true" />,
+  },
+};
+
+export const Feeds: React.FC<any> = ({ activities }) => (
+  <div>
+    <ul role="list" className="-mb-4">
+      {activities.map((activity: any, activityIdx: number) => {
+        // determines what type of action is performed
+        let action = activityDetails[activity.field as keyof typeof activityDetails]?.message;
+        if (activity.field === "labels") {
+          action = activity.new_value !== "" ? "added a new label" : "removed the label";
+        } else if (activity.field === "blocking") {
+          action =
+            activity.new_value !== ""
+              ? "marked this issue is blocking"
+              : "removed the issue from blocking";
+        } else if (activity.field === "blocks") {
+          action =
+            activity.new_value !== "" ? "marked this issue being blocked by" : "removed blocker";
+        } else if (activity.field === "target_date") {
+          action =
+            activity.new_value && activity.new_value !== ""
+              ? "set the due date to"
+              : "removed the due date";
+        } else if (activity.field === "parent") {
+          action =
+            activity.new_value && activity.new_value !== ""
+              ? "set the parent to"
+              : "removed the parent";
+        } else if (activity.field === "priority") {
+          action =
+            activity.new_value && activity.new_value !== ""
+              ? "set the priority to"
+              : "removed the priority";
+        } else if (activity.field === "description") {
+          action = "updated the";
+        } else if (activity.field === "attachment") {
+          action = `${activity.verb} the`;
+        } else if (activity.field === "link") {
+          action = `${activity.verb} the`;
+        } else if (activity.field === "archived_at") {
+          action =
+            activity.new_value && activity.new_value === "restore"
+              ? "restored the issue"
+              : "archived the issue";
+        }
+        // for values that are after the action clause
+        let value: any = activity.new_value ? activity.new_value : activity.old_value;
+        if (
+          activity.verb === "created" &&
+          activity.field !== "cycles" &&
+          activity.field !== "modules" &&
+          activity.field !== "attachment" &&
+          activity.field !== "link" &&
+          activity.field !== "estimate"
+        ) {
+          const { workspace_detail, project, issue } = activity;
+          value = (
+            <span className="text-custom-text-200">
+              created{" "}
+              <Link href={`/${workspace_detail.slug}/projects/${project}/issues/${issue}`}>
+                <a className="inline-flex items-center hover:underline">
+                  this issue. <ArrowTopRightOnSquareIcon className="ml-1 h-3.5 w-3.5" />
+                </a>
+              </Link>
+            </span>
+          );
+        } else if (activity.field === "state") {
+          value = activity.new_value ? addSpaceIfCamelCase(activity.new_value) : "None";
+        } else if (activity.field === "labels") {
+          let name;
+          let id = "#000000";
+          if (activity.new_value !== "") {
+            name = activity.new_value;
+            id = activity.new_identifier ? activity.new_identifier : id;
+          } else {
+            name = activity.old_value;
+            id = activity.old_identifier ? activity.old_identifier : id;
+          }
+
+          value = name;
+        } else if (activity.field === "assignees") {
+          value = activity.new_value;
+        } else if (activity.field === "target_date") {
+          const date =
+            activity.new_value && activity.new_value !== ""
+              ? activity.new_value
+              : activity.old_value;
+          value = renderShortDateWithYearFormat(date as string);
+        } else if (activity.field === "description") {
+          value = "description";
+        } else if (activity.field === "attachment") {
+          value = "attachment";
+        } else if (activity.field === "link") {
+          value = "link";
+        } else if (activity.field === "estimate_point") {
+          value = activity.new_value
+            ? activity.new_value + ` Point${parseInt(activity.new_value ?? "", 10) > 1 ? "s" : ""}`
+            : "None";
+        }
+
+        if (activity.field === "comment") {
+          return (
+            <div key={activity.id} className="mt-2">
+              <div className="relative flex items-start space-x-3">
+                <div className="relative px-1">
+                  {activity.field ? (
+                    activity.new_value === "restore" ? (
+                      <Icon iconName="history" className="text-sm text-custom-text-200" />
+                    ) : (
+                      activityDetails[activity.field as keyof typeof activityDetails]?.icon
+                    )
+                  ) : activity.actor_detail.avatar && activity.actor_detail.avatar !== "" ? (
+                    <img
+                      src={activity.actor_detail.avatar}
+                      alt={activity.actor_detail.first_name}
+                      height={30}
+                      width={30}
+                      className="grid h-7 w-7 place-items-center rounded-full border-2 border-white bg-gray-500 text-white"
+                    />
+                  ) : (
+                    <div
+                      className={`grid h-7 w-7 place-items-center rounded-full border-2 border-white bg-gray-500 text-white`}
+                    >
+                      {activity.actor_detail.first_name.charAt(0)}
+                    </div>
+                  )}
+
+                  <span className="absolute -bottom-0.5 -right-1 rounded-tl bg-custom-background-80 px-0.5 py-px">
+                    <ChatBubbleLeftEllipsisIcon
+                      className="h-3.5 w-3.5 text-custom-text-200"
+                      aria-hidden="true"
+                    />
+                  </span>
+                </div>
+                <div className="min-w-0 flex-1">
+                  <div>
+                    <div className="text-xs">
+                      {activity.actor_detail.first_name}
+                      {activity.actor_detail.is_bot ? "Bot" : " " + activity.actor_detail.last_name}
+                    </div>
+                    <p className="mt-0.5 text-xs text-custom-text-200">
+                      Commented {timeAgo(activity.created_at)}
+                    </p>
+                  </div>
+                  <div className="issue-comments-section p-0">
+                    <RemirrorRichTextEditor
+                      value={
+                        activity.new_value && activity.new_value !== ""
+                          ? activity.new_value
+                          : activity.old_value
+                      }
+                      editable={false}
+                      noBorder
+                      customClassName="text-xs border border-custom-border-200 bg-custom-background-100"
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          );
+        }
+
+        if ("field" in activity && activity.field !== "updated_by") {
+          return (
+            <li key={activity.id}>
+              <div className="relative pb-1">
+                {activities.length > 1 && activityIdx !== activities.length - 1 ? (
+                  <span
+                    className="absolute top-5 left-5 -ml-px h-full w-0.5 bg-custom-background-80"
+                    aria-hidden="true"
+                  />
+                ) : null}
+                <div className="relative flex items-start space-x-2">
+                  <>
+                    <div>
+                      <div className="relative px-1.5">
+                        <div className="mt-1.5">
+                          <div className="ring-6 flex h-7 w-7 items-center justify-center rounded-full bg-custom-background-80 text-custom-text-200 ring-white">
+                            {activity.field ? (
+                              activityDetails[activity.field as keyof typeof activityDetails]?.icon
+                            ) : activity.actor_detail.avatar &&
+                              activity.actor_detail.avatar !== "" ? (
+                              <img
+                                src={activity.actor_detail.avatar}
+                                alt={activity.actor_detail.first_name}
+                                height={24}
+                                width={24}
+                                className="rounded-full"
+                              />
+                            ) : (
+                              <div
+                                className={`grid h-7 w-7 place-items-center rounded-full border-2 border-white bg-gray-700 text-xs text-white`}
+                              >
+                                {activity.actor_detail.first_name.charAt(0)}
+                              </div>
+                            )}
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <div className="min-w-0 flex-1 py-3">
+                      <div className="text-xs text-custom-text-200">
+                        {activity.field === "archived_at" && activity.new_value !== "restore" ? (
+                          <span className="text-gray font-medium">Plane</span>
+                        ) : (
+                          <span className="text-gray font-medium">
+                            {activity.actor_detail.first_name}
+                            {activity.actor_detail.is_bot
+                              ? " Bot"
+                              : " " + activity.actor_detail.last_name}
+                          </span>
+                        )}
+                        <span> {action} </span>
+                        {activity.field !== "archived_at" && (
+                          <span className="text-xs font-medium text-custom-text-100">
+                            {" "}
+                            {value}{" "}
+                          </span>
+                        )}
+                        <span className="whitespace-nowrap">{timeAgo(activity.created_at)}</span>
+                      </div>
+                    </div>
+                  </>
+                </div>
+              </div>
+            </li>
+          );
+        }
+      })}
+    </ul>
+  </div>
+);

apps/app/components/core/filters/filters-list.tsx

@@ -157,10 +157,10 @@ export const FiltersList: React.FC<Props> = ({
                         return (
                           <div
                             key={memberId}
-                            className="inline-flex items-center gap-x-1 rounded-full bg-custom-background-90 px-1"
+                            className="inline-flex items-center gap-x-1 rounded-full bg-custom-background-90 px-1 capitalize"
                           >
                             <Avatar user={member} />
-                            <span>{member?.display_name}</span>
+                            <span>{member?.first_name}</span>
                             <span
                               className="cursor-pointer"
                               onClick={() =>
@@ -184,7 +184,7 @@ export const FiltersList: React.FC<Props> = ({
                             className="inline-flex items-center gap-x-1 rounded-full bg-custom-background-90 px-1 capitalize"
                           >
                             <Avatar user={member} />
-                            <span>{member?.display_name}</span>
+                            <span>{member?.first_name}</span>
                             <span
                               className="cursor-pointer"
                               onClick={() =>

apps/app/components/core/filters/issues-view-filter.tsx

@@ -113,51 +113,49 @@ export const IssuesFilterView: React.FC = () => {
           ))}
         </div>
       )}
-      {issueView !== "gantt_chart" && (
-        <SelectFilters
-          filters={filters}
-          onSelect={(option) => {
-            const key = option.key as keyof typeof filters;
+      <SelectFilters
+        filters={filters}
+        onSelect={(option) => {
+          const key = option.key as keyof typeof filters;
 
-            if (key === "target_date") {
-              const valueExists = checkIfArraysHaveSameElements(
-                filters.target_date ?? [],
-                option.value
+          if (key === "target_date") {
+            const valueExists = checkIfArraysHaveSameElements(
+              filters.target_date ?? [],
+              option.value
+            );
+
+            setFilters({
+              target_date: valueExists ? null : option.value,
+            });
+          } else {
+            const valueExists = filters[key]?.includes(option.value);
+
+            if (valueExists)
+              setFilters(
+                {
+                  [option.key]: ((filters[key] ?? []) as any[])?.filter(
+                    (val) => val !== option.value
+                  ),
+                },
+                !Boolean(viewId)
               );
-
-              setFilters({
-                target_date: valueExists ? null : option.value,
-              });
-            } else {
-              const valueExists = filters[key]?.includes(option.value);
-
-              if (valueExists)
-                setFilters(
-                  {
-                    [option.key]: ((filters[key] ?? []) as any[])?.filter(
-                      (val) => val !== option.value
-                    ),
-                  },
-                  !Boolean(viewId)
-                );
-              else
-                setFilters(
-                  {
-                    [option.key]: [...((filters[key] ?? []) as any[]), option.value],
-                  },
-                  !Boolean(viewId)
-                );
-            }
-          }}
-          direction="left"
-          height="rg"
-        />
-      )}
+            else
+              setFilters(
+                {
+                  [option.key]: [...((filters[key] ?? []) as any[]), option.value],
+                },
+                !Boolean(viewId)
+              );
+          }
+        }}
+        direction="left"
+        height="rg"
+      />
       <Popover className="relative">
         {({ open }) => (
           <>
             <Popover.Button
-              className={`group flex items-center gap-2 rounded-md border border-custom-border-200 px-3 py-1.5 text-xs hover:bg-custom-sidebar-background-90 hover:text-custom-sidebar-text-100 focus:outline-none duration-300 ${
+              className={`group flex items-center gap-2 rounded-md border border-custom-sidebar-border-200 bg-transparent px-3 py-1.5 text-xs hover:bg-custom-sidebar-background-90 hover:text-custom-sidebar-text-100 focus:outline-none duration-300 ${
                 open
                   ? "bg-custom-sidebar-background-90 text-custom-sidebar-text-100"
                   : "text-custom-sidebar-text-200"
@@ -179,9 +177,8 @@ export const IssuesFilterView: React.FC = () => {
               <Popover.Panel className="absolute right-0 z-30 mt-1 w-screen max-w-xs transform rounded-lg border border-custom-border-200 bg-custom-background-90 p-3 shadow-lg">
                 <div className="relative divide-y-2 divide-custom-border-200">
                   <div className="space-y-4 pb-3 text-xs">
-                    {issueView !== "calendar" &&
-                      issueView !== "spreadsheet" &&
-                      issueView !== "gantt_chart" && (
+                    {issueView !== "calendar" && issueView !== "spreadsheet" && (
+                      <>
                         <div className="flex items-center justify-between">
                           <h4 className="text-custom-text-200">Group by</h4>
                           <div className="w-28">
@@ -209,34 +206,34 @@ export const IssuesFilterView: React.FC = () => {
                             </CustomMenu>
                           </div>
                         </div>
-                      )}
-                    {issueView !== "calendar" && issueView !== "spreadsheet" && (
-                      <div className="flex items-center justify-between">
-                        <h4 className="text-custom-text-200">Order by</h4>
-                        <div className="w-28">
-                          <CustomMenu
-                            label={
-                              ORDER_BY_OPTIONS.find((option) => option.key === orderBy)?.name ??
-                              "Select"
-                            }
-                            className="!w-full"
-                            buttonClassName="w-full"
-                          >
-                            {ORDER_BY_OPTIONS.map((option) =>
-                              groupByProperty === "priority" && option.key === "priority" ? null : (
-                                <CustomMenu.MenuItem
-                                  key={option.key}
-                                  onClick={() => {
-                                    setOrderBy(option.key);
-                                  }}
-                                >
-                                  {option.name}
-                                </CustomMenu.MenuItem>
-                              )
-                            )}
-                          </CustomMenu>
+                        <div className="flex items-center justify-between">
+                          <h4 className="text-custom-text-200">Order by</h4>
+                          <div className="w-28">
+                            <CustomMenu
+                              label={
+                                ORDER_BY_OPTIONS.find((option) => option.key === orderBy)?.name ??
+                                "Select"
+                              }
+                              className="!w-full"
+                              buttonClassName="w-full"
+                            >
+                              {ORDER_BY_OPTIONS.map((option) =>
+                                groupByProperty === "priority" &&
+                                option.key === "priority" ? null : (
+                                  <CustomMenu.MenuItem
+                                    key={option.key}
+                                    onClick={() => {
+                                      setOrderBy(option.key);
+                                    }}
+                                  >
+                                    {option.name}
+                                  </CustomMenu.MenuItem>
+                                )
+                              )}
+                            </CustomMenu>
+                          </div>
                         </div>
-                      </div>
+                      </>
                     )}
                     <div className="flex items-center justify-between">
                       <h4 className="text-custom-text-200">Issue type</h4>
@@ -266,19 +263,16 @@ export const IssuesFilterView: React.FC = () => {
                     </div>
 
                     {issueView !== "calendar" && issueView !== "spreadsheet" && (
-                      <div className="flex items-center justify-between">
-                        <h4 className="text-custom-text-200">Show sub-issues</h4>
-                        <div className="w-28">
-                          <ToggleSwitch
-                            value={showSubIssues}
-                            onChange={() => setShowSubIssues(!showSubIssues)}
-                          />
+                      <>
+                        <div className="flex items-center justify-between">
+                          <h4 className="text-custom-text-200">Show sub-issues</h4>
+                          <div className="w-28">
+                            <ToggleSwitch
+                              value={showSubIssues}
+                              onChange={() => setShowSubIssues(!showSubIssues)}
+                            />
+                          </div>
                         </div>
-                      </div>
-                    )}
-                    {issueView !== "calendar" &&
-                      issueView !== "spreadsheet" &&
-                      issueView !== "gantt_chart" && (
                         <div className="flex items-center justify-between">
                           <h4 className="text-custom-text-200">Show empty states</h4>
                           <div className="w-28">
@@ -288,10 +282,6 @@ export const IssuesFilterView: React.FC = () => {
                             />
                           </div>
                         </div>
-                      )}
-                    {issueView !== "calendar" &&
-                      issueView !== "spreadsheet" &&
-                      issueView !== "gantt_chart" && (
                         <div className="relative flex justify-end gap-x-3">
                           <button type="button" onClick={() => resetFilterToDefault()}>
                             Reset to default
@@ -304,48 +294,47 @@ export const IssuesFilterView: React.FC = () => {
                             Set as default
                           </button>
                         </div>
-                      )}
+                      </>
+                    )}
                   </div>
 
-                  {issueView !== "gantt_chart" && (
-                    <div className="space-y-2 py-3">
-                      <h4 className="text-sm text-custom-text-200">Display Properties</h4>
-                      <div className="flex flex-wrap items-center gap-2 text-custom-text-200">
-                        {Object.keys(properties).map((key) => {
-                          if (key === "estimate" && !isEstimateActive) return null;
+                  <div className="space-y-2 py-3">
+                    <h4 className="text-sm text-custom-text-200">Display Properties</h4>
+                    <div className="flex flex-wrap items-center gap-2 text-custom-text-200">
+                      {Object.keys(properties).map((key) => {
+                        if (key === "estimate" && !isEstimateActive) return null;
 
-                          if (
-                            issueView === "spreadsheet" &&
-                            (key === "attachment_count" ||
-                              key === "link" ||
-                              key === "sub_issue_count")
-                          )
-                            return null;
+                        if (
+                          issueView === "spreadsheet" &&
+                          (key === "attachment_count" ||
+                            key === "link" ||
+                            key === "sub_issue_count")
+                        )
+                          return null;
 
-                          if (
-                            issueView !== "spreadsheet" &&
-                            (key === "created_on" || key === "updated_on")
-                          )
-                            return null;
+                        if (
+                          issueView !== "spreadsheet" &&
+                          (key === "created_on" || key === "updated_on")
+                        )
+                          return null;
 
-                          return (
-                            <button
-                              key={key}
-                              type="button"
-                              className={`rounded border px-2 py-1 text-xs capitalize ${
-                                properties[key as keyof Properties]
-                                  ? "border-custom-primary bg-custom-primary text-white"
-                                  : "border-custom-border-200"
-                              }`}
-                              onClick={() => setProperties(key as keyof Properties)}
-                            >
-                              {key === "key" ? "ID" : replaceUnderscoreIfSnakeCase(key)}
-                            </button>
-                          );
-                        })}
-                      </div>
+                        return (
+                          <button
+                            key={key}
+                            type="button"
+                            className={`rounded border px-2 py-1 text-xs capitalize ${
+                              properties[key as keyof Properties]
+                                ? "border-custom-primary bg-custom-primary text-white"
+                                : "border-custom-border-200"
+                            }`}
+                            onClick={() => setProperties(key as keyof Properties)}
+                          >
+                            {key === "key" ? "ID" : replaceUnderscoreIfSnakeCase(key)}
+                          </button>
+                        );
+                      })}
                     </div>
-                  )}
+                  </div>
                 </div>
               </Popover.Panel>
             </Transition>

apps/app/components/core/image-picker-popover.tsx

@@ -27,8 +27,8 @@ const unsplashEnabled =
 
 const tabOptions = [
   {
-    key: "images",
-    title: "Images",
+    key: "unsplash",
+    title: "Unsplash",
   },
   {
     key: "upload",

apps/app/components/core/index.ts

@@ -4,5 +4,6 @@ export * from "./sidebar";
 export * from "./theme";
 export * from "./views";
 export * from "./activity";
+export * from "./feeds";
 export * from "./reaction-selector";
 export * from "./image-picker-popover";

apps/app/components/core/modals/gpt-assistant-modal.tsx

@@ -1,6 +1,7 @@
-import React, { useEffect, useState, forwardRef, useRef } from "react";
+import { useEffect, useState, forwardRef, useRef } from "react";
 
 import { useRouter } from "next/router";
+import dynamic from "next/dynamic";
 
 // react-hook-form
 import { useForm } from "react-hook-form";
@@ -14,7 +15,6 @@ import useUserAuth from "hooks/use-user-auth";
 import { Input, PrimaryButton, SecondaryButton } from "components/ui";
 
 import { IIssue, IPageBlock } from "types";
-import Tiptap, { ITiptapRichTextEditor } from "components/tiptap";
 type Props = {
   isOpen: boolean;
   handleClose: () => void;
@@ -32,11 +32,17 @@ type FormData = {
   task: string;
 };
 
-const TiptapEditor = React.forwardRef<ITiptapRichTextEditor, ITiptapRichTextEditor>(
-  (props, ref) => <Tiptap {...props} forwardedRef={ref} />
+const RemirrorRichTextEditor = dynamic(() => import("components/rich-text-editor"), {
+  ssr: false,
+});
+
+import { IRemirrorRichTextEditor } from "components/rich-text-editor";
+
+const WrappedRemirrorRichTextEditor = forwardRef<IRemirrorRichTextEditor, IRemirrorRichTextEditor>(
+  (props, ref) => <RemirrorRichTextEditor {...props} forwardedRef={ref} />
 );
 
-TiptapEditor.displayName = "TiptapEditor";
+WrappedRemirrorRichTextEditor.displayName = "WrappedRemirrorRichTextEditor";
 
 export const GptAssistantModal: React.FC<Props> = ({
   isOpen,
@@ -145,10 +151,10 @@ export const GptAssistantModal: React.FC<Props> = ({
       }`}
     >
       {((content && content !== "") || (htmlContent && htmlContent !== "<p></p>")) && (
-        <div className="text-sm">
+        <div className="remirror-section text-sm">
           Content:
-          <TiptapEditor
-            value={htmlContent ?? `<p>${content}</p>`}
+          <WrappedRemirrorRichTextEditor
+            value={htmlContent ?? <p>{content}</p>}
             customClassName="-m-3"
             noBorder
             borderOnFocus={false}
@@ -160,7 +166,7 @@ export const GptAssistantModal: React.FC<Props> = ({
       {response !== "" && (
         <div className="page-block-section text-sm">
           Response:
-          <Tiptap
+          <RemirrorRichTextEditor
             value={`<p>${response}</p>`}
             customClassName="-mx-3 -my-3"
             noBorder

apps/app/components/core/modals/image-upload-modal.tsx

@@ -131,10 +131,10 @@ export const ImageUploadModal: React.FC<Props> = ({
                     Upload Image
                   </Dialog.Title>
                   <div className="space-y-3">
-                    <div className="flex items-center justify-center gap-3">
+                    <div className="flex items-center gap-3">
                       <div
                         {...getRootProps()}
-                        className={`relative grid h-80 w-80 cursor-pointer place-items-center rounded-lg p-12 text-center focus:outline-none focus:ring-2 focus:ring-custom-primary focus:ring-offset-2 ${
+                        className={`relative grid h-80 w-full cursor-pointer place-items-center rounded-lg p-12 text-center focus:outline-none focus:ring-2 focus:ring-custom-primary focus:ring-offset-2 ${
                           (image === null && isDragActive) || !value
                             ? "border-2 border-dashed border-custom-border-200 hover:bg-custom-background-90"
                             : ""

apps/app/components/core/modals/link-modal.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import React from "react";
 
 // react-hook-form
 import { useForm } from "react-hook-form";
@@ -7,15 +7,12 @@ import { Dialog, Transition } from "@headlessui/react";
 // ui
 import { Input, PrimaryButton, SecondaryButton } from "components/ui";
 // types
-import type { IIssueLink, linkDetails, ModuleLink } from "types";
+import type { IIssueLink, ModuleLink } from "types";
 
 type Props = {
   isOpen: boolean;
   handleClose: () => void;
-  data?: linkDetails | null;
-  status: boolean;
-  createIssueLink: (formData: IIssueLink | ModuleLink) => Promise<void>;
-  updateIssueLink: (formData: IIssueLink | ModuleLink, linkId: string) => Promise<void>;
+  onFormSubmit: (formData: IIssueLink | ModuleLink) => Promise<void>;
 };
 
 const defaultValues: IIssueLink | ModuleLink = {
@@ -23,14 +20,7 @@ const defaultValues: IIssueLink | ModuleLink = {
   url: "",
 };
 
-export const LinkModal: React.FC<Props> = ({
-  isOpen,
-  handleClose,
-  createIssueLink,
-  updateIssueLink,
-  status,
-  data,
-}) => {
+export const LinkModal: React.FC<Props> = ({ isOpen, handleClose, onFormSubmit }) => {
   const {
     register,
     formState: { errors, isSubmitting },
@@ -40,6 +30,11 @@ export const LinkModal: React.FC<Props> = ({
     defaultValues,
   });
 
+  const onSubmit = async (formData: IIssueLink | ModuleLink) => {
+    await onFormSubmit({ title: formData.title, url: formData.url });
+    onClose();
+  };
+
   const onClose = () => {
     handleClose();
     const timeout = setTimeout(() => {
@@ -48,27 +43,6 @@ export const LinkModal: React.FC<Props> = ({
     }, 500);
   };
 
-  const handleFormSubmit = async (formData: IIssueLink | ModuleLink) => {
-    if (!data) await createIssueLink({ title: formData.title, url: formData.url });
-    else await updateIssueLink({ title: formData.title, url: formData.url }, data.id);
-    onClose();
-  };
-
-  const handleCreateUpdatePage = async (formData: IIssueLink | ModuleLink) => {
-    await handleFormSubmit(formData);
-
-    reset({
-      ...defaultValues,
-    });
-  };
-
-  useEffect(() => {
-    reset({
-      ...defaultValues,
-      ...data,
-    });
-  }, [data, reset]);
-
   return (
     <Transition.Root show={isOpen} as={React.Fragment}>
       <Dialog as="div" className="relative z-20" onClose={onClose}>
@@ -96,14 +70,14 @@ export const LinkModal: React.FC<Props> = ({
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
               <Dialog.Panel className="relative transform overflow-hidden rounded-lg bg-custom-background-100 border border-custom-border-200 px-5 py-8 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
-                <form onSubmit={handleSubmit(handleCreateUpdatePage)}>
+                <form onSubmit={handleSubmit(onSubmit)}>
                   <div>
                     <div className="space-y-5">
                       <Dialog.Title
                         as="h3"
                         className="text-lg font-medium leading-6 text-custom-text-100"
                       >
-                        {status ? "Update Link" : "Add Link"}
+                        Add Link
                       </Dialog.Title>
                       <div className="mt-2 space-y-3">
                         <div>
@@ -139,13 +113,7 @@ export const LinkModal: React.FC<Props> = ({
                   <div className="mt-5 flex justify-end gap-2">
                     <SecondaryButton onClick={onClose}>Cancel</SecondaryButton>
                     <PrimaryButton type="submit" loading={isSubmitting}>
-                      {status
-                        ? isSubmitting
-                          ? "Updating Link..."
-                          : "Update Link"
-                        : isSubmitting
-                        ? "Adding Link..."
-                        : "Add Link"}
+                      {isSubmitting ? "Adding Link..." : "Add Link"}
                     </PrimaryButton>
                   </div>
                 </form>

apps/app/components/core/sidebar/links-list.tsx

@@ -1,24 +1,25 @@
 // icons
 import { ArrowTopRightOnSquareIcon, LinkIcon, TrashIcon } from "@heroicons/react/24/outline";
-import { Icon } from "components/ui";
 // helpers
 import { timeAgo } from "helpers/date-time.helper";
 // types
-import { linkDetails, UserAuth } from "types";
+import { IUserLite, UserAuth } from "types";
 
 type Props = {
-  links: linkDetails[];
+  links: {
+    id: string;
+    created_at: Date;
+    created_by: string;
+    created_by_detail: IUserLite;
+    metadata: any;
+    title: string;
+    url: string;
+  }[];
   handleDeleteLink: (linkId: string) => void;
-  handleEditLink: (link: linkDetails) => void;
   userAuth: UserAuth;
 };
 
-export const LinksList: React.FC<Props> = ({
-  links,
-  handleDeleteLink,
-  handleEditLink,
-  userAuth,
-}) => {
+export const LinksList: React.FC<Props> = ({ links, handleDeleteLink, userAuth }) => {
   const isNotAllowed = userAuth.isGuest || userAuth.isViewer;
 
   return (
@@ -27,13 +28,6 @@ export const LinksList: React.FC<Props> = ({
         <div key={link.id} className="relative">
           {!isNotAllowed && (
             <div className="absolute top-1.5 right-1.5 z-[1] flex items-center gap-1">
-              <button
-                type="button"
-                className="grid h-7 w-7 place-items-center rounded bg-custom-background-90 p-1 outline-none hover:bg-custom-background-80"
-                onClick={() => handleEditLink(link)}
-              >
-                <Icon iconName="edit" className="text-custom-text-200" />
-              </button>
               <a
                 href={link.url}
                 target="_blank"
@@ -68,7 +62,7 @@ export const LinksList: React.FC<Props> = ({
                 by{" "}
                 {link.created_by_detail.is_bot
                   ? link.created_by_detail.first_name + " Bot"
-                  : link.created_by_detail.display_name}
+                  : link.created_by_detail.email}
               </p>
             </div>
           </a>

apps/app/components/core/sidebar/sidebar-progress-stats.tsx

@@ -133,10 +133,9 @@ export const SidebarProgressStats: React.FC<Props> = ({
                           avatar: assignee.avatar ?? "",
                           first_name: assignee.first_name ?? "",
                           last_name: assignee.last_name ?? "",
-                          display_name: assignee.display_name ?? "",
                         }}
                       />
-                      <span>{assignee.display_name}</span>
+                      <span>{assignee.first_name}</span>
                     </div>
                   }
                   completed={assignee.completed_issues}

apps/app/components/core/theme/color-picker-input.tsx

@@ -21,21 +21,13 @@ import { ICustomTheme } from "types";
 
 type Props = {
   name: keyof ICustomTheme;
-  position?: "left" | "right";
   watch: UseFormWatch<any>;
   setValue: UseFormSetValue<any>;
   error: FieldError | Merge<FieldError, FieldErrorsImpl<any>> | undefined;
   register: UseFormRegister<any>;
 };
 
-export const ColorPickerInput: React.FC<Props> = ({
-  name,
-  position = "left",
-  watch,
-  setValue,
-  error,
-  register,
-}) => {
+export const ColorPickerInput: React.FC<Props> = ({ name, watch, setValue, error, register }) => {
   const handleColorChange = (newColor: ColorResult) => {
     const { hex } = newColor;
     setValue(name, hex);
@@ -112,11 +104,7 @@ export const ColorPickerInput: React.FC<Props> = ({
                 leaveFrom="opacity-100 translate-y-0"
                 leaveTo="opacity-0 translate-y-1"
               >
-                <Popover.Panel
-                  className={`absolute bottom-8 z-20 mt-1 max-w-xs px-2 sm:px-0 ${
-                    position === "right" ? "left-0" : "right-0"
-                  }`}
-                >
+                <Popover.Panel className="absolute bottom-8 right-0 z-20 mt-1 max-w-xs px-2 sm:px-0">
                   <SketchPicker color={watch(name)} onChange={handleColorChange} />
                 </Popover.Panel>
               </Transition>

apps/app/components/core/theme/custom-theme-selector.tsx

@@ -4,15 +4,17 @@ import { useTheme } from "next-themes";
 
 import { useForm } from "react-hook-form";
 
+// hooks
+import useUser from "hooks/use-user";
 // ui
 import { PrimaryButton } from "components/ui";
 import { ColorPickerInput } from "components/core";
+// services
+import userService from "services/user.service";
+// helper
+import { applyTheme } from "helpers/theme.helper";
 // types
 import { ICustomTheme } from "types";
-// mobx react lite
-import { observer } from "mobx-react-lite";
-// mobx store
-import { useMobxStore } from "lib/mobx/store-provider";
 
 type Props = {
   preLoadedData?: Partial<ICustomTheme> | null;
@@ -26,14 +28,11 @@ const defaultValues: ICustomTheme = {
   sidebarText: "#c5c5c5",
   darkPalette: false,
   palette: "",
-  theme: "custom",
 };
 
-export const CustomThemeSelector: React.FC<Props> = observer(({ preLoadedData }) => {
-  const store: any = useMobxStore();
-  const { setTheme } = useTheme();
-
+export const CustomThemeSelector: React.FC<Props> = ({ preLoadedData }) => {
   const [darkPalette, setDarkPalette] = useState(false);
+
   const {
     register,
     formState: { errors, isSubmitting },
@@ -44,14 +43,11 @@ export const CustomThemeSelector: React.FC<Props> = observer(({ preLoadedData })
   } = useForm<ICustomTheme>({
     defaultValues,
   });
-  useEffect(() => {
-    reset({
-      ...defaultValues,
-      ...preLoadedData,
-    });
-  }, [preLoadedData, reset]);
 
-  const handleUpdateTheme = async (formData: any) => {
+  const { setTheme } = useTheme();
+  const { mutateUser } = useUser();
+
+  const handleFormSubmit = async (formData: ICustomTheme) => {
     const payload: ICustomTheme = {
       background: formData.background,
       text: formData.text,
@@ -60,17 +56,36 @@ export const CustomThemeSelector: React.FC<Props> = observer(({ preLoadedData })
       sidebarText: formData.sidebarText,
       darkPalette: darkPalette,
       palette: `${formData.background},${formData.text},${formData.primary},${formData.sidebarBackground},${formData.sidebarText}`,
-      theme: "custom",
     };
 
-    setTheme("custom");
+    await userService
+      .updateUser({
+        theme: payload,
+      })
+      .then((res) => {
+        mutateUser((prevData) => {
+          if (!prevData) return prevData;
 
-    return store.user
-      .updateCurrentUserSettings({ theme: payload })
-      .then((response: any) => response)
-      .catch((error: any) => error);
+          return { ...prevData, ...res };
+        }, false);
+
+        setTheme("custom");
+        applyTheme(payload.palette, darkPalette);
+      })
+      .catch((err) => console.log(err));
   };
 
+  const handleUpdateTheme = async (formData: any) => {
+    await handleFormSubmit({ ...formData, darkPalette });
+  };
+
+  useEffect(() => {
+    reset({
+      ...defaultValues,
+      ...preLoadedData,
+    });
+  }, [preLoadedData, reset]);
+
   return (
     <form onSubmit={handleSubmit(handleUpdateTheme)}>
       <div className="space-y-5">
@@ -83,7 +98,6 @@ export const CustomThemeSelector: React.FC<Props> = observer(({ preLoadedData })
               </h3>
               <ColorPickerInput
                 name="background"
-                position="right"
                 error={errors.background}
                 watch={watch}
                 setValue={setValue}
@@ -121,7 +135,6 @@ export const CustomThemeSelector: React.FC<Props> = observer(({ preLoadedData })
               </h3>
               <ColorPickerInput
                 name="sidebarBackground"
-                position="right"
                 error={errors.sidebarBackground}
                 watch={watch}
                 setValue={setValue}
@@ -151,4 +164,4 @@ export const CustomThemeSelector: React.FC<Props> = observer(({ preLoadedData })
       </div>
     </form>
   );
-});
+};

apps/app/components/core/theme/theme-switch.tsx

@@ -1,44 +1,43 @@
-// next-themes
+import { useState, useEffect, Dispatch, SetStateAction } from "react";
+
 import { useTheme } from "next-themes";
-// hooks
-import useUser from "hooks/use-user";
+
 // constants
 import { THEMES_OBJ } from "constants/themes";
 // ui
 import { CustomSelect } from "components/ui";
 // types
-import { ICustomTheme } from "types";
-import { unsetCustomCssVariables } from "helpers/theme.helper";
-// mobx react lite
-import { observer } from "mobx-react-lite";
-// mobx store
-import { useMobxStore } from "lib/mobx/store-provider";
+import { ICustomTheme, IUser } from "types";
 
 type Props = {
-  setPreLoadedData: React.Dispatch<React.SetStateAction<ICustomTheme | null>>;
+  user: IUser | undefined;
+  setPreLoadedData: Dispatch<SetStateAction<ICustomTheme | null>>;
   customThemeSelectorOptions: boolean;
-  setCustomThemeSelectorOptions: React.Dispatch<React.SetStateAction<boolean>>;
+  setCustomThemeSelectorOptions: Dispatch<SetStateAction<boolean>>;
 };
 
-export const ThemeSwitch: React.FC<Props> = observer(
-  ({ setPreLoadedData, customThemeSelectorOptions, setCustomThemeSelectorOptions }) => {
-    const store: any = useMobxStore();
+export const ThemeSwitch: React.FC<Props> = ({
+  user,
+  setPreLoadedData,
+  customThemeSelectorOptions,
+  setCustomThemeSelectorOptions,
+}) => {
+  const [mounted, setMounted] = useState(false);
+  const { theme, setTheme } = useTheme();
 
-    const { user, mutateUser } = useUser();
-    const { theme, setTheme } = useTheme();
+  // useEffect only runs on the client, so now we can safely show the UI
+  useEffect(() => {
+    setMounted(true);
+  }, []);
 
-    const updateUserTheme = (newTheme: string) => {
-      if (!user) return;
-      setTheme(newTheme);
-      return store.user
-        .updateCurrentUserSettings({ theme: { ...user.theme, theme: newTheme } })
-        .then((response: any) => response)
-        .catch((error: any) => error);
-    };
+  if (!mounted) {
+    return null;
+  }
 
-    const currentThemeObj = THEMES_OBJ.find((t) => t.value === theme);
+  const currentThemeObj = THEMES_OBJ.find((t) => t.value === theme);
 
-    return (
+  return (
+    <>
       <CustomSelect
         value={theme}
         label={
@@ -85,18 +84,26 @@ export const ThemeSwitch: React.FC<Props> = observer(
                   user.theme.palette !== ",,,,"
                     ? user.theme.palette
                     : "#0d101b,#c5c5c5,#3f76ff,#0d101b,#c5c5c5",
-                theme: "custom",
               });
             }
 
             if (!customThemeSelectorOptions) setCustomThemeSelectorOptions(true);
           } else {
             if (customThemeSelectorOptions) setCustomThemeSelectorOptions(false);
-            unsetCustomCssVariables();
+
+            for (let i = 10; i <= 900; i >= 100 ? (i += 100) : (i += 10)) {
+              document.documentElement.style.removeProperty(`--color-background-${i}`);
+              document.documentElement.style.removeProperty(`--color-text-${i}`);
+              document.documentElement.style.removeProperty(`--color-border-${i}`);
+              document.documentElement.style.removeProperty(`--color-primary-${i}`);
+              document.documentElement.style.removeProperty(`--color-sidebar-background-${i}`);
+              document.documentElement.style.removeProperty(`--color-sidebar-text-${i}`);
+              document.documentElement.style.removeProperty(`--color-sidebar-border-${i}`);
+            }
           }
 
-          updateUserTheme(value);
-          document.documentElement.style.setProperty("--color-scheme", type);
+          setTheme(value);
+          document.documentElement.style.setProperty("color-scheme", type);
         }}
         input
         width="w-full"
@@ -130,6 +137,6 @@ export const ThemeSwitch: React.FC<Props> = observer(
           </CustomSelect.Option>
         ))}
       </CustomSelect>
-    );
-  }
-);
+    </>
+  );
+};

apps/app/components/core/views/board-view/board-header.tsx

@@ -10,7 +10,7 @@ import projectService from "services/project.service";
 // hooks
 import useProjects from "hooks/use-projects";
 // component
-import { Avatar, Icon } from "components/ui";
+import { Avatar } from "components/ui";
 // icons
 import { ArrowsPointingInIcon, ArrowsPointingOutIcon, PlusIcon } from "@heroicons/react/24/outline";
 import { getPriorityIcon, getStateGroupIcon } from "components/icons";
@@ -81,7 +81,10 @@ export const BoardHeader: React.FC<Props> = ({
         break;
       case "created_by":
         const member = members?.find((member) => member.member.id === groupTitle)?.member;
-        title = member?.display_name ?? "";
+        title =
+          member?.first_name && member.first_name !== ""
+            ? `${member.first_name} ${member.last_name}`
+            : member?.email ?? "";
         break;
     }
 
@@ -140,22 +143,24 @@ export const BoardHeader: React.FC<Props> = ({
     >
       <div className={`flex items-center ${isCollapsed ? "gap-1" : "flex-col gap-2"}`}>
         <div
-          className={`flex cursor-pointer items-center gap-x-2 max-w-[316px] ${
+          className={`flex cursor-pointer items-center gap-x-3 max-w-[316px] ${
             !isCollapsed ? "mb-2 flex-col gap-y-2 py-2" : ""
           }`}
         >
           <span className="flex items-center">{getGroupIcon()}</span>
           <h2
-            className={`text-lg font-semibold truncate ${
-              selectedGroup === "created_by" ? "" : "capitalize"
-            }`}
+            className="text-lg font-semibold capitalize truncate"
             style={{
               writingMode: isCollapsed ? "horizontal-tb" : "vertical-rl",
             }}
           >
             {getGroupTitle()}
           </h2>
-          <span className={`${isCollapsed ? "ml-0.5" : ""} py-1 text-center text-sm`}>
+          <span
+            className={`${
+              isCollapsed ? "ml-0.5" : ""
+            } min-w-[2.5rem] rounded-full bg-custom-background-80 py-1 text-center text-xs`}
+          >
             {groupedIssues?.[groupTitle].length ?? 0}
           </span>
         </div>
@@ -170,12 +175,9 @@ export const BoardHeader: React.FC<Props> = ({
           }}
         >
           {isCollapsed ? (
-            <Icon
-              iconName="close_fullscreen"
-              className="text-base font-medium text-custom-text-900"
-            />
+            <ArrowsPointingInIcon className="h-4 w-4" />
           ) : (
-            <Icon iconName="open_in_full" className="text-base font-medium text-custom-text-900" />
+            <ArrowsPointingOutIcon className="h-4 w-4" />
           )}
         </button>
         {!disableUserActions && selectedGroup !== "created_by" && (

apps/app/components/core/views/board-view/single-issue.tsx

@@ -24,7 +24,6 @@ import {
   ViewEstimateSelect,
   ViewIssueLabel,
   ViewPrioritySelect,
-  ViewStartDateSelect,
   ViewStateSelect,
 } from "components/issues";
 // ui
@@ -88,7 +87,6 @@ export const SingleBoardIssue: React.FC<Props> = ({
   const [contextMenu, setContextMenu] = useState(false);
   const [contextMenuPosition, setContextMenuPosition] = useState({ x: 0, y: 0 });
   const [isMenuActive, setIsMenuActive] = useState(false);
-  const [isDropdownActive, setIsDropdownActive] = useState(false);
 
   const actionSectionRef = useRef<HTMLDivElement | null>(null);
 
@@ -126,7 +124,7 @@ export const SingleBoardIssue: React.FC<Props> = ({
         );
       } else {
         mutateIssues(
-          (prevData: any) =>
+          (prevData) =>
             handleIssuesMutation(
               formData,
               groupTitle ?? "",
@@ -233,7 +231,7 @@ export const SingleBoardIssue: React.FC<Props> = ({
         </a>
       </ContextMenu>
       <div
-        className={`mb-3 rounded bg-custom-background-100 shadow ${
+        className={`mb-3 rounded bg-custom-background-90 shadow ${
           snapshot.isDragging ? "border-2 border-custom-primary shadow-lg" : ""
         }`}
         ref={provided.innerRef}
@@ -246,7 +244,7 @@ export const SingleBoardIssue: React.FC<Props> = ({
           setContextMenuPosition({ x: e.pageX, y: e.pageY });
         }}
       >
-        <div className="flex flex-col justify-between gap-1.5 group/card relative select-none px-3.5 py-3 h-[118px]">
+        <div className="group/card relative select-none p-3.5">
           {!isNotAllowed && (
             <div
               ref={actionSectionRef}
@@ -296,20 +294,16 @@ export const SingleBoardIssue: React.FC<Props> = ({
             </div>
           )}
           <Link href={`/${workspaceSlug}/projects/${issue.project}/issues/${issue.id}`}>
-            <a className="flex flex-col gap-1.5">
+            <a>
               {properties.key && (
-                <div className="text-xs font-medium text-custom-text-200">
+                <div className="mb-2.5 text-xs font-medium text-custom-text-200">
                   {issue.project_detail.identifier}-{issue.sequence_id}
                 </div>
               )}
-              <h5 className="text-sm break-words line-clamp-2">{issue.name}</h5>
+              <h5 className="text-sm break-words line-clamp-3">{issue.name}</h5>
             </a>
           </Link>
-          <div
-            className={`flex items-center gap-2 text-xs ${
-              isDropdownActive ? "" : "overflow-x-scroll"
-            }`}
-          >
+          <div className="relative mt-2.5 flex flex-wrap items-center gap-2 text-xs">
             {properties.priority && (
               <ViewPrioritySelect
                 issue={issue}
@@ -328,22 +322,10 @@ export const SingleBoardIssue: React.FC<Props> = ({
                 selfPositioned
               />
             )}
-            {properties.start_date && issue.start_date && (
-              <ViewStartDateSelect
-                issue={issue}
-                partialUpdateIssue={partialUpdateIssue}
-                handleOnOpen={() => setIsDropdownActive(true)}
-                handleOnClose={() => setIsDropdownActive(false)}
-                user={user}
-                isNotAllowed={isNotAllowed}
-              />
-            )}
             {properties.due_date && issue.target_date && (
               <ViewDueDateSelect
                 issue={issue}
                 partialUpdateIssue={partialUpdateIssue}
-                handleOnOpen={() => setIsDropdownActive(true)}
-                handleOnClose={() => setIsDropdownActive(false)}
                 user={user}
                 isNotAllowed={isNotAllowed}
               />
@@ -356,7 +338,6 @@ export const SingleBoardIssue: React.FC<Props> = ({
                 issue={issue}
                 partialUpdateIssue={partialUpdateIssue}
                 isNotAllowed={isNotAllowed}
-                customButton
                 user={user}
                 selfPositioned
               />

apps/app/components/core/views/calendar-view/single-issue.tsx

@@ -21,7 +21,6 @@ import {
   ViewEstimateSelect,
   ViewLabelSelect,
   ViewPrioritySelect,
-  ViewStartDateSelect,
   ViewStateSelect,
 } from "components/issues";
 // icons
@@ -231,14 +230,7 @@ export const SingleCalendarIssue: React.FC<Props> = ({
                 user={user}
               />
             )}
-            {properties.start_date && issue.start_date && (
-              <ViewStartDateSelect
-                issue={issue}
-                partialUpdateIssue={partialUpdateIssue}
-                user={user}
-                isNotAllowed={isNotAllowed}
-              />
-            )}
+
             {properties.due_date && issue.target_date && (
               <ViewDueDateSelect
                 issue={issue}

apps/app/components/core/views/list-view/single-issue.tsx

@@ -16,7 +16,6 @@ import {
   ViewEstimateSelect,
   ViewIssueLabel,
   ViewPrioritySelect,
-  ViewStartDateSelect,
   ViewStateSelect,
 } from "components/issues";
 // ui
@@ -108,7 +107,7 @@ export const SingleListIssue: React.FC<Props> = ({
         );
       } else {
         mutateIssues(
-          (prevData: any) =>
+          (prevData) =>
             handleIssuesMutation(
               formData,
               groupTitle ?? "",
@@ -245,14 +244,6 @@ export const SingleListIssue: React.FC<Props> = ({
               isNotAllowed={isNotAllowed}
             />
           )}
-          {properties.start_date && issue.start_date && (
-            <ViewStartDateSelect
-              issue={issue}
-              partialUpdateIssue={partialUpdateIssue}
-              user={user}
-              isNotAllowed={isNotAllowed}
-            />
-          )}
           {properties.due_date && issue.target_date && (
             <ViewDueDateSelect
               issue={issue}

apps/app/components/core/views/list-view/single-list.tsx

@@ -96,7 +96,10 @@ export const SingleList: React.FC<Props> = ({
         break;
       case "created_by":
         const member = members?.find((member) => member.member.id === groupTitle)?.member;
-        title = member?.display_name ?? "";
+        title =
+          member?.first_name && member.first_name !== ""
+            ? `${member.first_name} ${member.last_name}`
+            : member?.email ?? "";
         break;
     }
 
@@ -160,11 +163,7 @@ export const SingleList: React.FC<Props> = ({
                   <div className="flex items-center">{getGroupIcon()}</div>
                 )}
                 {selectedGroup !== null ? (
-                  <h2
-                    className={`text-sm font-semibold leading-6 text-custom-text-100 ${
-                      selectedGroup === "created_by" ? "" : "capitalize"
-                    }`}
-                  >
+                  <h2 className="text-sm font-semibold capitalize leading-6 text-custom-text-100">
                     {getGroupTitle()}
                   </h2>
                 ) : (

apps/app/components/core/views/spreadsheet-view/single-issue.tsx

@@ -12,7 +12,6 @@ import {
   ViewEstimateSelect,
   ViewIssueLabel,
   ViewPrioritySelect,
-  ViewStartDateSelect,
   ViewStateSelect,
 } from "components/issues";
 import { Popover2 } from "@blueprintjs/popover2";
@@ -316,19 +315,6 @@ export const SingleSpreadsheetIssue: React.FC<Props> = ({
         </div>
       )}
 
-      {properties.start_date && (
-        <div className="flex items-center text-xs text-custom-text-200 text-center p-2 group-hover:bg-custom-background-80 border-custom-border-200">
-          <ViewStartDateSelect
-            issue={issue}
-            partialUpdateIssue={partialUpdateIssue}
-            tooltipPosition={tooltipPosition}
-            noBorder
-            user={user}
-            isNotAllowed={isNotAllowed}
-          />
-        </div>
-      )}
-
       {properties.due_date && (
         <div className="flex items-center text-xs text-custom-text-200 text-center p-2 group-hover:bg-custom-background-80 border-custom-border-200">
           <ViewDueDateSelect

apps/app/components/cycles/active-cycle-details.tsx

@@ -361,14 +361,14 @@ export const ActiveCycleDetails: React.FC = () => {
                       height={16}
                       width={16}
                       className="rounded-full"
-                      alt={cycle.owned_by.display_name}
+                      alt={cycle.owned_by.first_name}
                     />
                   ) : (
                     <span className="flex h-5 w-5 items-center justify-center rounded-full bg-custom-background-100 capitalize">
-                      {cycle.owned_by.display_name.charAt(0)}
+                      {cycle.owned_by.first_name.charAt(0)}
                     </span>
                   )}
-                  <span className="text-custom-text-200">{cycle.owned_by.display_name}</span>
+                  <span className="text-custom-text-200">{cycle.owned_by.first_name}</span>
                 </div>
 
                 {cycle.assignees.length > 0 && (

apps/app/components/cycles/active-cycle-stats.tsx

@@ -88,10 +88,9 @@ export const ActiveCycleProgressStats: React.FC<Props> = ({ cycle }) => {
                             avatar: assignee.avatar ?? "",
                             first_name: assignee.first_name ?? "",
                             last_name: assignee.last_name ?? "",
-                            display_name: assignee.display_name ?? "",
                           }}
                         />
-                        <span>{assignee.display_name}</span>
+                        <span>{assignee.first_name}</span>
                       </div>
                     }
                     completed={assignee.completed_issues}

apps/app/components/cycles/cycles-list-gantt-chart.tsx

@@ -1,28 +1,21 @@
 import { FC } from "react";
-
+// next imports
+import Link from "next/link";
 import { useRouter } from "next/router";
-
-import { KeyedMutator } from "swr";
-
-// services
-import cyclesService from "services/cycles.service";
-// hooks
-import useUser from "hooks/use-user";
 // components
-import { CycleGanttBlock, GanttChartRoot, IBlockUpdateData } from "components/gantt-chart";
+import { GanttChartRoot } from "components/gantt-chart";
+// ui
+import { Tooltip } from "components/ui";
 // types
 import { ICycle } from "types";
 
 type Props = {
   cycles: ICycle[];
-  mutateCycles: KeyedMutator<ICycle[]>;
 };
 
-export const CyclesListGanttChartView: FC<Props> = ({ cycles, mutateCycles }) => {
+export const CyclesListGanttChartView: FC<Props> = ({ cycles }) => {
   const router = useRouter();
-  const { workspaceSlug } = router.query;
-
-  const { user } = useUser();
+  const { workspaceSlug, projectId } = router.query;
 
   // rendering issues on gantt sidebar
   const GanttSidebarBlockView = ({ data }: any) => (
@@ -35,63 +28,53 @@ export const CyclesListGanttChartView: FC<Props> = ({ cycles, mutateCycles }) =>
     </div>
   );
 
-  const handleCycleUpdate = (cycle: ICycle, payload: IBlockUpdateData) => {
-    if (!workspaceSlug || !user) return;
+  // rendering issues on gantt card
+  const GanttBlockView = ({ data }: { data: ICycle }) => (
+    <Link href={`/${workspaceSlug}/projects/${projectId}/cycles/${data?.id}`}>
+      <a className="relative flex items-center w-full h-full overflow-hidden shadow-sm">
+        <div
+          className="flex-shrink-0 w-[4px] h-full"
+          style={{ backgroundColor: "rgb(var(--color-primary-100))" }}
+        />
+        <Tooltip tooltipContent={data?.name} className={`z-[999999]`}>
+          <div className="text-custom-text-100 text-[15px] whitespace-nowrap py-[4px] px-2.5 overflow-hidden w-full">
+            {data?.name}
+          </div>
+        </Tooltip>
+      </a>
+    </Link>
+  );
 
-    mutateCycles((prevData: any) => {
-      if (!prevData) return prevData;
-
-      const newList = prevData.map((p: any) => ({
-        ...p,
-        ...(p.id === cycle.id
-          ? {
-              start_date: payload.start_date ? payload.start_date : p.start_date,
-              target_date: payload.target_date ? payload.target_date : p.end_date,
-              sort_order: payload.sort_order ? payload.sort_order.newSortOrder : p.sort_order,
-            }
-          : {}),
-      }));
-
-      if (payload.sort_order) {
-        const removedElement = newList.splice(payload.sort_order.sourceIndex, 1)[0];
-        newList.splice(payload.sort_order.destinationIndex, 0, removedElement);
-      }
-
-      return newList;
-    }, false);
-
-    const newPayload: any = { ...payload };
-
-    if (newPayload.sort_order && payload.sort_order)
-      newPayload.sort_order = payload.sort_order.newSortOrder;
-
-    cyclesService.patchCycle(workspaceSlug.toString(), cycle.project, cycle.id, newPayload, user);
+  // handle gantt issue start date and target date
+  const handleUpdateDates = async (data: any) => {
+    const payload = {
+      id: data?.id,
+      start_date: data?.start_date,
+      target_date: data?.target_date,
+    };
   };
 
-  const blockFormat = (blocks: ICycle[]) =>
+  const blockFormat = (blocks: any) =>
     blocks && blocks.length > 0
-      ? blocks
-          .filter((b) => b.start_date && b.end_date)
-          .map((block) => ({
-            data: block,
-            id: block.id,
-            sort_order: block.sort_order,
-            start_date: new Date(block.start_date ?? ""),
-            target_date: new Date(block.end_date ?? ""),
-          }))
+      ? blocks.map((_block: any) => {
+          if (_block?.start_date && _block.target_date) console.log("_block", _block);
+          return {
+            start_date: new Date(_block.created_at),
+            target_date: new Date(_block.updated_at),
+            data: _block,
+          };
+        })
       : [];
 
   return (
     <div className="w-full h-full overflow-y-auto">
       <GanttChartRoot
-        title="Cycles"
+        title={"Cycles"}
         loaderTitle="Cycles"
         blocks={cycles ? blockFormat(cycles) : null}
-        blockUpdateHandler={(block, payload) => handleCycleUpdate(block, payload)}
+        blockUpdateHandler={handleUpdateDates}
         sidebarBlockRender={(data: any) => <GanttSidebarBlockView data={data} />}
-        blockRender={(data: any) => <CycleGanttBlock cycle={data as ICycle} />}
-        enableLeftDrag={false}
-        enableRightDrag={false}
+        blockRender={(data: any) => <GanttBlockView data={data} />}
       />
     </div>
   );

apps/app/components/cycles/cycles-list/all-cycles-list.tsx

@@ -17,7 +17,7 @@ export const AllCyclesList: React.FC<Props> = ({ viewType }) => {
   const router = useRouter();
   const { workspaceSlug, projectId } = router.query;
 
-  const { data: allCyclesList, mutate } = useSWR(
+  const { data: allCyclesList } = useSWR(
     workspaceSlug && projectId ? CYCLES_LIST(projectId.toString()) : null,
     workspaceSlug && projectId
       ? () =>
@@ -25,5 +25,5 @@ export const AllCyclesList: React.FC<Props> = ({ viewType }) => {
       : null
   );
 
-  return <CyclesView cycles={allCyclesList} mutateCycles={mutate} viewType={viewType} />;
+  return <CyclesView cycles={allCyclesList} viewType={viewType} />;
 };

apps/app/components/cycles/cycles-list/completed-cycles-list.tsx

@@ -17,7 +17,7 @@ export const CompletedCyclesList: React.FC<Props> = ({ viewType }) => {
   const router = useRouter();
   const { workspaceSlug, projectId } = router.query;
 
-  const { data: completedCyclesList, mutate } = useSWR(
+  const { data: completedCyclesList } = useSWR(
     workspaceSlug && projectId ? COMPLETED_CYCLES_LIST(projectId.toString()) : null,
     workspaceSlug && projectId
       ? () =>
@@ -29,5 +29,5 @@ export const CompletedCyclesList: React.FC<Props> = ({ viewType }) => {
       : null
   );
 
-  return <CyclesView cycles={completedCyclesList} mutateCycles={mutate} viewType={viewType} />;
+  return <CyclesView cycles={completedCyclesList} viewType={viewType} />;
 };

apps/app/components/cycles/cycles-list/draft-cycles-list.tsx

@@ -17,7 +17,7 @@ export const DraftCyclesList: React.FC<Props> = ({ viewType }) => {
   const router = useRouter();
   const { workspaceSlug, projectId } = router.query;
 
-  const { data: draftCyclesList, mutate } = useSWR(
+  const { data: draftCyclesList } = useSWR(
     workspaceSlug && projectId ? DRAFT_CYCLES_LIST(projectId.toString()) : null,
     workspaceSlug && projectId
       ? () =>
@@ -25,5 +25,5 @@ export const DraftCyclesList: React.FC<Props> = ({ viewType }) => {
       : null
   );
 
-  return <CyclesView cycles={draftCyclesList} mutateCycles={mutate} viewType={viewType} />;
+  return <CyclesView cycles={draftCyclesList} viewType={viewType} />;
 };

apps/app/components/cycles/cycles-list/upcoming-cycles-list.tsx

@@ -17,7 +17,7 @@ export const UpcomingCyclesList: React.FC<Props> = ({ viewType }) => {
   const router = useRouter();
   const { workspaceSlug, projectId } = router.query;
 
-  const { data: upcomingCyclesList, mutate } = useSWR(
+  const { data: upcomingCyclesList } = useSWR(
     workspaceSlug && projectId ? UPCOMING_CYCLES_LIST(projectId.toString()) : null,
     workspaceSlug && projectId
       ? () =>
@@ -29,5 +29,5 @@ export const UpcomingCyclesList: React.FC<Props> = ({ viewType }) => {
       : null
   );
 
-  return <CyclesView cycles={upcomingCyclesList} mutateCycles={mutate} viewType={viewType} />;
+  return <CyclesView cycles={upcomingCyclesList} viewType={viewType} />;
 };

apps/app/components/cycles/cycles-view.tsx

@@ -2,7 +2,7 @@ import React, { useState } from "react";
 
 import { useRouter } from "next/router";
 
-import { KeyedMutator, mutate } from "swr";
+import { mutate } from "swr";
 
 // services
 import cyclesService from "services/cycles.service";
@@ -35,11 +35,10 @@ import {
 
 type Props = {
   cycles: ICycle[] | undefined;
-  mutateCycles: KeyedMutator<ICycle[]>;
   viewType: string | null;
 };
 
-export const CyclesView: React.FC<Props> = ({ cycles, mutateCycles, viewType }) => {
+export const CyclesView: React.FC<Props> = ({ cycles, viewType }) => {
   const [createUpdateCycleModal, setCreateUpdateCycleModal] = useState(false);
   const [selectedCycleToUpdate, setSelectedCycleToUpdate] = useState<ICycle | null>(null);
 
@@ -203,7 +202,7 @@ export const CyclesView: React.FC<Props> = ({ cycles, mutateCycles, viewType })
               ))}
             </div>
           ) : (
-            <CyclesListGanttChartView cycles={cycles ?? []} mutateCycles={mutateCycles} />
+            <CyclesListGanttChartView cycles={cycles ?? []} />
           )
         ) : (
           <div className="h-full grid place-items-center text-center">