dev: serializer updates for workspace, project, inbox etc.

Dockerfile

@@ -5,11 +5,9 @@ WORKDIR /app
 ENV NEXT_PUBLIC_API_BASE_URL=http://NEXT_PUBLIC_API_BASE_URL_PLACEHOLDER
 
 RUN yarn global add turbo
-RUN apk add tree
 COPY . .
 
-RUN turbo prune --scope=app --scope=plane-deploy --docker
-CMD tree -I node_modules/
+RUN turbo prune --scope=app --docker
 
 # Add lockfile and package.json's of isolated subworkspace
 FROM node:18-alpine AS installer
@@ -23,14 +21,14 @@ COPY --from=builder /app/out/json/ .
 COPY --from=builder /app/out/yarn.lock ./yarn.lock
 RUN yarn install
 
-# # Build the project
+# Build the project
 COPY --from=builder /app/out/full/ .
 COPY turbo.json turbo.json
 COPY replace-env-vars.sh /usr/local/bin/
 USER root
 RUN chmod +x /usr/local/bin/replace-env-vars.sh
 
-RUN yarn turbo run build
+RUN yarn turbo run build --filter=app
 
 ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
     BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
@@ -98,16 +96,11 @@ RUN adduser --system --uid 1001 captain
 
 COPY --from=installer /app/apps/app/next.config.js .
 COPY --from=installer /app/apps/app/package.json .
-COPY --from=installer /app/apps/space/next.config.js .
-COPY --from=installer /app/apps/space/package.json .
 
 COPY --from=installer --chown=captain:plane /app/apps/app/.next/standalone ./
 
 COPY --from=installer --chown=captain:plane /app/apps/app/.next/static ./apps/app/.next/static
 
-COPY --from=installer --chown=captain:plane /app/apps/space/.next/standalone ./
-COPY --from=installer --chown=captain:plane /app/apps/space/.next ./apps/space/.next
-
 ENV NEXT_TELEMETRY_DISABLED 1
 
 # RUN rm /etc/nginx/conf.d/default.conf

apiserver/plane/api/serializers/__init__.py

@@ -1,13 +1,11 @@
 from .base import BaseSerializer
-from .user import UserSerializer, UserLiteSerializer, ChangePasswordSerializer, ResetPasswordSerializer, UserAdminLiteSerializer
+from .user import UserSerializer, ChangePasswordSerializer, ResetPasswordSerializer
 from .workspace import (
     WorkSpaceSerializer,
     WorkSpaceMemberSerializer,
     TeamSerializer,
     WorkSpaceMemberInviteSerializer,
-    WorkspaceLiteSerializer,
     WorkspaceThemeSerializer,
-    WorkspaceMemberAdminSerializer,
 )
 from .project import (
     ProjectSerializer,
@@ -16,12 +14,11 @@ from .project import (
     ProjectMemberInviteSerializer,
     ProjectIdentifierSerializer,
     ProjectFavoriteSerializer,
-    ProjectLiteSerializer,
     ProjectMemberLiteSerializer,
     ProjectDeployBoardSerializer,
     ProjectMemberAdminSerializer,
 )
-from .state import StateSerializer, StateLiteSerializer
+from .state import StateSerializer
 from .view import IssueViewSerializer, IssueViewFavoriteSerializer
 from .cycle import CycleSerializer, CycleIssueSerializer, CycleFavoriteSerializer, CycleWriteSerializer
 from .asset import FileAssetSerializer
@@ -32,7 +29,7 @@ from .issue import (
     IssuePropertySerializer,
     BlockerIssueSerializer,
     BlockedIssueSerializer,
-    IssueAssigneeSerializer,
+    # IssueAssigneeSerializer,
     LabelSerializer,
     IssueSerializer,
     IssueFlatSerializer,
@@ -73,7 +70,6 @@ from .page import PageSerializer, PageBlockSerializer, PageFavoriteSerializer
 from .estimate import (
     EstimateSerializer,
     EstimatePointSerializer,
-    EstimateReadSerializer,
 )
 
 from .inbox import InboxSerializer, InboxIssueSerializer, IssueStateInboxSerializer

apiserver/plane/api/serializers/base.py

@@ -1,5 +1,33 @@
 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,26 +6,21 @@ from rest_framework import serializers
 
 # Module imports
 from .base import BaseSerializer
-from .user import UserLiteSerializer
+from .user import UserSerializer
 from .issue import IssueStateSerializer
-from .workspace import WorkspaceLiteSerializer
-from .project import ProjectLiteSerializer
+from .workspace import WorkSpaceSerializer
+from .project import ProjectSerializer
 from plane.db.models import Cycle, CycleIssue, CycleFavorite
 
 class CycleWriteSerializer(BaseSerializer):
 
-    def validate(self, data):
-        if data.get("start_date", None) is not None and data.get("end_date", None) is not None and data.get("start_date", None) > data.get("end_date", None):
-            raise serializers.ValidationError("Start date cannot exceed end date")
-        return data
-
     class Meta:
         model = Cycle
         fields = "__all__"
 
 
 class CycleSerializer(BaseSerializer):
-    owned_by = UserLiteSerializer(read_only=True)
+    owned_by = UserSerializer(read_only=True)
     is_favorite = serializers.BooleanField(read_only=True)
     total_issues = serializers.IntegerField(read_only=True)
     cancelled_issues = serializers.IntegerField(read_only=True)
@@ -38,14 +33,9 @@ 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 = WorkspaceLiteSerializer(read_only=True, source="workspace")
-    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    workspace_detail =  WorkSpaceSerializer(source="workspace",read_only=True) 
+    project_detail = ProjectSerializer(read_only=True, source="project")
 
-    def validate(self, data):
-        if data.get("start_date", None) is not None and data.get("end_date", None) is not None and data.get("start_date", None) > data.get("end_date", None):
-            raise serializers.ValidationError("Start date cannot exceed end date")
-        return data
-    
     def get_assignees(self, obj):
         members = [
             {
@@ -64,7 +54,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 WorkspaceLiteSerializer, ProjectLiteSerializer
+from plane.api.serializers import WorkSpaceSerializer, ProjectSerializer
 
 
 class EstimateSerializer(BaseSerializer):
-    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
-    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    workspace_detail = WorkSpaceSerializer(source="workspace", read_only=True)
+    project_detail = ProjectSerializer(read_only=True, source="project")
 
     class Meta:
         model = Estimate
@@ -27,18 +27,3 @@ 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,11 +1,11 @@
 # Module imports
 from .base import BaseSerializer
 from plane.db.models import ExporterHistory
-from .user import UserLiteSerializer
+from .user import UserSerializer
 
 
 class ExporterHistorySerializer(BaseSerializer):
-    initiated_by_detail = UserLiteSerializer(source="initiated_by", read_only=True)
+    initiated_by_detail = UserSerializer(source="initiated_by",read_only=True)
 
     class Meta:
         model = ExporterHistory

apiserver/plane/api/serializers/importer.py

@@ -1,15 +1,15 @@
 # Module imports
 from .base import BaseSerializer
-from .user import UserLiteSerializer
-from .project import ProjectLiteSerializer
-from .workspace import WorkspaceLiteSerializer
+from .user import UserSerializer
+from .project import ProjectSerializer
+from .workspace import WorkSpaceSerializer
 from plane.db.models import Importer
 
 
 class ImporterSerializer(BaseSerializer):
-    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)
+    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)
 
     class Meta:
         model = Importer

apiserver/plane/api/serializers/inbox.py

@@ -4,15 +4,14 @@ from rest_framework import serializers
 # Module imports
 from .base import BaseSerializer
 from .issue import IssueFlatSerializer, LabelLiteSerializer
-from .project import ProjectLiteSerializer
+from .project import ProjectSerializer
 from .state import StateLiteSerializer
-from .project import ProjectLiteSerializer
-from .user import UserLiteSerializer
+from .user import UserSerializer
 from plane.db.models import Inbox, InboxIssue, Issue
 
 
 class InboxSerializer(BaseSerializer):
-    project_detail = ProjectLiteSerializer(source="project", read_only=True)
+    project_detail = ProjectSerializer(source="project", fields=("id","name","cover_image","icon_prop","emoji","description"), read_only=True)
     pending_issue_count = serializers.IntegerField(read_only=True)
 
     class Meta:
@@ -26,7 +25,7 @@ class InboxSerializer(BaseSerializer):
 
 class InboxIssueSerializer(BaseSerializer):
     issue_detail = IssueFlatSerializer(source="issue", read_only=True)
-    project_detail = ProjectLiteSerializer(source="project", read_only=True)
+    project_detail = ProjectSerializer(source="project", fields=("id","name","cover_image","icon_prop","emoji","description"), read_only=True)
 
     class Meta:
         model = InboxIssue
@@ -46,9 +45,9 @@ class InboxIssueLiteSerializer(BaseSerializer):
 
 class IssueStateInboxSerializer(BaseSerializer):
     state_detail = StateLiteSerializer(read_only=True, source="state")
-    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    project_detail = ProjectSerializer(source="project", fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
     label_details = LabelLiteSerializer(read_only=True, source="labels", many=True)
-    assignee_details = UserLiteSerializer(read_only=True, source="assignees", many=True)
+    assignee_details = UserSerializer(source="assignees", read_only=True, 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,11 +6,10 @@ from rest_framework import serializers
 
 # Module imports
 from .base import BaseSerializer
-from .user import UserLiteSerializer
+from .user import UserSerializer
 from .state import StateSerializer, StateLiteSerializer
-from .user import UserLiteSerializer
-from .project import ProjectSerializer, ProjectLiteSerializer
-from .workspace import WorkspaceLiteSerializer
+from .project import ProjectSerializer
+from .workspace import WorkSpaceSerializer
 from plane.db.models import (
     User,
     Issue,
@@ -54,7 +53,11 @@ class IssueFlatSerializer(BaseSerializer):
 
 
 class IssueProjectLiteSerializer(BaseSerializer):
-    project_detail = ProjectLiteSerializer(source="project", read_only=True)
+    project_detail = ProjectSerializer(
+        source="project",
+        fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"),
+        read_only=True,
+    )
 
     class Meta:
         model = Issue
@@ -71,9 +74,12 @@ class IssueProjectLiteSerializer(BaseSerializer):
 ## Find a better approach to save manytomany?
 class IssueCreateSerializer(BaseSerializer):
     state_detail = StateSerializer(read_only=True, source="state")
-    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")
+    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)
 
     assignees_list = serializers.ListField(
         child=serializers.PrimaryKeyRelatedField(queryset=User.objects.all()),
@@ -113,7 +119,11 @@ class IssueCreateSerializer(BaseSerializer):
         ]
 
     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):
+        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
 
@@ -296,35 +306,19 @@ class IssueCreateSerializer(BaseSerializer):
 
 
 class IssueActivitySerializer(BaseSerializer):
-    actor_detail = UserLiteSerializer(read_only=True, source="actor")
+    actor_detail = UserSerializer(source="actor", read_only=True)
     issue_detail = IssueFlatSerializer(read_only=True, source="issue")
-    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    project_detail = ProjectSerializer(
+        source="project",
+        fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"),
+        read_only=True,
+    )
 
     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
@@ -337,8 +331,14 @@ class IssuePropertySerializer(BaseSerializer):
 
 
 class LabelSerializer(BaseSerializer):
-    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
-    project_detail = ProjectLiteSerializer(source="project", read_only=True)
+    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,
+    )
 
     class Meta:
         model = Label
@@ -399,12 +399,16 @@ class BlockerIssueSerializer(BaseSerializer):
         read_only_fields = fields
 
 
-class IssueAssigneeSerializer(BaseSerializer):
-    assignee_details = UserLiteSerializer(read_only=True, source="assignee")
+# class IssueAssigneeSerializer(BaseSerializer):
+#     assignee_details = UserSerializer(
+#         source="assignee",
+#         fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+#         read_only=True,
+#     )
 
-    class Meta:
-        model = IssueAssignee
-        fields = "__all__"
+#     class Meta:
+#         model = IssueAssignee
+#         fields = "__all__"
 
 
 class CycleBaseSerializer(BaseSerializer):
@@ -468,7 +472,11 @@ class IssueModuleDetailSerializer(BaseSerializer):
 
 
 class IssueLinkSerializer(BaseSerializer):
-    created_by_detail = UserLiteSerializer(read_only=True, source="created_by")
+    created_by_detail = UserSerializer(
+        source="created_by",
+        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+    )
 
     class Meta:
         model = IssueLink
@@ -522,7 +530,11 @@ class IssueReactionSerializer(BaseSerializer):
 
 
 class IssueReactionLiteSerializer(BaseSerializer):
-    actor_detail = UserLiteSerializer(read_only=True, source="actor")
+    actor_detail = UserSerializer(
+        source="actor",
+        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+    )
 
     class Meta:
         model = IssueReaction
@@ -535,7 +547,11 @@ class IssueReactionLiteSerializer(BaseSerializer):
 
 
 class CommentReactionLiteSerializer(BaseSerializer):
-    actor_detail = UserLiteSerializer(read_only=True, source="actor")
+    actor_detail = UserSerializer(
+        source="actor",
+        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+    )
 
     class Meta:
         model = CommentReaction
@@ -554,9 +570,7 @@ 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"]
@@ -564,12 +578,20 @@ class IssueVoteSerializer(BaseSerializer):
 
 
 class IssueCommentSerializer(BaseSerializer):
-    actor_detail = UserLiteSerializer(read_only=True, source="actor")
+    actor_detail = UserSerializer(source="actor", read_only=True)
     issue_detail = IssueFlatSerializer(read_only=True, source="issue")
-    project_detail = ProjectLiteSerializer(read_only=True, source="project")
-    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
-    comment_reactions = CommentReactionLiteSerializer(read_only=True, many=True)
+    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,
+    )
+    comment_reactions = CommentReactionLiteSerializer(read_only=True, many=True)
 
     class Meta:
         model = IssueComment
@@ -588,7 +610,11 @@ class IssueCommentSerializer(BaseSerializer):
 
 class IssueStateFlatSerializer(BaseSerializer):
     state_detail = StateLiteSerializer(read_only=True, source="state")
-    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    project_detail = ProjectSerializer(
+        source="project",
+        fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"),
+        read_only=True,
+    )
 
     class Meta:
         model = Issue
@@ -605,8 +631,17 @@ 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 = ProjectLiteSerializer(read_only=True, source="project")
-    assignee_details = UserLiteSerializer(read_only=True, source="assignees", many=True)
+    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,
+    )
     sub_issues_count = serializers.IntegerField(read_only=True)
     bridge_id = serializers.UUIDField(read_only=True)
     attachment_count = serializers.IntegerField(read_only=True)
@@ -618,11 +653,20 @@ class IssueStateSerializer(BaseSerializer):
 
 
 class IssueSerializer(BaseSerializer):
-    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    project_detail = ProjectSerializer(
+        source="project",
+        fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"),
+        read_only=True,
+    )
     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 = UserLiteSerializer(read_only=True, source="assignees", many=True)
+    assignee_details = UserSerializer(
+        source="assignees",
+        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+        many=True,
+    )
     # List of issues blocked by this issue
     blocked_issues = BlockedIssueSerializer(read_only=True, many=True)
     # List of issues that block this issue
@@ -648,11 +692,24 @@ class IssueSerializer(BaseSerializer):
 
 
 class IssueLiteSerializer(BaseSerializer):
-    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
-    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    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,
+    )
     state_detail = StateLiteSerializer(read_only=True, source="state")
     label_details = LabelLiteSerializer(read_only=True, source="labels", many=True)
-    assignee_details = UserLiteSerializer(read_only=True, source="assignees", many=True)
+    assignee_details = UserSerializer(
+        source="assignees",
+        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+        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 UserLiteSerializer
-from .project import ProjectSerializer, ProjectLiteSerializer
-from .workspace import WorkspaceLiteSerializer
+from .user import UserSerializer
+from .project import ProjectSerializer
+from .workspace import WorkSpaceSerializer
 from .issue import IssueStateSerializer
 
 from plane.db.models import (
@@ -25,8 +25,12 @@ class ModuleWriteSerializer(BaseSerializer):
         required=False,
     )
 
-    project_detail = ProjectLiteSerializer(source="project", read_only=True)
-    workspace_detail = WorkspaceLiteSerializer(source="workspace", 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,
+    ) 
 
     class Meta:
         model = Module
@@ -40,11 +44,6 @@ class ModuleWriteSerializer(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):
         members = validated_data.pop("members_list", None)
 
@@ -111,7 +110,7 @@ class ModuleFlatSerializer(BaseSerializer):
 
 class ModuleIssueSerializer(BaseSerializer):
     module_detail = ModuleFlatSerializer(read_only=True, source="module")
-    issue_detail = ProjectLiteSerializer(read_only=True, source="issue")
+    issue_detail = ProjectSerializer(source="issue", fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
     sub_issues_count = serializers.IntegerField(read_only=True)
 
     class Meta:
@@ -129,7 +128,11 @@ class ModuleIssueSerializer(BaseSerializer):
 
 
 class ModuleLinkSerializer(BaseSerializer):
-    created_by_detail = UserLiteSerializer(read_only=True, source="created_by")
+    created_by_detail = UserSerializer(
+        source="created_by",
+        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+    )
 
     class Meta:
         model = ModuleLink
@@ -156,9 +159,18 @@ class ModuleLinkSerializer(BaseSerializer):
 
 
 class ModuleSerializer(BaseSerializer):
-    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")
+    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,
+    )
     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,12 +1,16 @@
 # Module imports
 from .base import BaseSerializer
-from .user import UserLiteSerializer
+from .user import UserSerializer
 from plane.db.models import Notification
 
+
 class NotificationSerializer(BaseSerializer):
-    triggered_by_details = UserLiteSerializer(read_only=True, source="triggered_by")
+    triggered_by_details = UserSerializer(
+        source="triggered_by",
+        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+    )
 
     class Meta:
         model = Notification
         fields = "__all__"
-

apiserver/plane/api/serializers/page.py

@@ -4,15 +4,19 @@ from rest_framework import serializers
 # Module imports
 from .base import BaseSerializer
 from .issue import IssueFlatSerializer, LabelLiteSerializer
-from .workspace import WorkspaceLiteSerializer
-from .project import ProjectLiteSerializer
+from .workspace import WorkSpaceSerializer
+from .project import ProjectSerializer
 from plane.db.models import Page, PageBlock, PageFavorite, PageLabel, Label
 
 
 class PageBlockSerializer(BaseSerializer):
     issue_detail = IssueFlatSerializer(source="issue", read_only=True)
-    project_detail = ProjectLiteSerializer(source="project", read_only=True)
-    workspace_detail = WorkspaceLiteSerializer(source="workspace", 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,
+    ) 
 
     class Meta:
         model = PageBlock
@@ -39,8 +43,12 @@ class PageSerializer(BaseSerializer):
         required=False,
     )
     blocks = PageBlockLiteSerializer(read_only=True, many=True)
-    project_detail = ProjectLiteSerializer(source="project", read_only=True)
-    workspace_detail = WorkspaceLiteSerializer(source="workspace", 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,
+    ) 
 
     class Meta:
         model = Page

apiserver/plane/api/serializers/project.py

@@ -6,8 +6,8 @@ from rest_framework import serializers
 
 # Module imports
 from .base import BaseSerializer
-from plane.api.serializers.workspace import WorkSpaceSerializer, WorkspaceLiteSerializer
-from plane.api.serializers.user import UserLiteSerializer, UserAdminLiteSerializer
+from plane.api.serializers.workspace import WorkSpaceSerializer
+from plane.api.serializers.user import UserSerializer
 from plane.db.models import (
     Project,
     ProjectMember,
@@ -19,7 +19,28 @@ from plane.db.models import (
 
 
 class ProjectSerializer(BaseSerializer):
-    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
+    # 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,
+    ) 
 
     class Meta:
         model = Project
@@ -78,25 +99,16 @@ class ProjectSerializer(BaseSerializer):
         raise serializers.ValidationError(detail="Project Identifier is already taken")
 
 
-class ProjectLiteSerializer(BaseSerializer):
-    class Meta:
-        model = Project
-        fields = [
-            "id",
-            "identifier",
-            "name",
-            "cover_image",
-            "icon_prop",
-            "emoji",
-            "description",
-        ]
-        read_only_fields = fields
-
-
 class ProjectDetailSerializer(BaseSerializer):
     workspace = WorkSpaceSerializer(read_only=True)
-    default_assignee = UserLiteSerializer(read_only=True)
-    project_lead = UserLiteSerializer(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)
@@ -113,8 +125,11 @@ class ProjectDetailSerializer(BaseSerializer):
 
 class ProjectMemberSerializer(BaseSerializer):
     workspace = WorkSpaceSerializer(read_only=True)
-    project = ProjectLiteSerializer(read_only=True)
-    member = UserLiteSerializer(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
@@ -122,9 +137,24 @@ class ProjectMemberSerializer(BaseSerializer):
 
 
 class ProjectMemberAdminSerializer(BaseSerializer):
-    workspace = WorkspaceLiteSerializer(read_only=True)
-    project = ProjectLiteSerializer(read_only=True)
-    member = UserAdminLiteSerializer(read_only=True)
+    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,
+    )
 
     class Meta:
         model = ProjectMember
@@ -132,8 +162,11 @@ class ProjectMemberAdminSerializer(BaseSerializer):
 
 
 class ProjectMemberInviteSerializer(BaseSerializer):
-    project = ProjectLiteSerializer(read_only=True)
-    workspace = WorkspaceLiteSerializer(read_only=True)
+    project = ProjectSerializer(fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
+    workspace = WorkSpaceSerializer(
+        fields=("id", "name", "slug"),
+        read_only=True,
+    ) 
 
     class Meta:
         model = ProjectMemberInvite
@@ -147,7 +180,7 @@ class ProjectIdentifierSerializer(BaseSerializer):
 
 
 class ProjectFavoriteSerializer(BaseSerializer):
-    project_detail = ProjectLiteSerializer(source="project", read_only=True)
+    project_detail = ProjectSerializer(source="project", fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
 
     class Meta:
         model = ProjectFavorite
@@ -159,7 +192,10 @@ class ProjectFavoriteSerializer(BaseSerializer):
 
 
 class ProjectMemberLiteSerializer(BaseSerializer):
-    member = UserLiteSerializer(read_only=True)
+    member = UserSerializer(
+        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+    )
     is_subscribed = serializers.BooleanField(read_only=True)
 
     class Meta:
@@ -169,8 +205,12 @@ class ProjectMemberLiteSerializer(BaseSerializer):
 
 
 class ProjectDeployBoardSerializer(BaseSerializer):
-    project_details = ProjectLiteSerializer(read_only=True, source="project")
-    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
+    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

apiserver/plane/api/serializers/state.py

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

apiserver/plane/api/serializers/user.py

@@ -33,42 +33,6 @@ class UserSerializer(BaseSerializer):
             return bool(obj.first_name) or bool(obj.last_name)
 
 
-class UserLiteSerializer(BaseSerializer):
-    class Meta:
-        model = User
-        fields = [
-            "id",
-            "first_name",
-            "last_name",
-            "avatar",
-            "is_bot",
-            "display_name",
-        ]
-        read_only_fields = [
-            "id",
-            "is_bot",
-        ]
-
-
-class UserAdminLiteSerializer(BaseSerializer):
-
-    class Meta:
-        model = User
-        fields = [
-            "id",
-            "first_name",
-            "last_name",
-            "avatar",
-            "is_bot",
-            "display_name",
-            "email",
-        ]
-        read_only_fields = [
-            "id",
-            "is_bot",
-        ]
-
-
 class ChangePasswordSerializer(serializers.Serializer):
     model = User
 

apiserver/plane/api/serializers/view.py

@@ -3,16 +3,20 @@ from rest_framework import serializers
 
 # Module imports
 from .base import BaseSerializer
-from .workspace import WorkspaceLiteSerializer
-from .project import ProjectLiteSerializer
+from .workspace import WorkSpaceSerializer
+from .project import ProjectSerializer
 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 = ProjectLiteSerializer(source="project", read_only=True)
-    workspace_detail = WorkspaceLiteSerializer(source="workspace", 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,
+    ) 
 
     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 UserLiteSerializer, UserAdminLiteSerializer
+from .user import UserSerializer
 
 from plane.db.models import (
     User,
@@ -17,7 +17,10 @@ from plane.db.models import (
 
 
 class WorkSpaceSerializer(BaseSerializer):
-    owner = UserLiteSerializer(read_only=True)
+    owner = UserSerializer(
+        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+    )
     total_members = serializers.IntegerField(read_only=True)
     total_issues = serializers.IntegerField(read_only=True)
 
@@ -33,30 +36,16 @@ class WorkSpaceSerializer(BaseSerializer):
             "owner",
         ]
 
-class WorkspaceLiteSerializer(BaseSerializer):
-    class Meta:
-        model = Workspace
-        fields = [
-            "name",
-            "slug",
-            "id",
-        ]
-        read_only_fields = fields
-
-
 
 class WorkSpaceMemberSerializer(BaseSerializer):
-    member = UserLiteSerializer(read_only=True)
-    workspace = WorkspaceLiteSerializer(read_only=True)
-
-    class Meta:
-        model = WorkspaceMember
-        fields = "__all__"
-
-
-class WorkspaceMemberAdminSerializer(BaseSerializer):
-    member = UserAdminLiteSerializer(read_only=True)
-    workspace = WorkspaceLiteSerializer(read_only=True)
+    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,
+    )
 
     class Meta:
         model = WorkspaceMember
@@ -66,7 +55,11 @@ class WorkspaceMemberAdminSerializer(BaseSerializer):
 class WorkSpaceMemberInviteSerializer(BaseSerializer):
     workspace = WorkSpaceSerializer(read_only=True)
     total_members = serializers.IntegerField(read_only=True)
-    created_by_detail = UserLiteSerializer(read_only=True, source="created_by")
+    created_by_detail = UserSerializer(
+        source="created_by",
+        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+    )
 
     class Meta:
         model = WorkspaceMemberInvite
@@ -74,7 +67,12 @@ class WorkSpaceMemberInviteSerializer(BaseSerializer):
 
 
 class TeamSerializer(BaseSerializer):
-    members_detail = UserLiteSerializer(read_only=True, source="members", many=True)
+    members_detail = UserSerializer(
+        source="members",
+        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+        many=True,
+    )
     members = serializers.ListField(
         child=serializers.PrimaryKeyRelatedField(queryset=User.objects.all()),
         write_only=True,

apiserver/plane/api/views/cycle.py

@@ -56,6 +56,10 @@ 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(
@@ -148,13 +152,15 @@ 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")
@@ -172,7 +178,8 @@ class CycleViewSet(BaseViewSet):
             # All Cycles
             if cycle_view == "all":
                 return Response(
-                    CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+                    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
                 )
 
             # Current Cycle
@@ -182,7 +189,8 @@ class CycleViewSet(BaseViewSet):
                     end_date__gte=timezone.now(),
                 )
 
-                data = CycleSerializer(queryset, many=True).data
+                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
 
                 if len(data):
                     assignee_distribution = (
@@ -256,14 +264,16 @@ class CycleViewSet(BaseViewSet):
             if cycle_view == "upcoming":
                 queryset = queryset.filter(start_date__gt=timezone.now())
                 return Response(
-                    CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+                    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
                 )
 
             # Completed Cycles
             if cycle_view == "completed":
                 queryset = queryset.filter(end_date__lt=timezone.now())
                 return Response(
-                    CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+                    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
                 )
 
             # Draft Cycles
@@ -274,16 +284,19 @@ class CycleViewSet(BaseViewSet):
                 )
 
                 return Response(
-                    CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+                    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
                 )
 
             # 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, many=True).data, status=status.HTTP_200_OK
+                    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
                 )
 
             return Response(
@@ -306,7 +319,8 @@ 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)
+                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"]}])
                 if serializer.is_valid():
                     serializer.save(
                         project_id=project_id,
@@ -342,7 +356,8 @@ 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)
@@ -418,7 +433,8 @@ class CycleViewSet(BaseViewSet):
                 .order_by("label_name")
             )
 
-            data = CycleSerializer(queryset).data
+            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["distribution"] = {
                 "assignees": assignee_distribution,
                 "labels": label_distribution,
@@ -486,7 +502,8 @@ 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")
@@ -512,7 +529,8 @@ 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,7 +13,6 @@ from plane.db.models import Project, Estimate, EstimatePoint
 from plane.api.serializers import (
     EstimateSerializer,
     EstimatePointSerializer,
-    EstimateReadSerializer,
 )
 
 
@@ -51,10 +50,38 @@ 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 = EstimateReadSerializer(estimates, many=True)
+            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,
+            )
             return Response(serializer.data, status=status.HTTP_200_OK)
         except Exception as e:
             capture_exception(e)
@@ -79,7 +106,31 @@ class BulkEstimatePointEndpoint(BaseViewSet):
                     status=status.HTTP_400_BAD_REQUEST,
                 )
 
-            estimate_serializer = EstimateSerializer(data=request.data.get("estimate"))
+            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",
+                ],
+            )
             if not estimate_serializer.is_valid():
                 return Response(
                     estimate_serializer.errors, status=status.HTTP_400_BAD_REQUEST
@@ -137,7 +188,32 @@ class BulkEstimatePointEndpoint(BaseViewSet):
             estimate = Estimate.objects.get(
                 pk=estimate_id, workspace__slug=slug, project_id=project_id
             )
-            serializer = EstimateReadSerializer(estimate)
+            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",
+                ],
+            )
             return Response(
                 serializer.data,
                 status=status.HTTP_200_OK,
@@ -170,7 +246,31 @@ class BulkEstimatePointEndpoint(BaseViewSet):
             estimate = Estimate.objects.get(pk=estimate_id)
 
             estimate_serializer = EstimateSerializer(
-                estimate, data=request.data.get("estimate"), partial=True
+                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,
             )
             if not estimate_serializer.is_valid():
                 return Response(
@@ -211,7 +311,9 @@ 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(
@@ -219,7 +321,9 @@ 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

@@ -23,11 +23,11 @@ class ExportIssuesEndpoint(BaseAPIView):
         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(
@@ -77,14 +77,38 @@ class ExportIssuesEndpoint(BaseAPIView):
         try:
             exporter_history = ExporterHistory.objects.filter(
                 workspace__slug=slug
-            ).select_related("workspace","initiated_by")
+            ).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, many=True
+                        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:

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 ProjectLiteSerializer, WorkspaceLiteSerializer
+from plane.api.serializers import ProjectSerializer, WorkSpaceSerializer
 
 
 class GPTIntegrationEndpoint(BaseAPIView):
@@ -57,8 +57,26 @@ class GPTIntegrationEndpoint(BaseAPIView):
                 {
                     "response": text,
                     "response_html": text_html,
-                    "project_detail": ProjectLiteSerializer(project).data,
-                    "workspace_detail": WorkspaceLiteSerializer(workspace).data,
+                    "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,
                 },
                 status=status.HTTP_200_OK,
             )

apiserver/plane/api/views/importer.py

@@ -42,7 +42,6 @@ from plane.utils.html_processor import strip_tags
 
 
 class ServiceIssueImportSummaryEndpoint(BaseAPIView):
-
     def get(self, request, slug, service):
         try:
             if service == "github":
@@ -177,7 +176,47 @@ class ImportServiceEndpoint(BaseAPIView):
                 )
 
                 service_importer.delay(service, importer.id)
-                serializer = ImporterSerializer(importer)
+                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"]},
+                    ],
+                )
                 return Response(serializer.data, status=status.HTTP_201_CREATED)
 
             if service == "jira":
@@ -213,7 +252,47 @@ class ImportServiceEndpoint(BaseAPIView):
                 )
 
                 service_importer.delay(service, importer.id)
-                serializer = ImporterSerializer(importer)
+                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"]},
+                    ],
+                )
                 return Response(serializer.data, status=status.HTTP_201_CREATED)
 
             return Response(
@@ -243,7 +322,48 @@ class ImportServiceEndpoint(BaseAPIView):
                 .order_by("-created_at")
                 .select_related("initiated_by", "project", "workspace")
             )
-            serializer = ImporterSerializer(imports, many=True)
+            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,
+            )
             return Response(serializer.data)
         except Exception as e:
             capture_exception(e)
@@ -284,7 +404,49 @@ class ImportServiceEndpoint(BaseAPIView):
             importer = Importer.objects.get(
                 pk=pk, service=service, workspace__slug=slug
             )
-            serializer = ImporterSerializer(importer, data=request.data, partial=True)
+            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,
+            )
             if serializer.is_valid():
                 serializer.save()
                 return Response(serializer.data, status=status.HTTP_200_OK)

apiserver/plane/api/views/inbox.py

@@ -152,7 +152,22 @@ class InboxIssueViewSet(BaseViewSet):
                     )
                 )
             )
-            issues_data = IssueStateInboxSerializer(issues, many=True).data
+            issues_data = IssueStateInboxSerializer(
+                issues,
+                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,
@@ -222,7 +237,19 @@ class InboxIssueViewSet(BaseViewSet):
                 source=request.data.get("source", "in-app"),
             )
 
-            serializer = IssueStateInboxSerializer(issue)
+            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)
@@ -237,10 +264,17 @@ 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)
@@ -251,15 +285,99 @@ 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, partial=True
+                    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():
@@ -287,7 +405,30 @@ class InboxIssueViewSet(BaseViewSet):
             # Only project admins and members can edit inbox issue attributes
             if project_member.role > 10:
                 serializer = InboxIssueSerializer(
-                    inbox_issue, data=request.data, partial=True
+                    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,
                 )
 
                 if serializer.is_valid():
@@ -300,7 +441,9 @@ 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
@@ -318,7 +461,9 @@ 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
@@ -327,7 +472,9 @@ 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"},
@@ -348,7 +495,19 @@ class InboxIssueViewSet(BaseViewSet):
             issue = Issue.objects.get(
                 pk=inbox_issue.issue_id, workspace__slug=slug, project_id=project_id
             )
-            serializer = IssueStateInboxSerializer(issue)
+            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)
@@ -363,15 +522,25 @@ 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(
@@ -389,7 +558,10 @@ class InboxIssuePublicViewSet(BaseViewSet):
     ]
 
     def get_queryset(self):
-        project_deploy_board = ProjectDeployBoard.objects.get(workspace__slug=self.kwargs.get("slug"), project_id=self.kwargs.get("project_id"))
+        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()
@@ -407,9 +579,14 @@ class InboxIssuePublicViewSet(BaseViewSet):
 
     def list(self, request, slug, project_id, inbox_id):
         try:
-            project_deploy_board = ProjectDeployBoard.objects.get(workspace__slug=slug, project_id=project_id)
+            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)
+                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 = (
@@ -452,13 +629,29 @@ class InboxIssuePublicViewSet(BaseViewSet):
                     )
                 )
             )
-            issues_data = IssueStateInboxSerializer(issues, many=True).data
+            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)
+            return Response(
+                {"error": "Project Deploy Board does not exist"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
         except Exception as e:
             capture_exception(e)
             return Response(
@@ -468,9 +661,14 @@ class InboxIssuePublicViewSet(BaseViewSet):
 
     def create(self, request, slug, project_id, inbox_id):
         try:
-            project_deploy_board = ProjectDeployBoard.objects.get(workspace__slug=slug, project_id=project_id)
+            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)
+                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(
@@ -527,7 +725,19 @@ class InboxIssuePublicViewSet(BaseViewSet):
                 source=request.data.get("source", "in-app"),
             )
 
-            serializer = IssueStateInboxSerializer(issue)
+            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)
@@ -538,33 +748,124 @@ class InboxIssuePublicViewSet(BaseViewSet):
 
     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)
+            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)
+                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)
+                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 
+            # 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, partial=True
+                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():
@@ -600,17 +901,34 @@ class InboxIssuePublicViewSet(BaseViewSet):
 
     def retrieve(self, request, slug, project_id, inbox_id, pk):
         try:
-            project_deploy_board = ProjectDeployBoard.objects.get(workspace__slug=slug, project_id=project_id)
+            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)
-        
+                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)
+            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)
@@ -621,25 +939,35 @@ class InboxIssuePublicViewSet(BaseViewSet):
 
     def destroy(self, request, slug, project_id, inbox_id, pk):
         try:
-            project_deploy_board = ProjectDeployBoard.objects.get(workspace__slug=slug, project_id=project_id)
+            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)
+                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)
+                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,
             )
-

apiserver/plane/api/views/issue.py

@@ -281,6 +281,86 @@ 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,
@@ -493,8 +573,34 @@ class IssueActivityEndpoint(BaseAPIView):
                 .order_by("created_at")
                 .select_related("actor", "issue", "project", "workspace")
             )
-            issue_activities = IssueActivitySerializer(issue_activities, many=True).data
-            issue_comments = IssueCommentSerializer(issue_comments, many=True).data
+            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
 
             result_list = sorted(
                 chain(issue_activities, issue_comments),
@@ -522,6 +628,9 @@ 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"),
@@ -550,7 +659,19 @@ 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).data,
+                    IssueCommentSerializer(
+                        current_instance,
+                        nested_fields={
+                            "actor_detail": (
+                                "id",
+                                "first_name",
+                                "last_name",
+                                "avatar",
+                                "is_bot",
+                                "display_name",
+                            )
+                        },
+                    ).data,
                     cls=DjangoJSONEncoder,
                 ),
             )
@@ -571,7 +692,19 @@ 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).data,
+                    IssueCommentSerializer(
+                        current_instance,
+                        nested_fields={
+                            "actor_detail": (
+                                "id",
+                                "first_name",
+                                "last_name",
+                                "avatar",
+                                "is_bot",
+                                "display_name",
+                            )
+                        },
+                    ).data,
                     cls=DjangoJSONEncoder,
                 ),
             )
@@ -769,7 +902,9 @@ class SubIssuesEndpoint(BaseAPIView):
                 .order_by("state_group")
             )
 
-            result = {item["state_group"]: item["state_count"] for item in state_distribution}
+            result = {
+                item["state_group"]: item["state_count"] for item in state_distribution
+            }
 
             serializer = IssueLiteSerializer(
                 sub_issues,
@@ -1507,7 +1642,19 @@ class IssueCommentPublicViewSet(BaseViewSet):
                 else "EXTERNAL"
             )
 
-            serializer = IssueCommentSerializer(data=request.data)
+            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,
@@ -1547,7 +1694,19 @@ class IssueCommentPublicViewSet(BaseViewSet):
                 workspace__slug=slug, pk=pk, actor=request.user
             )
             serializer = IssueCommentSerializer(
-                comment, data=request.data, partial=True
+                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()
@@ -1558,7 +1717,19 @@ class IssueCommentPublicViewSet(BaseViewSet):
                     issue_id=str(issue_id),
                     project_id=str(project_id),
                     current_instance=json.dumps(
-                        IssueCommentSerializer(comment).data,
+                        IssueCommentSerializer(
+                            comment,
+                            nested_fields={
+                                "actor_detail": (
+                                    "id",
+                                    "first_name",
+                                    "last_name",
+                                    "avatar",
+                                    "is_bot",
+                                    "display_name",
+                                )
+                            },
+                        ).data,
                         cls=DjangoJSONEncoder,
                     ),
                 )
@@ -1567,7 +1738,8 @@ class IssueCommentPublicViewSet(BaseViewSet):
         except (IssueComment.DoesNotExist, ProjectDeployBoard.DoesNotExist):
             return Response(
                 {"error": "IssueComent Does not exists"},
-                status=status.HTTP_400_BAD_REQUEST,)
+                status=status.HTTP_400_BAD_REQUEST,
+            )
 
     def destroy(self, request, slug, project_id, issue_id, pk):
         try:
@@ -1590,7 +1762,19 @@ class IssueCommentPublicViewSet(BaseViewSet):
                 issue_id=str(issue_id),
                 project_id=str(project_id),
                 current_instance=json.dumps(
-                    IssueCommentSerializer(comment).data,
+                    IssueCommentSerializer(
+                        comment,
+                        nested_fields={
+                            "actor_detail": (
+                                "id",
+                                "first_name",
+                                "last_name",
+                                "avatar",
+                                "is_bot",
+                                "display_name",
+                            )
+                        },
+                    ).data,
                     cls=DjangoJSONEncoder,
                 ),
             )
@@ -1835,9 +2019,11 @@ class ExportIssuesEndpoint(BaseAPIView):
 
     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
+                email=request.user.email,
+                data=request.data,
+                slug=slug,
+                exporter_name=request.user.first_name,
             )
 
             return Response(
@@ -1851,4 +2037,4 @@ class ExportIssuesEndpoint(BaseAPIView):
             return Response(
                 {"error": "Something went wrong please try again later"},
                 status=status.HTTP_400_BAD_REQUEST,
-            )
+            )

apiserver/plane/api/views/project.py

@@ -91,10 +91,10 @@ class ProjectViewSet(BaseViewSet):
         ProjectBasePermission,
     ]
 
-    def get_serializer_class(self, *args, **kwargs):
-        if self.action == "update" or self.action == "partial_update":
-            return ProjectSerializer
-        return ProjectDetailSerializer
+    # 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_queryset(self):
         subquery = ProjectFavorite.objects.filter(
@@ -216,7 +216,38 @@ class ProjectViewSet(BaseViewSet):
             workspace = Workspace.objects.get(slug=slug)
 
             serializer = ProjectSerializer(
-                data={**request.data}, context={"workspace_id": workspace.id}
+                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},
             )
             if serializer.is_valid():
                 serializer.save()
@@ -330,6 +361,36 @@ 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,
             )
@@ -1263,7 +1324,7 @@ class ProjectDeployBoardIssuesPublicEndpoint(BaseAPIView):
                 workspace__slug=slug, project_id=project_id
             ).values("id", "name", "color", "parent")
 
-            ## Grouping the results
+            # Grouping the results
             group_by = request.GET.get("group_by", False)
             if group_by:
                 issues = group_results(issues, group_by)

apiserver/plane/api/views/state.py

@@ -42,7 +42,36 @@ class StateViewSet(BaseViewSet):
 
     def create(self, request, slug, project_id):
         try:
-            serializer = StateSerializer(data=request.data)
+            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",
+                        ]
+                    },
+                ],
+            )
             if serializer.is_valid():
                 serializer.save(project_id=project_id)
                 return Response(serializer.data, status=status.HTTP_200_OK)
@@ -62,7 +91,37 @@ class StateViewSet(BaseViewSet):
     def list(self, request, slug, project_id):
         try:
             state_dict = dict()
-            states = StateSerializer(self.get_queryset(), many=True).data
+            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
 
             for key, value in groupby(
                 sorted(states, key=lambda state: state["group"]),
@@ -82,7 +141,9 @@ 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/user.py

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

apiserver/plane/api/views/workspace.py

@@ -42,12 +42,11 @@ from plane.api.serializers import (
     WorkSpaceMemberSerializer,
     TeamSerializer,
     WorkSpaceMemberInviteSerializer,
-    UserLiteSerializer,
+    UserSerializer,
     ProjectMemberSerializer,
     WorkspaceThemeSerializer,
     IssueActivitySerializer,
     IssueLiteSerializer,
-    WorkspaceMemberAdminSerializer,
 )
 from plane.api.views.base import BaseAPIView
 from . import BaseViewSet
@@ -164,8 +163,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(
@@ -300,7 +299,31 @@ class InviteWorkspaceEndpoint(BaseAPIView):
                     {
                         "error": "Some users are already member of workspace",
                         "workspace_users": WorkSpaceMemberSerializer(
-                            workspace_members, many=True
+                            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,
                         ).data,
                     },
                     status=status.HTTP_400_BAD_REQUEST,
@@ -542,7 +565,7 @@ class UserWorkspaceInvitationsEndpoint(BaseViewSet):
 
 
 class WorkSpaceMemberViewSet(BaseViewSet):
-    serializer_class = WorkspaceMemberAdminSerializer
+    serializer_class = WorkSpaceMemberSerializer
     model = WorkspaceMember
 
     permission_classes = [
@@ -591,7 +614,32 @@ class WorkSpaceMemberViewSet(BaseViewSet):
                 )
 
             serializer = WorkSpaceMemberSerializer(
-                workspace_member, data=request.data, partial=True
+                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",
+                        ]
+                    },
+                ],
             )
 
             if serializer.is_valid():
@@ -725,7 +773,18 @@ class TeamMemberViewSet(BaseViewSet):
                 users = list(set(request.data.get("members", [])).difference(members))
                 users = User.objects.filter(pk__in=users)
 
-                serializer = UserLiteSerializer(users, many=True)
+                serializer = UserSerializer(
+                    users,
+                    fields=[
+                        "id",
+                        "first_name",
+                        "last_name",
+                        "avatar",
+                        "is_bot",
+                        "display_name",
+                    ],
+                    many=True,
+                )
                 return Response(
                     {
                         "error": f"{len(users)} of the member(s) are not a part of the workspace",
@@ -791,14 +850,95 @@ class UserLastProjectWithWorkspaceEndpoint(BaseAPIView):
                 )
 
             workspace = Workspace.objects.get(pk=last_workspace_id)
-            workspace_serializer = WorkSpaceSerializer(workspace)
+            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",
+                ],
+            )
 
             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, many=True
+                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,
             )
 
             return Response(
@@ -825,7 +965,32 @@ class WorkspaceMemberUserEndpoint(BaseAPIView):
             workspace_member = WorkspaceMember.objects.get(
                 member=request.user, workspace__slug=slug
             )
-            serializer = WorkSpaceMemberSerializer(workspace_member)
+            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",
+                        ]
+                    },
+                ],
+            )
             return Response(serializer.data, status=status.HTTP_200_OK)
         except (Workspace.DoesNotExist, WorkspaceMember.DoesNotExist):
             return Response({"error": "Forbidden"}, status=status.HTTP_403_FORBIDDEN)
@@ -1083,7 +1248,6 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):
                 .filter(**filters)
                 .values("priority")
                 .annotate(priority_count=Count("priority"))
-                .filter(priority_count__gte=1)
                 .annotate(
                     priority_order=Case(
                         *[
@@ -1210,7 +1374,18 @@ class WorkspaceUserActivityEndpoint(BaseAPIView):
                 request=request,
                 queryset=queryset,
                 on_results=lambda issue_activities: IssueActivitySerializer(
-                    issue_activities, many=True
+                    issue_activities,
+                    nested_fields={
+                        "actor_detail": (
+                            "id",
+                            "first_name",
+                            "last_name",
+                            "avatar",
+                            "is_bot",
+                            "display_name",
+                        )
+                    },
+                    many=True,
                 ).data,
             )
         except Exception as e:
@@ -1418,7 +1593,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(
@@ -1465,8 +1640,34 @@ class WorkspaceMembersEndpoint(BaseAPIView):
                 workspace__slug=slug,
                 member__is_bot=False,
             ).select_related("workspace", "member")
-            serialzier = WorkSpaceMemberSerializer(workspace_members, many=True)
-            return Response(serialzier.data, status=status.HTTP_200_OK)
+            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(

apiserver/plane/bgtasks/export_task.py

@@ -68,7 +68,7 @@ def create_zip_file(files):
 def upload_to_s3(zip_file, workspace_id, token_id, slug):
     s3 = boto3.client(
         "s3",
-        region_name=settings.AWS_REGION,
+        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"),

apiserver/plane/bgtasks/importer_task.py

@@ -161,7 +161,47 @@ def service_importer(service, importer_id):
         if settings.PROXY_BASE_URL:
             headers = {"Content-Type": "application/json"}
             import_data_json = json.dumps(
-                ImporterSerializer(importer).data,
+                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,
                 cls=DjangoJSONEncoder,
             )
             res = requests.post(

apiserver/plane/bgtasks/issue_activites_task.py

@@ -1103,7 +1103,7 @@ def issue_activity(
                     for issue_activity in issue_activities_created:
                         headers = {"Content-Type": "application/json"}
                         issue_activity_json = json.dumps(
-                            IssueActivitySerializer(issue_activity).data,
+                            IssueActivitySerializer(issue_activity,fields=[{"actor_detail":["id", "first_name", "last_name", "avatar", "is_bot", "display_name"]}]).data,
                             cls=DjangoJSONEncoder,
                         )
                         _ = requests.post(

apps/app/Dockerfile.web

@@ -33,8 +33,8 @@ RUN yarn turbo run build --filter=app
 
 ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
     BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
-ENV NEXT_PUBLIC_DEPLOY_URL=${NEXT_PUBLIC_DEPLOY_URL}
-RUN /usr/local/bin/replace-env-vars.sh http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER ${NEXT_PUBLIC_API_BASE_URL} app
+
+RUN /usr/local/bin/replace-env-vars.sh http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER ${NEXT_PUBLIC_API_BASE_URL}
 
 FROM node:18-alpine AS runner
 WORKDIR /app

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

@@ -140,14 +140,14 @@ export const GptAssistantModal: React.FC<Props> = ({
 
   return (
     <div
-      className={`absolute ${inset} z-20 w-full space-y-4 rounded-[10px] border border-custom-border-200 bg-custom-background-100 p-4 shadow ${isOpen ? "block" : "hidden"
-        }`}
+      className={`absolute ${inset} z-20 w-full space-y-4 rounded-[10px] border border-custom-border-200 bg-custom-background-100 p-4 shadow ${
+        isOpen ? "block" : "hidden"
+      }`}
     >
       {((content && content !== "") || (htmlContent && htmlContent !== "<p></p>")) && (
         <div className="text-sm">
           Content:
           <TiptapEditor
-            workspaceSlug={workspaceSlug as string}
             value={htmlContent ?? `<p>${content}</p>`}
             customClassName="-m-3"
             noBorder
@@ -161,7 +161,6 @@ export const GptAssistantModal: React.FC<Props> = ({
         <div className="page-block-section text-sm">
           Response:
           <Tiptap
-            workspaceSlug={workspaceSlug as string}
             value={`<p>${response}</p>`}
             customClassName="-mx-3 -my-3"
             noBorder
@@ -180,10 +179,11 @@ export const GptAssistantModal: React.FC<Props> = ({
         type="text"
         name="task"
         register={register}
-        placeholder={`${content && content !== ""
+        placeholder={`${
+          content && content !== ""
             ? "Tell AI what action to perform on this content..."
             : "Ask AI anything..."
-          }`}
+        }`}
         autoComplete="off"
       />
       <div className={`flex gap-2 ${response === "" ? "justify-end" : "justify-between"}`}>
@@ -219,8 +219,8 @@ export const GptAssistantModal: React.FC<Props> = ({
             {isSubmitting
               ? "Generating response..."
               : response === ""
-                ? "Generate response"
-                : "Generate again"}
+              ? "Generate response"
+              : "Generate again"}
           </PrimaryButton>
         </div>
       </div>

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

@@ -86,8 +86,7 @@ export const SingleBoardIssue: React.FC<Props> = ({
 }) => {
   // context menu
   const [contextMenu, setContextMenu] = useState(false);
-  const [contextMenuPosition, setContextMenuPosition] = useState<React.MouseEvent | null>(null);
-
+  const [contextMenuPosition, setContextMenuPosition] = useState({ x: 0, y: 0 });
   const [isMenuActive, setIsMenuActive] = useState(false);
   const [isDropdownActive, setIsDropdownActive] = useState(false);
 
@@ -202,7 +201,7 @@ export const SingleBoardIssue: React.FC<Props> = ({
   return (
     <>
       <ContextMenu
-        clickEvent={contextMenuPosition}
+        position={contextMenuPosition}
         title="Quick actions"
         isOpen={contextMenu}
         setIsOpen={setContextMenu}
@@ -244,7 +243,7 @@ export const SingleBoardIssue: React.FC<Props> = ({
         onContextMenu={(e) => {
           e.preventDefault();
           setContextMenu(true);
-          setContextMenuPosition(e);
+          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]">

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

@@ -33,7 +33,7 @@ import {
 } from "@heroicons/react/24/outline";
 import { LayerDiagonalIcon } from "components/icons";
 // helpers
-import { copyTextToClipboard } from "helpers/string.helper";
+import { copyTextToClipboard, truncateText } from "helpers/string.helper";
 import { handleIssuesMutation } from "constants/issue";
 // types
 import { ICurrentUserResponse, IIssue, IIssueViewProps, ISubIssueResponse, UserAuth } from "types";
@@ -71,7 +71,7 @@ export const SingleListIssue: React.FC<Props> = ({
 }) => {
   // context menu
   const [contextMenu, setContextMenu] = useState(false);
-  const [contextMenuPosition, setContextMenuPosition] = useState<React.MouseEvent | null>(null);
+  const [contextMenuPosition, setContextMenuPosition] = useState({ x: 0, y: 0 });
 
   const router = useRouter();
   const { workspaceSlug, projectId, cycleId, moduleId } = router.query;
@@ -167,7 +167,7 @@ export const SingleListIssue: React.FC<Props> = ({
   return (
     <>
       <ContextMenu
-        clickEvent={contextMenuPosition}
+        position={contextMenuPosition}
         title="Quick actions"
         isOpen={contextMenu}
         setIsOpen={setContextMenu}
@@ -199,7 +199,7 @@ export const SingleListIssue: React.FC<Props> = ({
         onContextMenu={(e) => {
           e.preventDefault();
           setContextMenu(true);
-          setContextMenuPosition(e);
+          setContextMenuPosition({ x: e.pageX, y: e.pageY });
         }}
       >
         <div className="flex-grow cursor-pointer min-w-[200px] whitespace-nowrap overflow-hidden overflow-ellipsis">

apps/app/components/inbox/inbox-main-content.tsx

@@ -293,7 +293,6 @@ export const InboxMainContent: React.FC = () => {
             </div>
             <div>
               <IssueDescriptionForm
-                workspaceSlug={workspaceSlug as string}
                 issue={{
                   name: issueDetails.name,
                   description: issueDetails.description,

apps/app/components/issues/activity.tsx

@@ -134,9 +134,7 @@ export const IssueActivitySection: React.FC<Props> = ({ issueId, user }) => {
                               <div
                                 className={`grid h-7 w-7 place-items-center rounded-full border-2 border-white bg-gray-700 text-xs text-white`}
                               >
-                                {activityItem.actor_detail.is_bot
-                                  ? activityItem.actor_detail.first_name.charAt(0)
-                                  : activityItem.actor_detail.display_name.charAt(0)}
+                                {activityItem.actor_detail.display_name.charAt(0)}
                               </div>
                             )}
                           </div>
@@ -155,9 +153,7 @@ export const IssueActivitySection: React.FC<Props> = ({ issueId, user }) => {
                         ) : (
                           <Link href={`/${workspaceSlug}/profile/${activityItem.actor_detail.id}`}>
                             <a className="text-gray font-medium">
-                              {activityItem.actor_detail.is_bot
-                                ? activityItem.actor_detail.first_name
-                                : activityItem.actor_detail.display_name}
+                              {activityItem.actor_detail.display_name}
                             </a>
                           </Link>
                         )}{" "}
@@ -175,7 +171,6 @@ export const IssueActivitySection: React.FC<Props> = ({ issueId, user }) => {
             return (
               <div key={activityItem.id} className="mt-4">
                 <CommentCard
-                  workspaceSlug={workspaceSlug as string}
                   comment={activityItem as IIssueComment}
                   onSubmit={handleCommentUpdate}
                   handleCommentDeletion={handleCommentDelete}

apps/app/components/issues/comment/add-comment.tsx

@@ -93,12 +93,11 @@ export const AddComment: React.FC<Props> = ({ issueId, user, disabled = false })
             control={control}
             render={({ field: { value, onChange } }) => (
               <TiptapEditor
-                workspaceSlug={workspaceSlug as string}
                 ref={editorRef}
                 value={
                   !value ||
-                    value === "" ||
-                    (typeof value === "object" && Object.keys(value).length === 0)
+                  value === "" ||
+                  (typeof value === "object" && Object.keys(value).length === 0)
                     ? watch("comment_html")
                     : value
                 }

apps/app/components/issues/comment/comment-card.tsx

@@ -22,13 +22,12 @@ const TiptapEditor = React.forwardRef<ITiptapRichTextEditor, ITiptapRichTextEdit
 TiptapEditor.displayName = "TiptapEditor";
 
 type Props = {
-  workspaceSlug: string;
   comment: IIssueComment;
   onSubmit: (comment: IIssueComment) => void;
   handleCommentDeletion: (comment: string) => void;
 };
 
-export const CommentCard: React.FC<Props> = ({ comment, workspaceSlug, onSubmit, handleCommentDeletion }) => {
+export const CommentCard: React.FC<Props> = ({ comment, onSubmit, handleCommentDeletion }) => {
   const { user } = useUser();
 
   const editorRef = React.useRef<any>(null);
@@ -66,11 +65,7 @@ export const CommentCard: React.FC<Props> = ({ comment, workspaceSlug, onSubmit,
         {comment.actor_detail.avatar && comment.actor_detail.avatar !== "" ? (
           <img
             src={comment.actor_detail.avatar}
-            alt={
-              comment.actor_detail.is_bot
-                ? comment.actor_detail.first_name + " Bot"
-                : comment.actor_detail.display_name
-            }
+            alt={comment.actor_detail.display_name}
             height={30}
             width={30}
             className="grid h-7 w-7 place-items-center rounded-full border-2 border-custom-border-200"
@@ -79,9 +74,7 @@ export const CommentCard: React.FC<Props> = ({ comment, workspaceSlug, onSubmit,
           <div
             className={`grid h-7 w-7 place-items-center rounded-full border-2 border-white bg-gray-500 text-white`}
           >
-            {comment.actor_detail.is_bot
-              ? comment.actor_detail.first_name.charAt(0)
-              : comment.actor_detail.display_name.charAt(0)}
+            {comment.actor_detail.display_name.charAt(0)}
           </div>
         )}
 
@@ -110,7 +103,6 @@ export const CommentCard: React.FC<Props> = ({ comment, workspaceSlug, onSubmit,
           >
             <div>
               <TiptapEditor
-                workspaceSlug={workspaceSlug as string}
                 ref={editorRef}
                 value={watch("comment_html")}
                 debouncedUpdatesEnabled={false}
@@ -140,7 +132,6 @@ export const CommentCard: React.FC<Props> = ({ comment, workspaceSlug, onSubmit,
           </form>
           <div className={`${isEditing ? "hidden" : ""}`}>
             <TiptapEditor
-              workspaceSlug={workspaceSlug as string}
               ref={showEditorRef}
               value={comment.comment_html}
               editable={false}

apps/app/components/issues/description-form.tsx

@@ -24,7 +24,6 @@ export interface IssueDetailsProps {
     description: string;
     description_html: string;
   };
-  workspaceSlug: string;
   handleFormSubmit: (value: IssueDescriptionFormValues) => Promise<void>;
   isAllowed: boolean;
 }
@@ -32,7 +31,6 @@ export interface IssueDetailsProps {
 export const IssueDescriptionForm: FC<IssueDetailsProps> = ({
   issue,
   handleFormSubmit,
-  workspaceSlug,
   isAllowed,
 }) => {
   const [isSubmitting, setIsSubmitting] = useState<"submitting" | "submitted" | "saved">("saved");
@@ -71,15 +69,11 @@ export const IssueDescriptionForm: FC<IssueDetailsProps> = ({
 
   useEffect(() => {
     if (isSubmitting === "submitted") {
-      setShowAlert(false);
       setTimeout(async () => {
         setIsSubmitting("saved");
       }, 2000);
-    } else if (isSubmitting === "submitting") {
-      setShowAlert(true);
     }
-  }, [isSubmitting, setShowAlert]);
-
+  }, [isSubmitting]);
 
   // reset form values
   useEffect(() => {
@@ -118,8 +112,9 @@ export const IssueDescriptionForm: FC<IssueDetailsProps> = ({
         {characterLimit && (
           <div className="pointer-events-none absolute bottom-1 right-1 z-[2] rounded bg-custom-background-100 text-custom-text-200 p-0.5 text-xs">
             <span
-              className={`${watch("name").length === 0 || watch("name").length > 255 ? "text-red-500" : ""
-                }`}
+              className={`${
+                watch("name").length === 0 || watch("name").length > 255 ? "text-red-500" : ""
+              }`}
             >
               {watch("name").length}
             </span>
@@ -139,19 +134,16 @@ export const IssueDescriptionForm: FC<IssueDetailsProps> = ({
               <Tiptap
                 value={
                   !value ||
-                    value === "" ||
-                    (typeof value === "object" && Object.keys(value).length === 0)
+                  value === "" ||
+                  (typeof value === "object" && Object.keys(value).length === 0)
                     ? watch("description_html")
                     : value
                 }
-                workspaceSlug={workspaceSlug}
                 debouncedUpdatesEnabled={true}
-                setShouldShowAlert={setShowAlert}
                 setIsSubmitting={setIsSubmitting}
                 customClassName="min-h-[150px] shadow-sm"
                 editorContentCustomClassNames="pb-9"
                 onChange={(description: Object, description_html: string) => {
-                  setShowAlert(true);
                   setIsSubmitting("submitting");
                   onChange(description_html);
                   setValue("description", description);
@@ -164,8 +156,9 @@ export const IssueDescriptionForm: FC<IssueDetailsProps> = ({
           }}
         />
         <div
-          className={`absolute right-5 bottom-5 text-xs text-custom-text-200 border border-custom-border-400 rounded-xl w-[6.5rem] py-1 z-10 flex items-center justify-center ${isSubmitting === "saved" ? "fadeOut" : "fadeIn"
-            }`}
+          className={`absolute right-5 bottom-5 text-xs text-custom-text-200 border border-custom-border-400 rounded-xl w-[6.5rem] py-1 z-10 flex items-center justify-center ${
+            isSubmitting === "saved" ? "fadeOut" : "fadeIn"
+          }`}
         >
           {isSubmitting === "submitting" ? "Saving..." : "Saved"}
         </div>

apps/app/components/issues/form.tsx

@@ -370,7 +370,6 @@ export const IssueForm: FC<IssueFormProps> = ({
 
                       return (
                         <TiptapEditor
-                          workspaceSlug={workspaceSlug as string}
                           ref={editorRef}
                           debouncedUpdatesEnabled={false}
                           value={

apps/app/components/issues/main-content.tsx

@@ -124,7 +124,6 @@ export const IssueMainContent: React.FC<Props> = ({
           </div>
         ) : null}
         <IssueDescriptionForm
-          workspaceSlug={workspaceSlug as string}
           issue={issueDetails}
           handleFormSubmit={submitChanges}
           isAllowed={memberRole.isMember || memberRole.isOwner || !uneditable}

apps/app/components/issues/my-issues/my-issues-view.tsx

@@ -270,18 +270,16 @@ export const MyIssuesView: React.FC<Props> = ({
             ? "You have not created any issue yet."
             : "You have not subscribed to any issue yet.",
           description: "Keep track of your work in a single place.",
-          primaryButton: filters.subscriber
-            ? undefined
-            : {
-                icon: <PlusIcon className="h-4 w-4" />,
-                text: "New Issue",
-                onClick: () => {
-                  const e = new KeyboardEvent("keydown", {
-                    key: "c",
-                  });
-                  document.dispatchEvent(e);
-                },
-              },
+          primaryButton: {
+            icon: <PlusIcon className="h-4 w-4" />,
+            text: "New Issue",
+            onClick: () => {
+              const e = new KeyboardEvent("keydown", {
+                key: "c",
+              });
+              document.dispatchEvent(e);
+            },
+          },
         }}
         handleOnDragEnd={handleOnDragEnd}
         handleIssueAction={handleIssueAction}

apps/app/components/issues/select/assignee.tsx

@@ -49,7 +49,7 @@ export const IssueAssigneeSelect: React.FC<Props> = ({ projectId, value = [], on
               <AssigneesList userIds={value} length={3} showLength={true} />
             </div>
           ) : (
-            <div className="flex items-center justify-center gap-2 px-1.5 py-1 rounded shadow-sm border border-custom-border-300 hover:bg-custom-background-80">
+            <div className="flex items-center justify-center gap-2 px-1.5 py-1 rounded shadow-sm border border-custom-border-300">
               <Icon iconName="person" className="!text-base !leading-4" />
               <span className="text-custom-text-200">Assignee</span>
             </div>

apps/app/components/issues/select/date.tsx

@@ -17,10 +17,10 @@ type Props = {
 
 export const IssueDateSelect: React.FC<Props> = ({ label, maxDate, minDate, onChange, value }) => (
   <Popover className="relative flex items-center justify-center  rounded-lg">
-    {({ close }) => (
+    {({ open }) => (
       <>
         <Popover.Button className="flex cursor-pointer items-center rounded-md border border-custom-border-200 text-xs shadow-sm duration-200">
-          <span className="flex items-center justify-center gap-2 px-2 py-1 text-xs text-custom-text-200 hover:bg-custom-background-80">
+          <span className="flex items-center justify-center gap-2 px-2 py-1 text-xs text-custom-text-200">
             {value ? (
               <>
                 <span className="text-custom-text-100">{renderShortDateWithYearFormat(value)}</span>
@@ -52,8 +52,6 @@ export const IssueDateSelect: React.FC<Props> = ({ label, maxDate, minDate, onCh
               onChange={(val) => {
                 if (!val) onChange("");
                 else onChange(renderDateFormat(val));
-
-                close();
               }}
               dateFormat="dd-MM-yyyy"
               minDate={minDate}

apps/app/components/issues/select/label.tsx

@@ -59,17 +59,17 @@ export const IssueLabelSelect: React.FC<Props> = ({ setIsOpen, value, onChange,
     >
       {({ open }: any) => (
         <>
-          <Combobox.Button className="flex items-center gap-2 cursor-pointer text-xs text-custom-text-200">
+          <Combobox.Button className="flex cursor-pointer items-center text-xs">
             {value && value.length > 0 ? (
-              <span className="flex items-center justify-center gap-2 text-xs">
+              <span className="flex items-center justify-center gap-2 px-2 py-1 text-xs">
                 <IssueLabelsList
-                  labels={value.map((v) => issueLabels?.find((l) => l.id === v)) ?? []}
+                  labels={value.map((v) => issueLabels?.find((l) => l.id === v)?.color) ?? []}
                   length={3}
                   showLength={true}
                 />
               </span>
             ) : (
-              <span className="flex items-center justify-center gap-2 px-2 py-1 text-xs rounded shadow-sm border border-custom-border-300 hover:bg-custom-background-80">
+              <span className="flex items-center justify-center gap-2 px-2.5 py-1 text-xs rounded-md border border-custom-border-200 shadow-sm duration-200 hover:bg-custom-background-80">
                 <TagIcon className="h-3.5 w-3.5 text-custom-text-200" />
                 <span className=" text-custom-text-200">Label</span>
               </span>

apps/app/components/modules/form.tsx

@@ -1,11 +1,15 @@
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
 
 // react-hook-form
 import { Controller, useForm } from "react-hook-form";
+// hooks
+import useToast from "hooks/use-toast";
 // components
 import { ModuleLeadSelect, ModuleMembersSelect, ModuleStatusSelect } from "components/modules";
 // ui
 import { DateSelect, Input, PrimaryButton, SecondaryButton, TextArea } from "components/ui";
+// helper
+import { isDateRangeValid } from "helpers/date-time.helper";
 // types
 import { IModule } from "types";
 
@@ -25,6 +29,8 @@ const defaultValues: Partial<IModule> = {
 };
 
 export const ModuleForm: React.FC<Props> = ({ handleFormSubmit, handleClose, status, data }) => {
+  const [isDateValid, setIsDateValid] = useState(true);
+  const { setToastAlert } = useToast();
   const {
     register,
     formState: { errors, isSubmitting },
@@ -51,15 +57,6 @@ export const ModuleForm: React.FC<Props> = ({ handleFormSubmit, handleClose, sta
     });
   }, [data, reset]);
 
-  const startDate = watch("start_date");
-  const targetDate = watch("target_date");
-
-  const minDate = startDate ? new Date(startDate) : null;
-  minDate?.setDate(minDate.getDate());
-
-  const maxDate = targetDate ? new Date(targetDate) : null;
-  maxDate?.setDate(maxDate.getDate());
-
   return (
     <form onSubmit={handleSubmit(handleCreateUpdateModule)}>
       <div className="space-y-5">
@@ -106,8 +103,20 @@ export const ModuleForm: React.FC<Props> = ({ handleFormSubmit, handleClose, sta
                   value={value}
                   onChange={(val) => {
                     onChange(val);
+                    if (val && watch("target_date")) {
+                      if (isDateRangeValid(val, `${watch("target_date")}`)) {
+                        setIsDateValid(true);
+                      } else {
+                        setIsDateValid(false);
+                        setToastAlert({
+                          type: "error",
+                          title: "Error!",
+                          message:
+                            "The date you have entered is invalid. Please check and enter a valid date.",
+                        });
+                      }
+                    }
                   }}
-                  maxDate={maxDate ?? undefined}
                 />
               )}
             />
@@ -120,8 +129,20 @@ export const ModuleForm: React.FC<Props> = ({ handleFormSubmit, handleClose, sta
                   value={value}
                   onChange={(val) => {
                     onChange(val);
+                    if (watch("start_date") && val) {
+                      if (isDateRangeValid(`${watch("start_date")}`, val)) {
+                        setIsDateValid(true);
+                      } else {
+                        setIsDateValid(false);
+                        setToastAlert({
+                          type: "error",
+                          title: "Error!",
+                          message:
+                            "The date you have entered is invalid. Please check and enter a valid date.",
+                        });
+                      }
+                    }
                   }}
-                  minDate={minDate ?? undefined}
                 />
               )}
             />
@@ -145,7 +166,7 @@ export const ModuleForm: React.FC<Props> = ({ handleFormSubmit, handleClose, sta
       </div>
       <div className="-mx-5 mt-5 flex justify-end gap-2 border-t border-custom-border-200 px-5 pt-5">
         <SecondaryButton onClick={handleClose}>Cancel</SecondaryButton>
-        <PrimaryButton type="submit" loading={isSubmitting}>
+        <PrimaryButton type="submit" loading={isSubmitting || isDateValid ? false : true}>
           {status
             ? isSubmitting
               ? "Updating Module..."

apps/app/components/notifications/notification-card.tsx

@@ -80,9 +80,7 @@ export const NotificationCard: React.FC<NotificationCardProps> = (props) => {
         ) : (
           <div className="w-12 h-12 bg-custom-background-80 rounded-full flex justify-center items-center">
             <span className="text-custom-text-100 font-medium text-lg">
-              {notification.triggered_by_details.is_bot ? (
-                notification.triggered_by_details.first_name?.[0]?.toUpperCase()
-              ) : notification.triggered_by_details.display_name?.[0] ? (
+              {notification.triggered_by_details.display_name?.[0] ? (
                 notification.triggered_by_details.display_name?.[0]?.toUpperCase()
               ) : (
                 <Icon iconName="person" className="h-6 w-6" />
@@ -93,11 +91,7 @@ export const NotificationCard: React.FC<NotificationCardProps> = (props) => {
       </div>
       <div className="space-y-2.5 w-full overflow-hidden">
         <div className="text-sm w-full break-words">
-          <span className="font-semibold">
-            {notification.triggered_by_details.is_bot
-              ? notification.triggered_by_details.first_name
-              : notification.triggered_by_details.display_name}{" "}
-          </span>
+          <span className="font-semibold">{notification.triggered_by_details.display_name} </span>
           {notification.data.issue_activity.field !== "comment" &&
             notification.data.issue_activity.verb}{" "}
           {notification.data.issue_activity.field === "comment"

apps/app/components/pages/create-update-block-inline.tsx

@@ -231,9 +231,9 @@ export const CreateUpdateBlockInline: React.FC<Props> = ({
       description:
         !data.description || data.description === ""
           ? {
-            type: "doc",
-            content: [{ type: "paragraph" }],
-          }
+              type: "doc",
+              content: [{ type: "paragraph" }],
+            }
           : data.description,
       description_html: data.description_html ?? "<p></p>",
     });
@@ -292,7 +292,6 @@ export const CreateUpdateBlockInline: React.FC<Props> = ({
                 if (!data)
                   return (
                     <TiptapEditor
-                      workspaceSlug={workspaceSlug as string}
                       ref={editorRef}
                       value={"<p></p>"}
                       debouncedUpdatesEnabled={false}
@@ -312,11 +311,12 @@ export const CreateUpdateBlockInline: React.FC<Props> = ({
 
                 return (
                   <TiptapEditor
-                    workspaceSlug={workspaceSlug as string}
                     ref={editorRef}
                     value={
                       value && value !== "" && Object.keys(value).length > 0
                         ? value
+                        : watch("description_html") && watch("description_html") !== ""
+                        ? watch("description_html")
                         : { type: "doc", content: [{ type: "paragraph" }] }
                     }
                     debouncedUpdatesEnabled={false}
@@ -334,8 +334,9 @@ export const CreateUpdateBlockInline: React.FC<Props> = ({
             <div className="m-2 mt-6 flex">
               <button
                 type="button"
-                className={`flex items-center gap-1 rounded px-1.5 py-1 text-xs hover:bg-custom-background-80 ${iAmFeelingLucky ? "cursor-wait bg-custom-background-90" : ""
-                  }`}
+                className={`flex items-center gap-1 rounded px-1.5 py-1 text-xs hover:bg-custom-background-80 ${
+                  iAmFeelingLucky ? "cursor-wait bg-custom-background-90" : ""
+                }`}
                 onClick={handleAutoGenerateDescription}
                 disabled={iAmFeelingLucky}
               >
@@ -367,8 +368,8 @@ export const CreateUpdateBlockInline: React.FC<Props> = ({
                 ? "Updating..."
                 : "Update block"
               : isSubmitting
-                ? "Adding..."
-                : "Add block"}
+              ? "Adding..."
+              : "Add block"}
           </PrimaryButton>
         </div>
       </form>

apps/app/components/pages/single-page-block.tsx

@@ -456,7 +456,6 @@ export const SinglePageBlock: React.FC<Props> = ({
                   {showBlockDetails
                     ? block.description_html.length > 7 && (
                       <TiptapEditor
-                        workspaceSlug={workspaceSlug as string}
                         value={block.description_html}
                         customClassName="text-sm min-h-[150px]"
                         noBorder

apps/app/components/profile/overview/priority-distribution.tsx

@@ -12,10 +12,10 @@ type Props = {
 };
 
 export const ProfilePriorityDistribution: React.FC<Props> = ({ userProfile }) => (
-  <div className="flex flex-col space-y-2">
+  <div className="space-y-2">
     <h3 className="text-lg font-medium">Issues by Priority</h3>
     {userProfile ? (
-      <div className="flex-grow border border-custom-border-100 rounded">
+      <div className="border border-custom-border-100 rounded">
         {userProfile.priority_distribution.length > 0 ? (
           <BarGraph
             data={userProfile.priority_distribution.map((priority) => ({
@@ -63,7 +63,7 @@ export const ProfilePriorityDistribution: React.FC<Props> = ({ userProfile }) =>
             }}
           />
         ) : (
-          <div className="flex-grow p-7">
+          <div className="p-7">
             <ProfileEmptyState
               title="No Data yet"
               description="Create issues to view the them by priority in the graph for better analysis."

apps/app/components/profile/overview/state-distribution.tsx

@@ -16,9 +16,9 @@ export const ProfileStateDistribution: React.FC<Props> = ({ stateDistribution, u
   if (!userProfile) return null;
 
   return (
-    <div className="flex flex-col space-y-2">
+    <div className="space-y-2">
       <h3 className="text-lg font-medium">Issues by State</h3>
-      <div className="flex-grow border border-custom-border-100 rounded p-7">
+      <div className="border border-custom-border-100 rounded p-7">
         {userProfile.state_distribution.length > 0 ? (
           <div className="grid grid-cols-1 md:grid-cols-2 gap-x-6">
             <div>

apps/app/components/project/create-project-modal.tsx

@@ -42,7 +42,6 @@ import { NETWORK_CHOICES } from "constants/project";
 type Props = {
   isOpen: boolean;
   setIsOpen: React.Dispatch<React.SetStateAction<boolean>>;
-  setToFavorite?: boolean;
   user: ICurrentUserResponse | undefined;
 };
 
@@ -75,12 +74,7 @@ const IsGuestCondition: React.FC<{
   return null;
 };
 
-export const CreateProjectModal: React.FC<Props> = ({
-  isOpen,
-  setIsOpen,
-  setToFavorite = false,
-  user,
-}) => {
+export const CreateProjectModal: React.FC<Props> = ({ isOpen, setIsOpen, user }) => {
   const [isChangeInIdentifierRequired, setIsChangeInIdentifierRequired] = useState(true);
 
   const { setToastAlert } = useToast();
@@ -110,29 +104,6 @@ export const CreateProjectModal: React.FC<Props> = ({
     reset(defaultValues);
   };
 
-  const handleAddToFavorites = (projectId: string) => {
-    if (!workspaceSlug) return;
-
-    mutate<IProject[]>(
-      PROJECTS_LIST(workspaceSlug as string, { is_favorite: "all" }),
-      (prevData) =>
-        (prevData ?? []).map((p) => (p.id === projectId ? { ...p, is_favorite: true } : p)),
-      false
-    );
-
-    projectServices
-      .addProjectToFavorites(workspaceSlug as string, {
-        project: projectId,
-      })
-      .catch(() =>
-        setToastAlert({
-          type: "error",
-          title: "Error!",
-          message: "Couldn't remove the project from favorites. Please try again.",
-        })
-      );
-  };
-
   const onSubmit = async (formData: IProject) => {
     if (!workspaceSlug) return;
 
@@ -154,9 +125,6 @@ export const CreateProjectModal: React.FC<Props> = ({
           title: "Success!",
           message: "Project created successfully.",
         });
-        if (setToFavorite) {
-          handleAddToFavorites(res.id);
-        }
         handleClose();
       })
       .catch((err) => {

apps/app/components/project/delete-project-modal.tsx

@@ -1,11 +1,9 @@
-import React from "react";
+import React, { useEffect, useState } from "react";
 
 import { useRouter } from "next/router";
 
 import { mutate } from "swr";
 
-// react-hook-form
-import { Controller, useForm } from "react-hook-form";
 // headless ui
 import { Dialog, Transition } from "@headlessui/react";
 // services
@@ -29,11 +27,6 @@ type TConfirmProjectDeletionProps = {
   user: ICurrentUserResponse | undefined;
 };
 
-const defaultValues = {
-  projectName: "",
-  confirmDelete: "",
-};
-
 export const DeleteProjectModal: React.FC<TConfirmProjectDeletionProps> = ({
   isOpen,
   data,
@@ -41,41 +34,51 @@ export const DeleteProjectModal: React.FC<TConfirmProjectDeletionProps> = ({
   onSuccess,
   user,
 }) => {
+  const [isDeleteLoading, setIsDeleteLoading] = useState(false);
+  const [confirmProjectName, setConfirmProjectName] = useState("");
+  const [confirmDeleteMyProject, setConfirmDeleteMyProject] = useState(false);
+  const [selectedProject, setSelectedProject] = useState<IProject | null>(null);
+
   const router = useRouter();
   const { workspaceSlug } = router.query;
 
   const { setToastAlert } = useToast();
 
-  const {
-    control,
-    formState: { isSubmitting },
-    handleSubmit,
-    reset,
-    watch,
-  } = useForm({ defaultValues });
+  const canDelete = confirmProjectName === data?.name && confirmDeleteMyProject;
 
-  const canDelete =
-    watch("projectName") === data?.name && watch("confirmDelete") === "delete my project";
+  useEffect(() => {
+    if (data) setSelectedProject(data);
+    else {
+      const timer = setTimeout(() => {
+        setSelectedProject(null);
+        clearTimeout(timer);
+      }, 300);
+    }
+  }, [data]);
 
   const handleClose = () => {
+    setIsDeleteLoading(false);
+
     const timer = setTimeout(() => {
-      reset(defaultValues);
+      setConfirmProjectName("");
+      setConfirmDeleteMyProject(false);
       clearTimeout(timer);
     }, 350);
-
     onClose();
   };
 
-  const onSubmit = async () => {
+  const handleDeletion = async () => {
     if (!data || !workspaceSlug || !canDelete) return;
 
+    setIsDeleteLoading(true);
+
     await projectService
-      .deleteProject(workspaceSlug.toString(), data.id, user)
+      .deleteProject(workspaceSlug as string, data.id, user)
       .then(() => {
         handleClose();
 
         mutate<IProject[]>(
-          PROJECTS_LIST(workspaceSlug.toString(), { is_favorite: "all" }),
+          PROJECTS_LIST(workspaceSlug as string, { is_favorite: "all" }),
           (prevData) => prevData?.filter((project: IProject) => project.id !== data.id),
           false
         );
@@ -88,7 +91,8 @@ export const DeleteProjectModal: React.FC<TConfirmProjectDeletionProps> = ({
           title: "Error!",
           message: "Something went wrong. Please try again later.",
         })
-      );
+      )
+      .finally(() => setIsDeleteLoading(false));
   };
 
   return (
@@ -118,7 +122,7 @@ export const DeleteProjectModal: React.FC<TConfirmProjectDeletionProps> = ({
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
               <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-200 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl">
-                <form onSubmit={handleSubmit(onSubmit)} className="flex flex-col gap-6 p-6">
+                <div className="flex flex-col gap-6 p-6">
                   <div className="flex w-full items-center justify-start gap-6">
                     <span className="place-items-center rounded-full bg-red-500/20 p-4">
                       <ExclamationTriangleIcon
@@ -133,29 +137,28 @@ export const DeleteProjectModal: React.FC<TConfirmProjectDeletionProps> = ({
                   <span>
                     <p className="text-sm leading-7 text-custom-text-200">
                       Are you sure you want to delete project{" "}
-                      <span className="break-words font-semibold">{data?.name}</span>? All of the
-                      data related to the project will be permanently removed. This action cannot be
-                      undone
+                      <span className="break-words font-semibold">{selectedProject?.name}</span>?
+                      All of the data related to the project will be permanently removed. This
+                      action cannot be undone
                     </p>
                   </span>
                   <div className="text-custom-text-200">
                     <p className="break-words text-sm ">
                       Enter the project name{" "}
-                      <span className="font-medium text-custom-text-100">{data?.name}</span> to
-                      continue:
+                      <span className="font-medium text-custom-text-100">
+                        {selectedProject?.name}
+                      </span>{" "}
+                      to continue:
                     </p>
-                    <Controller
-                      control={control}
+                    <Input
+                      type="text"
+                      placeholder="Project name"
+                      className="mt-2"
+                      value={confirmProjectName}
+                      onChange={(e) => {
+                        setConfirmProjectName(e.target.value);
+                      }}
                       name="projectName"
-                      render={({ field: { onChange, value } }) => (
-                        <Input
-                          type="text"
-                          placeholder="Project name"
-                          className="mt-2"
-                          value={value}
-                          onChange={onChange}
-                        />
-                      )}
                     />
                   </div>
                   <div className="text-custom-text-200">
@@ -164,27 +167,31 @@ export const DeleteProjectModal: React.FC<TConfirmProjectDeletionProps> = ({
                       <span className="font-medium text-custom-text-100">delete my project</span>{" "}
                       below:
                     </p>
-                    <Controller
-                      control={control}
-                      name="confirmDelete"
-                      render={({ field: { onChange, value } }) => (
-                        <Input
-                          type="text"
-                          placeholder="Enter 'delete my project'"
-                          className="mt-2"
-                          onChange={onChange}
-                          value={value}
-                        />
-                      )}
+                    <Input
+                      type="text"
+                      placeholder="Enter 'delete my project'"
+                      className="mt-2"
+                      onChange={(e) => {
+                        if (e.target.value === "delete my project") {
+                          setConfirmDeleteMyProject(true);
+                        } else {
+                          setConfirmDeleteMyProject(false);
+                        }
+                      }}
+                      name="typeDelete"
                     />
                   </div>
                   <div className="flex justify-end gap-2">
                     <SecondaryButton onClick={handleClose}>Cancel</SecondaryButton>
-                    <DangerButton type="submit" disabled={!canDelete} loading={isSubmitting}>
-                      {isSubmitting ? "Deleting..." : "Delete Project"}
+                    <DangerButton
+                      onClick={handleDeletion}
+                      disabled={!canDelete}
+                      loading={isDeleteLoading}
+                    >
+                      {isDeleteLoading ? "Deleting..." : "Delete Project"}
                     </DangerButton>
                   </div>
-                </form>
+                </div>
               </Dialog.Panel>
             </Transition.Child>
           </div>

apps/app/components/project/sidebar-list.tsx

@@ -9,10 +9,11 @@ import { DragDropContext, Draggable, DropResult, Droppable } from "react-beautif
 import { Disclosure, Transition } from "@headlessui/react";
 // hooks
 import useToast from "hooks/use-toast";
+import useTheme from "hooks/use-theme";
 import useUserAuth from "hooks/use-user-auth";
 import useProjects from "hooks/use-projects";
 // components
-import { CreateProjectModal, DeleteProjectModal, SingleSidebarProject } from "components/project";
+import { DeleteProjectModal, SingleSidebarProject } from "components/project";
 // services
 import projectService from "services/project.service";
 // icons
@@ -31,7 +32,6 @@ import { useMobxStore } from "lib/mobx/store-provider";
 export const ProjectSidebarList: FC = () => {
   const store: any = useMobxStore();
 
-  const [isProjectModalOpen, setIsProjectModalOpen] = useState(false);
   const [deleteProjectModal, setDeleteProjectModal] = useState(false);
   const [projectToDelete, setProjectToDelete] = useState<IProject | null>(null);
 
@@ -41,15 +41,18 @@ export const ProjectSidebarList: FC = () => {
   const containerRef = useRef<HTMLDivElement | null>(null);
 
   const router = useRouter();
-  const { workspaceSlug } = router.query;
+  const { workspaceSlug, projectId } = router.query;
 
   const { user } = useUserAuth();
+
+  const { collapsed: sidebarCollapse } = useTheme();
   const { setToastAlert } = useToast();
 
   const { projects: allProjects } = useProjects();
 
   const joinedProjects = allProjects?.filter((p) => p.sort_order);
   const favoriteProjects = allProjects?.filter((p) => p.is_favorite);
+  const otherProjects = allProjects?.filter((p) => p.sort_order === null);
 
   const orderedJoinedProjects: IProject[] | undefined = joinedProjects
     ? orderArrayBy(joinedProjects, "sort_order", "ascending")
@@ -148,12 +151,6 @@ export const ProjectSidebarList: FC = () => {
 
   return (
     <>
-      <CreateProjectModal
-        isOpen={isProjectModalOpen}
-        setIsOpen={setIsProjectModalOpen}
-        setToFavorite
-        user={user}
-      />
       <DeleteProjectModal
         isOpen={deleteProjectModal}
         onClose={() => setDeleteProjectModal(false)}
@@ -175,25 +172,17 @@ export const ProjectSidebarList: FC = () => {
                     {({ open }) => (
                       <>
                         {!store?.theme?.sidebarCollapsed && (
-                          <div className="group flex justify-between items-center text-xs px-1.5 rounded text-custom-sidebar-text-400 hover:bg-custom-sidebar-background-80 w-full">
-                            <Disclosure.Button
-                              as="button"
-                              type="button"
-                              className="group flex items-center gap-1 px-1.5 text-xs font-semibold text-custom-sidebar-text-400 text-left hover:bg-custom-sidebar-background-80 rounded w-full whitespace-nowrap"
-                            >
-                              Favorites
-                              <Icon
-                                iconName={open ? "arrow_drop_down" : "arrow_right"}
-                                className="group-hover:opacity-100 opacity-0 !text-lg"
-                              />
-                            </Disclosure.Button>
-                            <button
-                              className="group-hover:opacity-100 opacity-0"
-                              onClick={() => setIsProjectModalOpen(true)}
-                            >
-                              <Icon iconName="add" />
-                            </button>
-                          </div>
+                          <Disclosure.Button
+                            as="button"
+                            type="button"
+                            className="group flex items-center gap-1 px-1.5 text-xs font-semibold text-custom-sidebar-text-400 text-left hover:bg-custom-sidebar-background-80 rounded w-full whitespace-nowrap"
+                          >
+                            Favorites
+                            <Icon
+                              iconName={open ? "arrow_drop_down" : "arrow_right"}
+                              className="group-hover:opacity-100 opacity-0 !text-lg"
+                            />
+                          </Disclosure.Button>
                         )}
                         <Disclosure.Panel as="div" className="space-y-2">
                           {orderedFavProjects.map((project, index) => (
@@ -252,7 +241,10 @@ export const ProjectSidebarList: FC = () => {
                             </Disclosure.Button>
                             <button
                               className="group-hover:opacity-100 opacity-0"
-                              onClick={() => setIsProjectModalOpen(true)}
+                              onClick={() => {
+                                const e = new KeyboardEvent("keydown", { key: "p" });
+                                document.dispatchEvent(e);
+                              }}
                             >
                               <Icon iconName="add" />
                             </button>
@@ -296,10 +288,10 @@ export const ProjectSidebarList: FC = () => {
           </Droppable>
         </DragDropContext>
 
-        {joinedProjects && joinedProjects.length === 0 && (
+        {allProjects && allProjects.length === 0 && (
           <button
             type="button"
-            className="flex w-full items-center gap-2 px-3 text-sm text-custom-sidebar-text-200"
+            className="flex w-full items-center gap-2 px-3 py-2 text-sm text-custom-sidebar-text-200 mt-5"
             onClick={() => {
               const e = new KeyboardEvent("keydown", {
                 key: "p",

apps/app/components/tiptap/bubble-menu/index.tsx

@@ -15,36 +15,36 @@ export interface BubbleMenuItem {
 
 type EditorBubbleMenuProps = Omit<BubbleMenuProps, "children">;
 
-export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: any) => {
+export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
   const items: BubbleMenuItem[] = [
     {
       name: "bold",
-      isActive: () => props.editor?.isActive("bold"),
-      command: () => props.editor?.chain().focus().toggleBold().run(),
+      isActive: () => props.editor.isActive("bold"),
+      command: () => props.editor.chain().focus().toggleBold().run(),
       icon: BoldIcon,
     },
     {
       name: "italic",
-      isActive: () => props.editor?.isActive("italic"),
-      command: () => props.editor?.chain().focus().toggleItalic().run(),
+      isActive: () => props.editor.isActive("italic"),
+      command: () => props.editor.chain().focus().toggleItalic().run(),
       icon: ItalicIcon,
     },
     {
       name: "underline",
-      isActive: () => props.editor?.isActive("underline"),
-      command: () => props.editor?.chain().focus().toggleUnderline().run(),
+      isActive: () => props.editor.isActive("underline"),
+      command: () => props.editor.chain().focus().toggleUnderline().run(),
       icon: UnderlineIcon,
     },
     {
       name: "strike",
-      isActive: () => props.editor?.isActive("strike"),
-      command: () => props.editor?.chain().focus().toggleStrike().run(),
+      isActive: () => props.editor.isActive("strike"),
+      command: () => props.editor.chain().focus().toggleStrike().run(),
       icon: StrikethroughIcon,
     },
     {
       name: "code",
-      isActive: () => props.editor?.isActive("code"),
-      command: () => props.editor?.chain().focus().toggleCode().run(),
+      isActive: () => props.editor.isActive("code"),
+      command: () => props.editor.chain().focus().toggleCode().run(),
       icon: CodeIcon,
     },
   ];
@@ -78,7 +78,7 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: any) => {
       className="flex w-fit divide-x divide-custom-border-300 rounded border border-custom-border-300 bg-custom-background-100 shadow-xl"
     >
       <NodeSelector
-        editor={props.editor!}
+        editor={props.editor}
         isOpen={isNodeSelectorOpen}
         setIsOpen={() => {
           setIsNodeSelectorOpen(!isNodeSelectorOpen);
@@ -86,7 +86,7 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: any) => {
         }}
       />
       <LinkSelector
-        editor={props.editor!!}
+        editor={props.editor}
         isOpen={isLinkSelectorOpen}
         setIsOpen={() => {
           setIsLinkSelectorOpen(!isLinkSelectorOpen);

apps/app/components/tiptap/bubble-menu/link-selector.tsx

@@ -1,27 +1,17 @@
 import { Editor } from "@tiptap/core";
 import { Check, Trash } from "lucide-react";
-import { Dispatch, FC, SetStateAction, useCallback, useEffect, useRef } from "react";
+import { Dispatch, FC, SetStateAction, useEffect, useRef } from "react";
 import { cn } from "../utils";
-import isValidHttpUrl from "./utils/link-validator";
+
 interface LinkSelectorProps {
   editor: Editor;
   isOpen: boolean;
   setIsOpen: Dispatch<SetStateAction<boolean>>;
 }
 
-
 export const LinkSelector: FC<LinkSelectorProps> = ({ editor, isOpen, setIsOpen }) => {
   const inputRef = useRef<HTMLInputElement>(null);
 
-  const onLinkSubmit = useCallback(() => {
-    const input = inputRef.current;
-    const url = input?.value;
-    if (url && isValidHttpUrl(url)) {
-      editor.chain().focus().setLink({ href: url }).run();
-      setIsOpen(false);
-    }
-  }, [editor, inputRef, setIsOpen]);
-
   useEffect(() => {
     inputRef.current && inputRef.current?.focus();
   });
@@ -48,13 +38,15 @@ export const LinkSelector: FC<LinkSelectorProps> = ({ editor, isOpen, setIsOpen
         </p>
       </button>
       {isOpen && (
-        <div
-          className="fixed top-full z-[99999] mt-1 flex w-60 overflow-hidden rounded border border-custom-border-300 bg-custom-background-100 dow-xl animate-in fade-in slide-in-from-top-1"
-          onKeyDown={(e) => {
-            if (e.key === "Enter") {
-              e.preventDefault(); onLinkSubmit();
-            }
+        <form
+          onSubmit={(e) => {
+            e.preventDefault();
+            const form = e.target as HTMLFormElement;
+            const input = form.elements[0] as HTMLInputElement;
+            editor.chain().focus().setLink({ href: input.value }).run();
+            setIsOpen(false);
           }}
+          className="fixed top-full z-[99999] mt-1 flex w-60 overflow-hidden rounded border border-custom-border-300 bg-custom-background-100 dow-xl animate-in fade-in slide-in-from-top-1"
         >
           <input
             ref={inputRef}
@@ -65,7 +57,6 @@ export const LinkSelector: FC<LinkSelectorProps> = ({ editor, isOpen, setIsOpen
           />
           {editor.getAttributes("link").href ? (
             <button
-              type="button"
               className="flex items-center rounded-sm p-1 text-red-600 transition-all hover:bg-red-100 dark:hover:bg-red-800"
               onClick={() => {
                 editor.chain().focus().unsetLink().run();
@@ -75,15 +66,11 @@ export const LinkSelector: FC<LinkSelectorProps> = ({ editor, isOpen, setIsOpen
               <Trash className="h-4 w-4" />
             </button>
           ) : (
-            <button className="flex items-center rounded-sm p-1 text-custom-text-300 transition-all hover:bg-custom-background-90" type="button"
-              onClick={() => {
-                onLinkSubmit();
-              }}
-            >
+            <button className="flex items-center rounded-sm p-1 text-custom-text-300 transition-all hover:bg-custom-background-90">
               <Check className="h-4 w-4" />
             </button>
           )}
-        </div>
+        </form>
       )}
     </div>
   );

apps/app/components/tiptap/bubble-menu/utils/link-validator.tsx

@@ -1,12 +0,0 @@
-export default function isValidHttpUrl(string: string): boolean {
-  let url;
-
-  try {
-    url = new URL(string);
-  } catch (_) {
-    return false;
-  }
-
-  return url.protocol === "http:" || url.protocol === "https:";
-}
-

apps/app/components/tiptap/extensions/image-resize.tsx

@@ -1,57 +0,0 @@
-import { Editor } from "@tiptap/react";
-import Moveable from "react-moveable";
-
-export const ImageResizer = ({ editor }: { editor: Editor }) => {
-  const updateMediaSize = () => {
-    const imageInfo = document.querySelector(
-      ".ProseMirror-selectednode",
-    ) as HTMLImageElement;
-    if (imageInfo) {
-      const selection = editor.state.selection;
-      editor.commands.setImage({
-        src: imageInfo.src,
-        width: Number(imageInfo.style.width.replace("px", "")),
-        height: Number(imageInfo.style.height.replace("px", "")),
-      } as any);
-      editor.commands.setNodeSelection(selection.from);
-    }
-  };
-
-  return (
-    <>
-      <Moveable
-        target={document.querySelector(".ProseMirror-selectednode") as any}
-        container={null}
-        origin={false}
-        edge={false}
-        throttleDrag={0}
-        keepRatio={true}
-        resizable={true}
-        throttleResize={0}
-        onResize={({
-          target,
-          width,
-          height,
-          delta,
-        }:
-          any) => {
-          delta[0] && (target!.style.width = `${width}px`);
-          delta[1] && (target!.style.height = `${height}px`);
-        }}
-        onResizeEnd={() => {
-          updateMediaSize();
-        }}
-        scalable={true}
-        renderDirections={["w", "e"]}
-        onScale={({
-          target,
-          transform,
-        }:
-          any) => {
-          target!.style.transform = transform;
-        }}
-      />
-    </>
-  );
-};
-

apps/app/components/tiptap/extensions/index.tsx

@@ -1,6 +1,7 @@
 import StarterKit from "@tiptap/starter-kit";
 import HorizontalRule from "@tiptap/extension-horizontal-rule";
 import TiptapLink from "@tiptap/extension-link";
+import TiptapImage from "@tiptap/extension-image";
 import Placeholder from "@tiptap/extension-placeholder";
 import TiptapUnderline from "@tiptap/extension-underline";
 import TextStyle from "@tiptap/extension-text-style";
@@ -17,13 +18,18 @@ import { InputRule } from "@tiptap/core";
 import ts from "highlight.js/lib/languages/typescript";
 
 import "highlight.js/styles/github-dark.css";
+import UploadImagesPlugin from "../plugins/upload-image";
 import UniqueID from "@tiptap-pro/extension-unique-id";
-import UpdatedImage from "./updated-image";
-import isValidHttpUrl from "../bubble-menu/utils/link-validator";
 
 lowlight.registerLanguage("ts", ts);
 
-export const TiptapExtensions = (workspaceSlug: string, setIsSubmitting?: (isSubmitting: "submitting" | "submitted" | "saved") => void) => [
+const CustomImage = TiptapImage.extend({
+  addProseMirrorPlugins() {
+    return [UploadImagesPlugin()];
+  },
+});
+
+export const TiptapExtensions = [
   StarterKit.configure({
     bulletList: {
       HTMLAttributes: {
@@ -87,14 +93,13 @@ export const TiptapExtensions = (workspaceSlug: string, setIsSubmitting?: (isSub
     },
   }),
   TiptapLink.configure({
-    protocols: ["http", "https"],
-    validate: (url) => isValidHttpUrl(url),
     HTMLAttributes: {
       class:
         "text-custom-primary-300 underline underline-offset-[3px] hover:text-custom-primary-500 transition-colors cursor-pointer",
     },
   }),
-  UpdatedImage.configure({
+  CustomImage.configure({
+    allowBase64: true,
     HTMLAttributes: {
       class: "rounded-lg border border-custom-border-300",
     },
@@ -112,7 +117,7 @@ export const TiptapExtensions = (workspaceSlug: string, setIsSubmitting?: (isSub
   UniqueID.configure({
     types: ["image"],
   }),
-  SlashCommand(workspaceSlug, setIsSubmitting),
+  SlashCommand,
   TiptapUnderline,
   TextStyle,
   Color,

apps/app/components/tiptap/extensions/updated-image.tsx

@@ -1,22 +0,0 @@
-import Image from "@tiptap/extension-image";
-import TrackImageDeletionPlugin from "../plugins/delete-image";
-import UploadImagesPlugin from "../plugins/upload-image";
-
-const UpdatedImage = Image.extend({
-  addProseMirrorPlugins() {
-    return [UploadImagesPlugin(), TrackImageDeletionPlugin()];
-  },
-  addAttributes() {
-    return {
-      ...this.parent?.(),
-      width: {
-        default: '35%',
-      },
-      height: {
-        default: null,
-      },
-    };
-  },
-});
-
-export default UpdatedImage;

apps/app/components/tiptap/index.tsx

@@ -1,10 +1,14 @@
+// @ts-nocheck
 import { useEditor, EditorContent, Editor } from "@tiptap/react";
 import { useDebouncedCallback } from "use-debounce";
 import { EditorBubbleMenu } from "./bubble-menu";
 import { TiptapExtensions } from "./extensions";
 import { TiptapEditorProps } from "./props";
-import { useImperativeHandle, useRef } from "react";
-import { ImageResizer } from "./extensions/image-resize";
+import { Node } from "@tiptap/pm/model";
+import { Editor as CoreEditor } from "@tiptap/core";
+import { useCallback, useImperativeHandle, useRef } from "react";
+import { EditorState } from "@tiptap/pm/state";
+import fileService from "services/file.service";
 
 export interface ITiptapRichTextEditor {
   value: string;
@@ -14,8 +18,6 @@ export interface ITiptapRichTextEditor {
   editorContentCustomClassNames?: string;
   onChange?: (json: any, html: string) => void;
   setIsSubmitting?: (isSubmitting: "submitting" | "submitted" | "saved") => void;
-  setShouldShowAlert?: (showAlert: boolean) => void;
-  workspaceSlug: string;
   editable?: boolean;
   forwardedRef?: any;
   debouncedUpdatesEnabled?: boolean;
@@ -28,24 +30,22 @@ const Tiptap = (props: ITiptapRichTextEditor) => {
     forwardedRef,
     editable,
     setIsSubmitting,
-    setShouldShowAlert,
     editorContentCustomClassNames,
     value,
     noBorder,
-    workspaceSlug,
     borderOnFocus,
     customClassName,
   } = props;
 
   const editor = useEditor({
     editable: editable ?? true,
-    editorProps: TiptapEditorProps(workspaceSlug, setIsSubmitting),
-    extensions: TiptapExtensions(workspaceSlug, setIsSubmitting),
+    editorProps: TiptapEditorProps,
+    extensions: TiptapExtensions,
     content: value,
     onUpdate: async ({ editor }) => {
       // for instant feedback loop
       setIsSubmitting?.("submitting");
-      setShouldShowAlert?.(true);
+      checkForNodeDeletions(editor);
       if (debouncedUpdatesEnabled) {
         debouncedUpdates({ onChange, editor });
       } else {
@@ -65,6 +65,45 @@ const Tiptap = (props: ITiptapRichTextEditor) => {
     },
   }));
 
+  const previousState = useRef<EditorState>();
+
+  const onNodeDeleted = useCallback(async (node: Node) => {
+    if (node.type.name === "image") {
+      const assetUrlWithWorkspaceId = new URL(node.attrs.src).pathname.substring(1);
+      const resStatus = await fileService.deleteImage(assetUrlWithWorkspaceId);
+      if (resStatus === 204) {
+        console.log("file deleted successfully");
+      }
+    }
+  }, []);
+
+  const checkForNodeDeletions = useCallback(
+    (editor: CoreEditor) => {
+      const prevNodesById: Record<string, Node> = {};
+      previousState.current?.doc.forEach((node) => {
+        if (node.attrs.id) {
+          prevNodesById[node.attrs.id] = node;
+        }
+      });
+
+      const nodesById: Record<string, Node> = {};
+      editor.state?.doc.forEach((node) => {
+        if (node.attrs.id) {
+          nodesById[node.attrs.id] = node;
+        }
+      });
+
+      previousState.current = editor.state;
+
+      for (const [id, node] of Object.entries(prevNodesById)) {
+        if (nodesById[id] === undefined) {
+          onNodeDeleted(node);
+        }
+      }
+    },
+    [onNodeDeleted]
+  );
+
   const debouncedUpdates = useDebouncedCallback(async ({ onChange, editor }) => {
     setTimeout(async () => {
       if (onChange) {
@@ -73,9 +112,10 @@ const Tiptap = (props: ITiptapRichTextEditor) => {
     }, 500);
   }, 1000);
 
-  const editorClassNames = `relative w-full max-w-screen-lg sm:rounded-lg mt-2 p-3 relative focus:outline-none rounded-md
-      ${noBorder ? "" : "border border-custom-border-200"} ${borderOnFocus ? "focus:border border-custom-border-300" : "focus:border-0"
-    } ${customClassName}`;
+  const editorClassNames = `relative w-full max-w-screen-lg mt-2 p-3 relative focus:outline-none rounded-lg
+      ${noBorder ? "" : "border border-custom-border-200"} ${
+    borderOnFocus ? "focus:border border-custom-border-300" : "focus:border-0"
+  } ${customClassName}`;
 
   if (!editor) return null;
   editorRef.current = editor;
@@ -91,7 +131,6 @@ const Tiptap = (props: ITiptapRichTextEditor) => {
       {editor && <EditorBubbleMenu editor={editor} />}
       <div className={`${editorContentCustomClassNames}`}>
         <EditorContent editor={editor} />
-        {editor?.isActive("image") && <ImageResizer editor={editor} />}
       </div>
     </div>
   );

apps/app/components/tiptap/plugins/delete-image.tsx

@@ -1,56 +0,0 @@
-import { Plugin, PluginKey } from "@tiptap/pm/state";
-import { Node as ProseMirrorNode } from '@tiptap/pm/model';
-import fileService from "services/file.service";
-
-const deleteKey = new PluginKey("delete-image");
-
-const TrackImageDeletionPlugin = () =>
-  new Plugin({
-    key: deleteKey,
-    appendTransaction: (transactions, oldState, newState) => {
-      transactions.forEach((transaction) => {
-        if (!transaction.docChanged) return;
-
-        const removedImages: ProseMirrorNode[] = [];
-
-        oldState.doc.descendants((oldNode, oldPos) => {
-          if (oldNode.type.name !== 'image') return;
-
-          if (!newState.doc.resolve(oldPos).parent) return;
-          const newNode = newState.doc.nodeAt(oldPos);
-
-          // Check if the node has been deleted or replaced
-          if (!newNode || newNode.type.name !== 'image') {
-            // Check if the node still exists elsewhere in the document
-            let nodeExists = false;
-            newState.doc.descendants((node) => {
-              if (node.attrs.id === oldNode.attrs.id) {
-                nodeExists = true;
-              }
-            });
-
-            if (!nodeExists) {
-              removedImages.push(oldNode as ProseMirrorNode);
-            }
-          }
-        });
-
-        removedImages.forEach((node) => {
-          const src = node.attrs.src;
-          onNodeDeleted(src);
-        });
-      });
-
-      return null;
-    },
-  });
-
-export default TrackImageDeletionPlugin;
-
-async function onNodeDeleted(src: string) {
-  const assetUrlWithWorkspaceId = new URL(src).pathname.substring(1);
-  const resStatus = await fileService.deleteImage(assetUrlWithWorkspaceId);
-  if (resStatus === 204) {
-    console.log("Image deleted successfully");
-  }
-}

apps/app/components/tiptap/plugins/upload-image.tsx

@@ -57,7 +57,7 @@ function findPlaceholder(state: EditorState, id: {}) {
   return found.length ? found[0].from : null;
 }
 
-export async function startImageUpload(file: File, view: EditorView, pos: number, workspaceSlug: string, setIsSubmitting?: (isSubmitting: "submitting" | "submitted" | "saved") => void) {
+export async function startImageUpload(file: File, view: EditorView, pos: number) {
   if (!file.type.includes("image/")) {
     return;
   } else if (file.size / 1024 / 1024 > 20) {
@@ -82,11 +82,7 @@ export async function startImageUpload(file: File, view: EditorView, pos: number
     view.dispatch(tr);
   };
 
-  if (!workspaceSlug) {
-    return;
-  }
-  setIsSubmitting?.("submitting")
-  const src = await UploadImageHandler(file, workspaceSlug);
+  const src = await UploadImageHandler(file);
   const { schema } = view.state;
   pos = findPlaceholder(view.state, id);
 
@@ -100,10 +96,7 @@ export async function startImageUpload(file: File, view: EditorView, pos: number
   view.dispatch(transaction);
 }
 
-const UploadImageHandler = (file: File, workspaceSlug: string): Promise<string> => {
-  if (!workspaceSlug) {
-    return Promise.reject("Workspace slug is missing");
-  }
+const UploadImageHandler = (file: File): Promise<string> => {
   try {
     const formData = new FormData();
     formData.append("asset", file);
@@ -111,7 +104,7 @@ const UploadImageHandler = (file: File, workspaceSlug: string): Promise<string>
 
     return new Promise(async (resolve, reject) => {
       const imageUrl = await fileService
-        .uploadFile(workspaceSlug, formData)
+        .uploadFile("plane", formData)
         .then((response) => response.asset);
 
       const image = new Image();

apps/app/components/tiptap/props.tsx

@@ -1,56 +1,56 @@
 import { EditorProps } from "@tiptap/pm/view";
 import { startImageUpload } from "./plugins/upload-image";
 
-export function TiptapEditorProps(workspaceSlug: string, setIsSubmitting?: (isSubmitting: "submitting" | "submitted" | "saved") => void): EditorProps {
-  return {
-    attributes: {
-      class: `prose prose-brand max-w-full prose-headings:font-display font-default focus:outline-none`,
-    },
-    handleDOMEvents: {
-      keydown: (_view, event) => {
-        // prevent default event listeners from firing when slash command is active
-        if (["ArrowUp", "ArrowDown", "Enter"].includes(event.key)) {
-          const slashCommand = document.querySelector("#slash-command");
-          if (slashCommand) {
-            return true;
-          }
+export const TiptapEditorProps: EditorProps = {
+  attributes: {
+    class: `prose prose-brand max-w-full prose-headings:font-display font-default focus:outline-none`,
+  },
+  handleDOMEvents: {
+    keydown: (_view, event) => {
+      // prevent default event listeners from firing when slash command is active
+      if (["ArrowUp", "ArrowDown", "Enter"].includes(event.key)) {
+        const slashCommand = document.querySelector("#slash-command");
+        if (slashCommand) {
+          return true;
         }
-      },
-    },
-    handlePaste: (view, event) => {
-      if (
-        event.clipboardData &&
-        event.clipboardData.files &&
-        event.clipboardData.files[0]
-      ) {
-        event.preventDefault();
-        const file = event.clipboardData.files[0];
-        const pos = view.state.selection.from;
-        startImageUpload(file, view, pos, workspaceSlug, setIsSubmitting);
-        return true;
       }
-      return false;
     },
-    handleDrop: (view, event, _slice, moved) => {
-      if (
-        !moved &&
-        event.dataTransfer &&
-        event.dataTransfer.files &&
-        event.dataTransfer.files[0]
-      ) {
-        event.preventDefault();
-        const file = event.dataTransfer.files[0];
-        const coordinates = view.posAtCoords({
-          left: event.clientX,
-          top: event.clientY,
-        });
-        // here we deduct 1 from the pos or else the image will create an extra node
-        if (coordinates) {
-          startImageUpload(file, view, coordinates.pos - 1, workspaceSlug, setIsSubmitting);
-        }
-        return true;
+  },
+  handlePaste: (view, event) => {
+    if (
+      event.clipboardData &&
+      event.clipboardData.files &&
+      event.clipboardData.files[0]
+    ) {
+      event.preventDefault();
+      const file = event.clipboardData.files[0];
+      const pos = view.state.selection.from;
+
+      startImageUpload(file, view, pos);
+      return true;
+    }
+    return false;
+  },
+  handleDrop: (view, event, _slice, moved) => {
+    if (
+      !moved &&
+      event.dataTransfer &&
+      event.dataTransfer.files &&
+      event.dataTransfer.files[0]
+    ) {
+      event.preventDefault();
+      const file = event.dataTransfer.files[0];
+      const coordinates = view.posAtCoords({
+        left: event.clientX,
+        top: event.clientY,
+      });
+      // here we deduct 1 from the pos or else the image will create an extra node
+      if (coordinates) {
+        startImageUpload(file, view, coordinates.pos - 1);
       }
-      return false;
-    },
-  };
-}
+      return true;
+    }
+    return false;
+  },
+};
+

apps/app/components/tiptap/slash-command/index.tsx

@@ -52,7 +52,7 @@ const Command = Extension.create({
   },
 });
 
-const getSuggestionItems = (workspaceSlug: string, setIsSubmitting?: (isSubmitting: "submitting" | "submitted" | "saved") => void) => ({ query }: { query: string }) =>
+const getSuggestionItems = ({ query }: { query: string }) =>
   [
     {
       title: "Text",
@@ -163,7 +163,7 @@ const getSuggestionItems = (workspaceSlug: string, setIsSubmitting?: (isSubmitti
           if (input.files?.length) {
             const file = input.files[0];
             const pos = editor.view.state.selection.from;
-            startImageUpload(file, editor.view, pos, workspaceSlug, setIsSubmitting);
+            startImageUpload(file, editor.view, pos);
           }
         };
         input.click();
@@ -328,12 +328,11 @@ const renderItems = () => {
   };
 };
 
-export const SlashCommand = (workspaceSlug: string, setIsSubmitting?: (isSubmitting: "submitting" | "submitted" | "saved") => void) =>
-  Command.configure({
-    suggestion: {
-      items: getSuggestionItems(workspaceSlug, setIsSubmitting),
-      render: renderItems,
-    },
-  });
+const SlashCommand = Command.configure({
+  suggestion: {
+    items: getSuggestionItems,
+    render: renderItems,
+  },
+});
 
 export default SlashCommand;

apps/app/components/ui/dropdowns/context-menu.tsx

@@ -1,76 +1,47 @@
-import React, { useEffect, useRef } from "react";
+import React, { useEffect } from "react";
 
 import Link from "next/link";
 
-// hooks
-import useOutsideClickDetector from "hooks/use-outside-click-detector";
-
 type Props = {
-  clickEvent: React.MouseEvent | null;
+  position: {
+    x: number;
+    y: number;
+  };
   children: React.ReactNode;
   title?: string | JSX.Element;
   isOpen: boolean;
   setIsOpen: React.Dispatch<React.SetStateAction<boolean>>;
 };
 
-const ContextMenu = ({ clickEvent, children, title, isOpen, setIsOpen }: Props) => {
-  const contextMenuRef = useRef<HTMLDivElement>(null);
-
-  // Close the context menu when clicked outside
-  useOutsideClickDetector(contextMenuRef, () => {
-    if (isOpen) setIsOpen(false);
-  });
-
+const ContextMenu = ({ position, children, title, isOpen, setIsOpen }: Props) => {
   useEffect(() => {
     const hideContextMenu = () => {
       if (isOpen) setIsOpen(false);
     };
 
-    const escapeKeyEvent = (e: KeyboardEvent) => {
-      if (e.key === "Escape") hideContextMenu();
-    };
-
     window.addEventListener("click", hideContextMenu);
-    window.addEventListener("keydown", escapeKeyEvent);
+    window.addEventListener("keydown", (e: KeyboardEvent) => {
+      if (e.key === "Escape") hideContextMenu();
+    });
 
     return () => {
       window.removeEventListener("click", hideContextMenu);
-      window.removeEventListener("keydown", escapeKeyEvent);
+      window.removeEventListener("keydown", hideContextMenu);
     };
   }, [isOpen, setIsOpen]);
 
-  useEffect(() => {
-    const contextMenu = contextMenuRef.current;
-
-    if (contextMenu && isOpen) {
-      const contextMenuWidth = contextMenu.clientWidth;
-      const contextMenuHeight = contextMenu.clientHeight;
-
-      const clickX = clickEvent?.pageX || 0;
-      const clickY = clickEvent?.pageY || 0;
-
-      let top = clickY;
-      // check if there's enough space at the bottom, otherwise show at the top
-      if (clickY + contextMenuHeight > window.innerHeight) top = clickY - contextMenuHeight;
-
-      // check if there's enough space on the right, otherwise show on the left
-      let left = clickX;
-      if (clickX + contextMenuWidth > window.innerWidth) left = clickX - contextMenuWidth;
-
-      contextMenu.style.top = `${top}px`;
-      contextMenu.style.left = `${left}px`;
-    }
-  }, [clickEvent, isOpen]);
-
   return (
     <div
-      className={`fixed z-50 top-0 left-0 h-full w-full ${
+      className={`fixed z-20 h-full w-full ${
         isOpen ? "pointer-events-auto opacity-100" : "pointer-events-none opacity-0"
       }`}
     >
       <div
-        ref={contextMenuRef}
-        className={`fixed z-50 flex min-w-[8rem] flex-col items-stretch gap-1 rounded-md border border-custom-border-200 bg-custom-background-90 p-2 text-xs shadow-lg`}
+        className={`fixed z-20 flex min-w-[8rem] flex-col items-stretch gap-1 rounded-md border border-custom-border-200 bg-custom-background-90 p-2 text-xs shadow-lg`}
+        style={{
+          left: `${position.x}px`,
+          top: `${position.y}px`,
+        }}
       >
         {title && (
           <h4 className="border-b border-custom-border-200 px-1 py-1 pb-2 text-[0.8rem] font-medium">

apps/app/components/ui/input/index.tsx

@@ -29,9 +29,9 @@ export const Input: React.FC<Props> = ({
       type={type}
       id={id}
       value={value}
-      {...(register && register(name ?? "", validations))}
+      {...(register && register(name, validations))}
       onChange={(e) => {
-        register && register(name ?? "").onChange(e);
+        register && register(name).onChange(e);
         onChange && onChange(e);
       }}
       className={`block rounded-md bg-transparent text-sm focus:outline-none placeholder-custom-text-400 ${

apps/app/components/ui/input/types.d.ts

@@ -3,7 +3,7 @@ import type { UseFormRegister, RegisterOptions } from "react-hook-form";
 
 export interface Props extends React.ComponentPropsWithoutRef<"input"> {
   label?: string;
-  name?: string;
+  name: string;
   value?: string | number | readonly string[];
   mode?: "primary" | "transparent" | "trueTransparent" | "secondary" | "disabled";
   register?: UseFormRegister<any>;

apps/app/components/ui/labels-list.tsx

@@ -1,11 +1,7 @@
 import React from "react";
-// ui
-import { Tooltip } from "components/ui";
-// types
-import { IIssueLabels } from "types";
 
 type IssueLabelsListProps = {
-  labels?: (IIssueLabels | undefined)[];
+  labels?: (string | undefined)[];
   length?: number;
   showLength?: boolean;
 };
@@ -18,16 +14,18 @@ export const IssueLabelsList: React.FC<IssueLabelsListProps> = ({
   <>
     {labels && (
       <>
-        <Tooltip
-          position="top"
-          tooltipHeading="Labels"
-          tooltipContent={labels.map((l) => l?.name).join(", ")}
-        >
-          <div className="flex items-center gap-1.5 px-2 py-1 text-custom-text-200 rounded shadow-sm border border-custom-border-300">
-            <span className="h-2 w-2 flex-shrink-0 rounded-full bg-custom-primary" />
-            {`${labels.length} Labels`}
+        {labels.slice(0, length).map((color, index) => (
+          <div className={`flex h-4 w-4 rounded-full ${index ? "-ml-3.5" : ""}`}>
+            <span
+              className={`h-4 w-4 flex-shrink-0 rounded-full border border-custom-border-200
+              `}
+              style={{
+                backgroundColor: color && color !== "" ? color : "#000000",
+              }}
+            />
           </div>
-        </Tooltip>
+        ))}
+        {labels.length > length ? <span>+{labels.length - length}</span> : null}
       </>
     )}
   </>

apps/app/components/workspace/create-workspace-form.tsx

@@ -45,7 +45,6 @@ const restrictedUrls = [
   "profile",
   "reset-password",
   "sign-up",
-  "spaces",
   "workspace-member-invitation",
 ];
 

apps/app/components/workspace/delete-workspace-modal.tsx

@@ -1,11 +1,9 @@
-import React from "react";
+import React, { useEffect, useState } from "react";
 
 import { useRouter } from "next/router";
 
 import { mutate } from "swr";
 
-// react-hook-form
-import { Controller, useForm } from "react-hook-form";
 // headless ui
 import { Dialog, Transition } from "@headlessui/react";
 // services
@@ -28,63 +26,57 @@ type Props = {
   user: ICurrentUserResponse | undefined;
 };
 
-const defaultValues = {
-  workspaceName: "",
-  confirmDelete: "",
-};
-
 export const DeleteWorkspaceModal: React.FC<Props> = ({ isOpen, data, onClose, user }) => {
-  const router = useRouter();
+  const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
+  const [confirmWorkspaceName, setConfirmWorkspaceName] = useState("");
+  const [confirmDeleteMyWorkspace, setConfirmDeleteMyWorkspace] = useState(false);
+
+  const [selectedWorkspace, setSelectedWorkspace] = useState<IWorkspace | null>(null);
+
+  const router = useRouter();
   const { setToastAlert } = useToast();
 
-  const {
-    control,
-    formState: { isSubmitting },
-    handleSubmit,
-    reset,
-    watch,
-  } = useForm({ defaultValues });
+  useEffect(() => {
+    if (data) setSelectedWorkspace(data);
+    else {
+      const timer = setTimeout(() => {
+        setSelectedWorkspace(null);
+        clearTimeout(timer);
+      }, 350);
+    }
+  }, [data]);
 
-  const canDelete =
-    watch("workspaceName") === data?.name && watch("confirmDelete") === "delete my workspace";
+  const canDelete = confirmWorkspaceName === data?.name && confirmDeleteMyWorkspace;
 
   const handleClose = () => {
-    const timer = setTimeout(() => {
-      reset(defaultValues);
-      clearTimeout(timer);
-    }, 350);
-
+    setIsDeleteLoading(false);
+    setConfirmWorkspaceName("");
+    setConfirmDeleteMyWorkspace(false);
     onClose();
   };
 
-  const onSubmit = async () => {
+  const handleDeletion = async () => {
+    setIsDeleteLoading(true);
     if (!data || !canDelete) return;
-
     await workspaceService
       .deleteWorkspace(data.slug, user)
       .then(() => {
         handleClose();
-
         router.push("/");
-
         mutate<IWorkspace[]>(USER_WORKSPACES, (prevData) =>
           prevData?.filter((workspace) => workspace.id !== data.id)
         );
-
         setToastAlert({
           type: "success",
-          title: "Success!",
-          message: "Workspace deleted successfully.",
+          message: "Workspace deleted successfully",
+          title: "Success",
         });
       })
-      .catch(() =>
-        setToastAlert({
-          type: "error",
-          title: "Error!",
-          message: "Something went wrong. Please try again later.",
-        })
-      );
+      .catch((error) => {
+        console.log(error);
+        setIsDeleteLoading(false);
+      });
   };
 
   return (
@@ -114,7 +106,7 @@ export const DeleteWorkspaceModal: React.FC<Props> = ({ isOpen, data, onClose, u
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
               <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-200 bg-custom-background-100 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl">
-                <form onSubmit={handleSubmit(onSubmit)} className="flex flex-col gap-6 p-6">
+                <div className="flex flex-col gap-6 p-6">
                   <div className="flex w-full items-center justify-start gap-6">
                     <span className="place-items-center rounded-full bg-red-500/20 p-4">
                       <ExclamationTriangleIcon
@@ -139,21 +131,20 @@ export const DeleteWorkspaceModal: React.FC<Props> = ({ isOpen, data, onClose, u
                   <div className="text-custom-text-200">
                     <p className="break-words text-sm ">
                       Enter the workspace name{" "}
-                      <span className="font-medium text-custom-text-100">{data?.name}</span> to
-                      continue:
+                      <span className="font-medium text-custom-text-100">
+                        {selectedWorkspace?.name}
+                      </span>{" "}
+                      to continue:
                     </p>
-                    <Controller
-                      control={control}
+                    <Input
+                      type="text"
+                      placeholder="Workspace name"
+                      className="mt-2"
+                      value={confirmWorkspaceName}
+                      onChange={(e) => {
+                        setConfirmWorkspaceName(e.target.value);
+                      }}
                       name="workspaceName"
-                      render={({ field: { onChange, value } }) => (
-                        <Input
-                          type="text"
-                          placeholder="Workspace name"
-                          className="mt-2"
-                          onChange={onChange}
-                          value={value}
-                        />
-                      )}
                     />
                   </div>
 
@@ -163,28 +154,28 @@ export const DeleteWorkspaceModal: React.FC<Props> = ({ isOpen, data, onClose, u
                       <span className="font-medium text-custom-text-100">delete my workspace</span>{" "}
                       below:
                     </p>
-                    <Controller
-                      control={control}
-                      name="confirmDelete"
-                      render={({ field: { onChange, value } }) => (
-                        <Input
-                          type="text"
-                          placeholder="Enter 'delete my workspace'"
-                          className="mt-2"
-                          onChange={onChange}
-                          value={value}
-                        />
-                      )}
+                    <Input
+                      type="text"
+                      placeholder="Enter 'delete my workspace'"
+                      className="mt-2"
+                      onChange={(e) => {
+                        if (e.target.value === "delete my workspace") {
+                          setConfirmDeleteMyWorkspace(true);
+                        } else {
+                          setConfirmDeleteMyWorkspace(false);
+                        }
+                      }}
+                      name="typeDelete"
                     />
                   </div>
 
                   <div className="flex justify-end gap-2">
                     <SecondaryButton onClick={handleClose}>Cancel</SecondaryButton>
-                    <DangerButton type="submit" disabled={!canDelete} loading={isSubmitting}>
-                      {isSubmitting ? "Deleting..." : "Delete Workspace"}
+                    <DangerButton onClick={handleDeletion} loading={isDeleteLoading || !canDelete}>
+                      {isDeleteLoading ? "Deleting..." : "Delete Workspace"}
                     </DangerButton>
                   </div>
-                </form>
+                </div>
               </Dialog.Panel>
             </Transition.Child>
           </div>

apps/app/components/workspace/issues-list.tsx

@@ -45,14 +45,12 @@ export const IssuesList: React.FC<Props> = ({ issues, type }) => {
           >
             <h4 className="capitalize">{type}</h4>
             <h4 className="col-span-2">Issue</h4>
-            <h4>{type === "overdue" ? "Due" : "Start"} Date</h4>
+            <h4>Due Date</h4>
           </div>
           <div className="max-h-72 overflow-y-scroll">
             {issues.length > 0 ? (
               issues.map((issue) => {
-                const date = type === "overdue" ? issue.target_date : issue.start_date;
-
-                const dateDifference = getDateDifference(new Date(date as string));
+                const dateDifference = getDateDifference(new Date(issue.target_date as string));
 
                 return (
                   <Link
@@ -77,7 +75,7 @@ export const IssuesList: React.FC<Props> = ({ issues, type }) => {
                         </h5>
                         <h5 className="col-span-2">{truncateText(issue.name, 30)}</h5>
                         <h5 className="cursor-default">
-                          {renderShortDateWithYearFormat(new Date(date?.toString() ?? ""))}
+                          {renderShortDateWithYearFormat(new Date(issue.target_date as string))}
                         </h5>
                       </div>
                     </a>

apps/app/hooks/use-outside-click-detector.tsx

@@ -8,10 +8,10 @@ const useOutsideClickDetector = (ref: React.RefObject<HTMLElement>, callback: ()
   };
 
   useEffect(() => {
-    document.addEventListener("mousedown", handleClick);
+    document.addEventListener("click", handleClick);
 
     return () => {
-      document.removeEventListener("mousedown", handleClick);
+      document.removeEventListener("click", handleClick);
     };
   });
 };

apps/app/package.json

@@ -52,10 +52,10 @@
     "highlight.js": "^11.8.0",
     "js-cookie": "^3.0.1",
     "lodash.debounce": "^4.0.8",
-    "lowlight": "^2.9.0",
-    "lucide-react": "^0.263.1",
     "mobx": "^6.10.0",
     "mobx-react-lite": "^4.0.3",
+    "lowlight": "^2.9.0",
+    "lucide-react": "^0.263.1",
     "next": "12.3.2",
     "next-pwa": "^5.6.0",
     "next-themes": "^0.2.1",
@@ -68,7 +68,6 @@
     "react-dropzone": "^14.2.3",
     "react-hook-form": "^7.38.0",
     "react-markdown": "^8.0.7",
-    "react-moveable": "^0.54.1",
     "sharp": "^0.32.1",
     "sonner": "^0.6.2",
     "swr": "^2.1.3",

apps/app/pages/[workspaceSlug]/me/profile/activity.tsx

@@ -106,7 +106,6 @@ const ProfileActivity = () => {
                           </div>
                           <div className="issue-comments-section p-0">
                             <Tiptap
-                              workspaceSlug={workspaceSlug as string}
                               value={
                                 activityItem?.new_value !== ""
                                   ? activityItem.new_value

apps/app/styles/editor.css

@@ -126,27 +126,3 @@ ul[data-type="taskList"] li[data-checked="true"] > div > p {
   transition: opacity 0.2s ease-out;
 }
 
-.img-placeholder {
-  position: relative;
-  width: 35%;
-
-  &:before {
-    content: "";
-    box-sizing: border-box;
-    position: absolute;
-    top: 50%;
-    left: 45%;
-    width: 20px;
-    height: 20px;
-    border-radius: 50%;
-    border: 3px solid rgba(var(--color-text-200));
-    border-top-color: rgba(var(--color-text-800)); 
-    animation: spinning 0.6s linear infinite;
-  }
-}
-
-@keyframes spinning {
-  to {
-    transform: rotate(360deg);
-  }
-}

apps/app/types/issues.d.ts

@@ -207,8 +207,7 @@ export interface IIssueLite {
   id: string;
   name: string;
   project_id: string;
-  start_date?: string | null;
-  target_date?: string | null;
+  target_date: string;
   workspace__slug: string;
 }
 

apps/space/Dockerfile.space

@@ -1,70 +0,0 @@
-FROM node:18-alpine AS builder
-RUN apk add --no-cache libc6-compat
-# Set working directory
-WORKDIR /app
-ENV NEXT_PUBLIC_API_BASE_URL=http://NEXT_PUBLIC_API_BASE_URL_PLACEHOLDER
-
-RUN yarn global add turbo
-COPY . .
-
-RUN turbo prune --scope=space --docker
-
-# Add lockfile and package.json's of isolated subworkspace
-FROM node:18-alpine AS installer
-
-RUN apk add --no-cache libc6-compat
-WORKDIR /app
-ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
-
-# First install the dependencies (as they change less often)
-COPY .gitignore .gitignore
-COPY --from=builder /app/out/json/ .
-COPY --from=builder /app/out/yarn.lock ./yarn.lock
-RUN yarn install --network-timeout 500000
-
-# Build the project
-COPY --from=builder /app/out/full/ .
-COPY turbo.json turbo.json
-COPY replace-env-vars.sh /usr/local/bin/
-USER root
-RUN chmod +x /usr/local/bin/replace-env-vars.sh
-
-RUN yarn turbo run build --filter=space
-
-ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
-    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
-
-RUN /usr/local/bin/replace-env-vars.sh http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER ${NEXT_PUBLIC_API_BASE_URL} space
-
-FROM node:18-alpine AS runner
-WORKDIR /app
-
-# Don't run production as root
-RUN addgroup --system --gid 1001 plane
-RUN adduser --system --uid 1001 captain
-USER captain
-
-COPY --from=installer /app/apps/space/next.config.js .
-COPY --from=installer /app/apps/space/package.json .
-
-# Automatically leverage output traces to reduce image size
-# https://nextjs.org/docs/advanced-features/output-file-tracing
-COPY --from=installer --chown=captain:plane /app/apps/space/.next/standalone ./
-
-COPY --from=installer --chown=captain:plane /app/apps/space/.next ./apps/space/.next
-
-ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
-ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
-    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
-
-USER root
-COPY replace-env-vars.sh /usr/local/bin/
-COPY start.sh /usr/local/bin/
-RUN chmod +x /usr/local/bin/replace-env-vars.sh
-RUN chmod +x /usr/local/bin/start.sh
-
-USER captain
-
-ENV NEXT_TELEMETRY_DISABLED 1
-
-EXPOSE 3000

apps/space/app/[workspace_slug]/[project_slug]/page.tsx

@@ -25,10 +25,7 @@ const WorkspaceProjectPage = observer(() => {
   const routerSearchparams = useSearchParams();
 
   const { workspace_slug, project_slug } = routerParams as { workspace_slug: string; project_slug: string };
-  const board =
-    routerSearchparams &&
-    routerSearchparams.get("board") != null &&
-    (routerSearchparams.get("board") as TIssueBoardKeys | "");
+  const board = routerSearchparams.get("board") as TIssueBoardKeys | "";
 
   // updating default board view when we are in the issues page
   useEffect(() => {

apps/space/lib/mobx/store-init.tsx

@@ -1,6 +1,10 @@
 "use client";
 
 import { useEffect } from "react";
+// next imports
+import { useSearchParams } from "next/navigation";
+// interface
+import { TIssueBoardKeys } from "store/types";
 // mobx store
 import { useMobxStore } from "lib/mobx/store-provider";
 import { RootStore } from "store/root";
@@ -8,6 +12,11 @@ import { RootStore } from "store/root";
 const MobxStoreInit = () => {
   const store: RootStore = useMobxStore();
 
+  // search params
+  const routerSearchparams = useSearchParams();
+
+  const board = routerSearchparams.get("board") as TIssueBoardKeys;
+
   useEffect(() => {
     // theme
     const _theme = localStorage && localStorage.getItem("app_theme") ? localStorage.getItem("app_theme") : "light";

apps/space/next.config.js

@@ -1,14 +1,9 @@
 /** @type {import('next').NextConfig} */
-const path = require("path");
 
 const nextConfig = {
-  reactStrictMode: false,
-  swcMinify: true,
   experimental: {
-    outputFileTracingRoot: path.join(__dirname, "../../"),
     appDir: true,
   },
-  output: "standalone",
 };
 
 module.exports = nextConfig;

apps/space/package.json

@@ -1,11 +1,11 @@
 {
-  "name": "space",
+  "name": "plane-deploy",
   "version": "0.0.1",
   "private": true,
   "scripts": {
-    "dev": "next dev -p 4000",
+    "dev": "next dev",
     "build": "next build",
-    "start": "next start -p 4000",
+    "start": "next start",
     "lint": "next lint"
   },
   "dependencies": {

apps/space/pages/_app.tsx

@@ -1,10 +0,0 @@
-// styles
-import "styles/globals.css";
-// types
-import type { AppProps } from "next/app";
-
-function MyApp({ Component, pageProps }: AppProps) {
-  return <Component {...pageProps} />;
-}
-
-export default MyApp;

apps/space/pages/_document.tsx

@@ -1,17 +0,0 @@
-import Document, { Html, Head, Main, NextScript } from "next/document";
-
-class MyDocument extends Document {
-  render() {
-    return (
-      <Html>
-        <Head />
-        <body>
-          <Main />
-          <NextScript />
-        </body>
-      </Html>
-    );
-  }
-}
-
-export default MyDocument;

apps/space/services/api.service.ts

@@ -3,12 +3,14 @@ import axios from "axios";
 // js cookie
 import Cookies from "js-cookie";
 
+const base_url: string | null = "https://boarding.plane.so";
+
 abstract class APIService {
   protected baseURL: string;
   protected headers: any = {};
 
-  constructor(_baseURL: string) {
-    this.baseURL = _baseURL;
+  constructor(baseURL: string) {
+    this.baseURL = base_url ? base_url : baseURL;
   }
 
   setRefreshToken(token: string) {

apps/space/services/issue.service.ts

@@ -1,9 +1,11 @@
 // services
 import APIService from "services/api.service";
 
+const { NEXT_PUBLIC_API_BASE_URL } = process.env;
+
 class IssueService extends APIService {
   constructor() {
-    super(process.env.NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000");
+    super(NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000");
   }
 
   async getPublicIssues(workspace_slug: string, project_slug: string): Promise<any> {

apps/space/services/project.service.ts

@@ -1,9 +1,11 @@
 // services
 import APIService from "services/api.service";
 
+const { NEXT_PUBLIC_API_BASE_URL } = process.env;
+
 class ProjectService extends APIService {
   constructor() {
-    super(process.env.NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000");
+    super(NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000");
   }
 
   async getProjectSettingsAsync(workspace_slug: string, project_slug: string): Promise<any> {

apps/space/services/user.service.ts

@@ -1,9 +1,11 @@
 // services
 import APIService from "services/api.service";
 
+const { NEXT_PUBLIC_API_BASE_URL } = process.env;
+
 class UserService extends APIService {
   constructor() {
-    super(process.env.NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000");
+    super(NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000");
   }
 
   async currentUser(): Promise<any> {

docker-compose-hub.yml

@@ -38,12 +38,11 @@ services:
                 container_name: planefrontend
                 image: makeplane/plane-frontend:latest
                 restart: always
-                command: /usr/local/bin/start.sh apps/app/server.js app
+                command: /usr/local/bin/start.sh
                 env_file:
                         - .env
                 environment:
                         NEXT_PUBLIC_API_BASE_URL: ${NEXT_PUBLIC_API_BASE_URL}
-                        NEXT_PUBLIC_DEPLOY_URL: ${NEXT_PUBLIC_DEPLOY_URL}
                         NEXT_PUBLIC_GOOGLE_CLIENTID: "0"
                         NEXT_PUBLIC_GITHUB_APP_NAME: "0"
                         NEXT_PUBLIC_GITHUB_ID: "0"
@@ -55,20 +54,6 @@ services:
                 depends_on:
                         - plane-api
                         - plane-worker
-                        
-        plane-deploy:
-                container_name: planedeploy
-                image: makeplane/plane-space:latest
-                restart: always
-                command: node apps/space/server.js space
-                env_file:
-                        - .env
-                environment:
-                        NEXT_PUBLIC_API_BASE_URL: ${NEXT_PUBLIC_API_BASE_URL}
-                depends_on:
-                        - plane-api
-                        - plane-worker
-                        - plane-web
 
         plane-api:
                 container_name: planebackend

docker-compose.yml

@@ -41,14 +41,12 @@ services:
                         dockerfile: ./apps/app/Dockerfile.web
                         args:
                                 NEXT_PUBLIC_API_BASE_URL: http://localhost:8000
-                                NEXT_PUBLIC_DEPLOY_URL: http://localhost/spaces
                 restart: always
-                command: /usr/local/bin/start.sh apps/app/server.js app
+                command: /usr/local/bin/start.sh
                 env_file:
                         - .env
                 environment:
                         NEXT_PUBLIC_API_BASE_URL: ${NEXT_PUBLIC_API_BASE_URL}
-                        NEXT_PUBLIC_DEPLOY_URL: ${NEXT_PUBLIC_DEPLOY_URL}
                         NEXT_PUBLIC_GOOGLE_CLIENTID: "0"
                         NEXT_PUBLIC_GITHUB_APP_NAME: "0"
                         NEXT_PUBLIC_GITHUB_ID: "0"
@@ -60,23 +58,6 @@ services:
                 depends_on:
                         - plane-api
                         - plane-worker
-        plane-deploy:
-                container_name: planedeploy
-                build:
-                        context: .
-                        dockerfile: ./apps/space/Dockerfile.space
-                        args:
-                                NEXT_PUBLIC_API_BASE_URL: http://localhost:8000
-                restart: always
-                command: /usr/local/bin/start.sh apps/space/server.js space
-                env_file:
-                        - .env
-                environment:
-                        NEXT_PUBLIC_API_BASE_URL: ${NEXT_PUBLIC_API_BASE_URL}
-                depends_on:
-                        - plane-api
-                        - plane-worker
-                        - plane-web
 
         plane-api:
                 container_name: planebackend

nginx/nginx-single-docker-image.conf

@@ -18,11 +18,6 @@ server {
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
     }
-    location /space/ {
-        proxy_pass http://localhost:4000/;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-    }
     error_page   500 502 503 504  /50x.html;
     location = /50x.html {
         root   /usr/share/nginx/html;

nginx/nginx.conf.template

@@ -15,10 +15,6 @@ server {
         proxy_pass http://planefrontend:3000/;       
     }
 
-    location /spaces/ {
-        proxy_pass http://planedeploy:3000/;
-    }
-
     location /api/ {
         proxy_pass http://planebackend:8000/api/;
     }

replace-env-vars.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 FROM=$1
 TO=$2
-DIRECTORY=$3
 
 if [ "${FROM}" = "${TO}" ]; then
     echo "Nothing to replace, the value is already set to ${TO}."
@@ -12,4 +11,4 @@ fi
 # Only perform action if $FROM and $TO are different.
 echo "Replacing all statically built instances of $FROM with this string $TO ."
 
-grep -R -la "${FROM}" apps/$DIRECTORY/.next | xargs -I{} sed -i "s|$FROM|$TO|g" "{}"
+grep -R -la "${FROM}" apps/app/.next | xargs -I{} sed -i "s|$FROM|$TO|g" "{}"

setup.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-cp ./.env.example ./.env
+# cp ./.env.example ./.env
 
 # Export for tr error in mac
 export LC_ALL=C

start.sh

@@ -3,7 +3,7 @@ set -x
 
 # Replace the statically built BUILT_NEXT_PUBLIC_API_BASE_URL with run-time NEXT_PUBLIC_API_BASE_URL
 # NOTE: if these values are the same, this will be skipped.
-/usr/local/bin/replace-env-vars.sh "$BUILT_NEXT_PUBLIC_API_BASE_URL" "$NEXT_PUBLIC_API_BASE_URL" $2
+/usr/local/bin/replace-env-vars.sh "$BUILT_NEXT_PUBLIC_API_BASE_URL" "$NEXT_PUBLIC_API_BASE_URL"
 
 echo "Starting Plane Frontend.."
-node $1
+node apps/app/server.js

yarn.lock

@@ -1006,40 +1006,6 @@
     react-popper "^2.3.0"
     tslib "~2.5.0"
 
-"@cfcs/core@^0.0.6":
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/@cfcs/core/-/core-0.0.6.tgz#9f8499dcd2ad29fd96d8fa72055411cd4a249121"
-  integrity sha512-FxfJMwoLB8MEMConeXUCqtMGqxdtePQxRBOiGip9ULcYYam3WfCgoY6xdnMaSkYvRvmosp5iuG+TiPofm65+Pw==
-  dependencies:
-    "@egjs/component" "^3.0.2"
-
-"@daybrush/utils@^1.1.1", "@daybrush/utils@^1.13.0", "@daybrush/utils@^1.4.0", "@daybrush/utils@^1.6.0", "@daybrush/utils@^1.7.1":
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/@daybrush/utils/-/utils-1.13.0.tgz#ea70a60864130da476406fdd1d465e3068aea0ff"
-  integrity sha512-ALK12C6SQNNHw1enXK+UO8bdyQ+jaWNQ1Af7Z3FNxeAwjYhQT7do+TRE4RASAJ3ObaS2+TJ7TXR3oz2Gzbw0PQ==
-
-"@egjs/agent@^2.2.1":
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/@egjs/agent/-/agent-2.4.3.tgz#6d44e2fb1ff7bab242c07f82732fe60305ac6f06"
-  integrity sha512-XvksSENe8wPeFlEVouvrOhKdx8HMniJ3by7sro2uPF3M6QqWwjzVcmvwoPtdjiX8O1lfRoLhQMp1a7NGlVTdIA==
-
-"@egjs/children-differ@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@egjs/children-differ/-/children-differ-1.0.1.tgz#5465fa80671d5ca3564ebe912f48b05b3e8a14fd"
-  integrity sha512-DRvyqMf+CPCOzAopQKHtW+X8iN6Hy6SFol+/7zCUiE5y4P/OB8JP8FtU4NxtZwtafvSL4faD5KoQYPj3JHzPFQ==
-  dependencies:
-    "@egjs/list-differ" "^1.0.0"
-
-"@egjs/component@^3.0.2":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@egjs/component/-/component-3.0.4.tgz#ad7b53794b2a612806179a188ad828acb9525f61"
-  integrity sha512-sXA7bGbIeLF2OAw/vpka66c6QBBUPcA4UUhR4WGJfnp2XWdiI8QrnJGJMr/UxpE/xnevX9tN3jvNPlW8WkHl3g==
-
-"@egjs/list-differ@^1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@egjs/list-differ/-/list-differ-1.0.1.tgz#5772b0f8b87973bb67827f6c7d7df8d7f64a22eb"
-  integrity sha512-OTFTDQcWS+1ZREOdCWuk5hCBgYO4OsD30lXcOCyVOAjXMhgL5rBRDnt/otb6Nz8CzU0L/igdcaQBDLWc4t9gvg==
-
 "@emotion/babel-plugin@^11.11.0":
   version "11.11.0"
   resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz#c2d872b6a7767a9d176d007f5b31f7d504bb5d6c"
@@ -2024,28 +1990,6 @@
   resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.3.3.tgz#16ab6c727d8c2020a5b6e4a176a243ecd88d8d69"
   integrity sha512-0xd7qez0AQ+MbHatZTlI1gu5vkG8r7MYRUJAHPAHJBmGLs16zpkrpAVLvjQKQOqaXPDUBwOiJzNc00znHSCVBw==
 
-"@scena/dragscroll@^1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@scena/dragscroll/-/dragscroll-1.4.0.tgz#220b2430c16119cd3e70044ee533a5b9a43cffd7"
-  integrity sha512-3O8daaZD9VXA9CP3dra6xcgt/qrm0mg0xJCwiX6druCteQ9FFsXffkF8PrqxY4Z4VJ58fFKEa0RlKqbsi/XnRA==
-  dependencies:
-    "@daybrush/utils" "^1.6.0"
-    "@scena/event-emitter" "^1.0.2"
-
-"@scena/event-emitter@^1.0.2", "@scena/event-emitter@^1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@scena/event-emitter/-/event-emitter-1.0.5.tgz#047e3acef93cf238d7ce3a8cc5a12ec6bd9c3bb1"
-  integrity sha512-AzY4OTb0+7ynefmWFQ6hxDdk0CySAq/D4efljfhtRHCOP7MBF9zUfhKG3TJiroVjASqVgkRJFdenS8ArZo6Olg==
-  dependencies:
-    "@daybrush/utils" "^1.1.1"
-
-"@scena/matrix@^1.0.0", "@scena/matrix@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@scena/matrix/-/matrix-1.1.1.tgz#5297f71825c72e2c2c8f802f924f482ed200c43c"
-  integrity sha512-JVKBhN0tm2Srl+Yt+Ywqu0oLgLcdemDQlD1OxmN9jaCTwaFPZ7tY8n6dhVgMEaR9qcR7r+kAlMXnSfNyYdE+Vg==
-  dependencies:
-    "@daybrush/utils" "^1.4.0"
-
 "@sentry-internal/tracing@7.63.0":
   version "7.63.0"
   resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.63.0.tgz#58903b2205456034611cc5bc1b5b2479275f89c7"
@@ -3518,21 +3462,6 @@ css-box-model@^1.2.0:
   dependencies:
     tiny-invariant "^1.0.6"
 
-css-styled@^1.0.8, css-styled@~1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/css-styled/-/css-styled-1.0.8.tgz#c9c05dc4abdef5571033090bfb8cfc5e19429974"
-  integrity sha512-tCpP7kLRI8dI95rCh3Syl7I+v7PP+2JYOzWkl0bUEoSbJM+u8ITbutjlQVf0NC2/g4ULROJPi16sfwDIO8/84g==
-  dependencies:
-    "@daybrush/utils" "^1.13.0"
-
-css-to-mat@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/css-to-mat/-/css-to-mat-1.1.1.tgz#0dd10dcf9ec17df15708c8ff07a74fbd0b9a3fe5"
-  integrity sha512-kvpxFYZb27jRd2vium35G7q5XZ2WJ9rWjDUMNT36M3Hc41qCrLXFM5iEKMGXcrPsKfXEN+8l/riB4QzwwwiEyQ==
-  dependencies:
-    "@daybrush/utils" "^1.13.0"
-    "@scena/matrix" "^1.0.0"
-
 cssesc@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
@@ -4555,11 +4484,6 @@ fraction.js@^4.2.0:
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950"
   integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==
 
-framework-utils@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/framework-utils/-/framework-utils-1.1.0.tgz#a3b528bce838dfd623148847dc92371b09d0da2d"
-  integrity sha512-KAfqli5PwpFJ8o3psRNs8svpMGyCSAe8nmGcjQ0zZBWN2H6dZDnq+ABp3N3hdUmFeMrLtjOCTXD4yplUJIWceg==
-
 fs-constants@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
@@ -4615,14 +4539,6 @@ gensync@^1.0.0-beta.2:
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-gesto@^1.19.0, gesto@^1.19.1:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/gesto/-/gesto-1.19.1.tgz#b2a29730663eecf77b248982bbff929e79d4a461"
-  integrity sha512-ofWVEdqmnpFm3AFf7aoclhoayseb3OkwSiXbXusKYu/99iN5HgeWP+SWqdghQ5TFlOgP5Zlz+6SY8mP2V0kFaQ==
-  dependencies:
-    "@daybrush/utils" "^1.13.0"
-    "@scena/event-emitter" "^1.0.2"
-
 get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
@@ -5328,21 +5244,6 @@ jsonpointer@^5.0.0:
     object.assign "^4.1.4"
     object.values "^1.1.6"
 
-keycode@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.1.tgz#09c23b2be0611d26117ea2501c2c391a01f39eff"
-  integrity sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==
-
-keycon@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/keycon/-/keycon-1.4.0.tgz#bf2a633f3c3b659ea564045938cff33e584cebd5"
-  integrity sha512-p1NAIxiRMH3jYfTeXRs2uWbVJ1WpEjpi8ktzUyBJsX7/wn2qu2VRXktneBLNtKNxJmlUYxRi9gOJt1DuthXR7A==
-  dependencies:
-    "@cfcs/core" "^0.0.6"
-    "@daybrush/utils" "^1.7.1"
-    "@scena/event-emitter" "^1.0.2"
-    keycode "^2.2.0"
-
 kleur@^4.0.3:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.5.tgz#95106101795f7050c6c650f350c683febddb1780"
@@ -6180,13 +6081,6 @@ orderedmap@^2.0.0:
   resolved "https://registry.yarnpkg.com/orderedmap/-/orderedmap-2.1.1.tgz#61481269c44031c449915497bf5a4ad273c512d2"
   integrity sha512-TvAWxi0nDe1j/rtMcWcIj94+Ffe6n7zhow33h40SKxmsmozs6dz/e+EajymfoFcHd7sxNn8yHM8839uixMOV6g==
 
-overlap-area@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/overlap-area/-/overlap-area-1.1.0.tgz#1fcaa21bdb9cb1ace973d9aa299ae6b56557a4c2"
-  integrity sha512-3dlJgJCaVeXH0/eZjYVJvQiLVVrPO4U1ZGqlATtx6QGO3b5eNM6+JgUKa7oStBTdYuGTk7gVoABCW6Tp+dhRdw==
-  dependencies:
-    "@daybrush/utils" "^1.7.1"
-
 p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -6709,14 +6603,6 @@ react-color@^2.19.3:
     reactcss "^1.2.0"
     tinycolor2 "^1.4.1"
 
-react-css-styled@^1.1.9:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/react-css-styled/-/react-css-styled-1.1.9.tgz#a7cc948e49f72b2f7fb1393bd85416a8293afab3"
-  integrity sha512-M7fJZ3IWFaIHcZEkoFOnkjdiUFmwd8d+gTh2bpqMOcnxy/0Gsykw4dsL4QBiKsxcGow6tETUa4NAUcmJF+/nfw==
-  dependencies:
-    css-styled "~1.0.8"
-    framework-utils "^1.1.0"
-
 react-datepicker@^4.8.0:
   version "4.16.0"
   resolved "https://registry.yarnpkg.com/react-datepicker/-/react-datepicker-4.16.0.tgz#b9dd389bb5611a1acc514bba1dd944be21dd877f"
@@ -6797,25 +6683,6 @@ react-markdown@^8.0.7:
     unist-util-visit "^4.0.0"
     vfile "^5.0.0"
 
-react-moveable@^0.54.1:
-  version "0.54.1"
-  resolved "https://registry.yarnpkg.com/react-moveable/-/react-moveable-0.54.1.tgz#3c69748c444184700e6999501b0da953c934205e"
-  integrity sha512-Kj2ifw9nk3LZvu7ezhst8Z5WBPRr+yVv9oROwrBirFlHmwGHHZXUGk5Gaezu+JGqqNRsQJncVMW5Uf68KSSOvg==
-  dependencies:
-    "@daybrush/utils" "^1.13.0"
-    "@egjs/agent" "^2.2.1"
-    "@egjs/children-differ" "^1.0.1"
-    "@egjs/list-differ" "^1.0.0"
-    "@scena/dragscroll" "^1.4.0"
-    "@scena/event-emitter" "^1.0.5"
-    "@scena/matrix" "^1.1.1"
-    css-to-mat "^1.1.1"
-    framework-utils "^1.1.0"
-    gesto "^1.19.0"
-    overlap-area "^1.1.0"
-    react-css-styled "^1.1.9"
-    react-selecto "^1.25.0"
-
 react-onclickoutside@^6.12.2:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.13.0.tgz#e165ea4e5157f3da94f4376a3ab3e22a565f4ffc"
@@ -6873,13 +6740,6 @@ react-remove-scroll@2.5.4:
     use-callback-ref "^1.3.0"
     use-sidecar "^1.1.2"
 
-react-selecto@^1.25.0:
-  version "1.26.0"
-  resolved "https://registry.yarnpkg.com/react-selecto/-/react-selecto-1.26.0.tgz#9157ff0a732fc426602b30c08ec21b6ca0a9c472"
-  integrity sha512-aBTZEYA68uE+o8TytNjTb2GpIn4oKEv0U4LIow3cspJQlF/PdAnBwkq9UuiKVuFluu5kfLQ7Keu3S2Tihlmw0g==
-  dependencies:
-    selecto "~1.26.0"
-
 react-style-singleton@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/react-style-singleton/-/react-style-singleton-2.2.1.tgz#f99e420492b2d8f34d38308ff660b60d0b1205b4"
@@ -7163,22 +7023,6 @@ schema-utils@^3.1.1:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-selecto@~1.26.0:
-  version "1.26.0"
-  resolved "https://registry.yarnpkg.com/selecto/-/selecto-1.26.0.tgz#f3f04fb6409112b198243458f6c9963946d5ba2f"
-  integrity sha512-cEFKdv5rmkF6pf2OScQJllaNp4UJy/FvviB40ZaMSHrQCxC72X/Q6uhzW1tlb2RE+0danvUNJTs64cI9VXtUyg==
-  dependencies:
-    "@daybrush/utils" "^1.13.0"
-    "@egjs/children-differ" "^1.0.1"
-    "@scena/dragscroll" "^1.4.0"
-    "@scena/event-emitter" "^1.0.5"
-    css-styled "^1.0.8"
-    css-to-mat "^1.1.1"
-    framework-utils "^1.1.0"
-    gesto "^1.19.1"
-    keycon "^1.2.0"
-    overlap-area "^1.1.0"
-
 semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"