Merge pull request #862 from makeplane/stage-release

promote: staging to production v0.5

.github/ISSUE_TEMPLATE/--bug-report.yaml

@@ -44,6 +44,15 @@ body:
       - Deploy preview
   validations:
     required: true
+  type: dropdown
+  id: browser
+  attributes:
+    label: Browser
+    options:
+      - Google Chrome
+      - Mozilla Firefox
+      - Safari
+      - Other
 - type: dropdown
   id: version
   attributes:

README.md

@@ -29,7 +29,7 @@
 Meet Plane. An open-source software development tool to manage issues, sprints, and product roadmaps with peace of mind 🧘‍♀️.
 
 
-> Plane is still in its early days, not everything will be perfect yet, and hiccups may happen. Please let us know of any suggestions, ideas, or bugs that you encounter on our [Discord](https://discord.com/invite/29tPNhaV) or GitHub issues, and we will use your feedback to improve on our upcoming releases.
+> Plane is still in its early days, not everything will be perfect yet, and hiccups may happen. Please let us know of any suggestions, ideas, or bugs that you encounter on our [Discord](https://discord.com/invite/A92xrEGCge) or GitHub issues, and we will use your feedback to improve on our upcoming releases.
 
 The easiest way to get started with Plane is by creating a [Plane Cloud](https://app.plane.so) account. Plane Cloud offers a hosted solution for Plane. If you prefer to self-host Plane, please refer to our [deployment documentation](https://docs.plane.so/self-hosting).
 
@@ -65,6 +65,7 @@ cd plane
 docker-compose up
 ```
 
+<strong>You can use the default email and password for your first login `captain@plane.so` and `password123`.</strong> 
 
 ## 🚀 Features
 
@@ -123,14 +124,6 @@ For full documentation, visit [docs.plane.so](https://docs.plane.so/)
 
 To see how to Contribute, visit [here](https://github.com/makeplane/plane/blob/master/CONTRIBUTING.md).
 
-## 🔋 Status
-
-- [x] Early Community Previews: We are open-sourcing and sharing the development version of Plane
-- [ ] Alpha: We are testing Plane with a closed set of customers
-- [ ] Public Alpha: Anyone can sign up over at [app.plane.so](https://app.plane.so). But go easy on us, there are a few hiccups
-- [ ] Public Beta: Stable enough for most non-enterprise use-cases
-- [ ] Public: Production-ready
-
 ## ❤️ Community
 
 The Plane community can be found on GitHub Discussions, where you can ask questions, voice ideas, and share your projects.

apiserver/Procfile

@@ -1,2 +1,2 @@
 web: gunicorn -w 4 -k uvicorn.workers.UvicornWorker plane.asgi:application --bind 0.0.0.0:$PORT --config gunicorn.config.py --max-requests 10000 --max-requests-jitter 1000 --access-logfile -
-worker: python manage.py rqworker
+worker: celery -A plane worker -l info

apiserver/back_migration.py

@@ -3,8 +3,7 @@ import uuid
 import random
 from django.contrib.auth.hashers import make_password
 from plane.db.models import ProjectIdentifier
-from plane.db.models import Issue, IssueComment, User, Project, ProjectMember
-
+from plane.db.models import Issue, IssueComment, User, Project, ProjectMember, Label
 
 
 # Update description and description html values for old descriptions
@@ -148,7 +147,7 @@ def update_user_view_property():
                 "collapsed": True,
                 "issueView": "list",
                 "filterIssue": None,
-                "groupByProperty": True,
+                "groupByProperty": None,
                 "showEmptyGroups": True,
             }
             updated_project_members.append(project_member)
@@ -161,6 +160,7 @@ def update_user_view_property():
         print(e)
         print("Failed")
 
+
 def update_label_color():
     try:
         labels = Label.objects.filter(color="")

apiserver/bin/worker

@@ -2,5 +2,4 @@
 set -e
 
 python manage.py wait_for_db
-python manage.py migrate
-python manage.py rqworker
+celery -A plane worker -l info

apiserver/plane/__init__.py

@@ -0,0 +1,3 @@
+from .celery import app as celery_app
+
+__all__ = ('celery_app',)

apiserver/plane/api/serializers/__init__.py

@@ -11,6 +11,7 @@ from .workspace import (
     TeamSerializer,
     WorkSpaceMemberInviteSerializer,
     WorkspaceLiteSerializer,
+    WorkspaceThemeSerializer,
 )
 from .project import (
     ProjectSerializer,
@@ -41,6 +42,7 @@ from .issue import (
     IssueStateSerializer,
     IssueLinkSerializer,
     IssueLiteSerializer,
+    IssueAttachmentSerializer,
 )
 
 from .module import (
@@ -65,3 +67,5 @@ from .integration import (
 from .importer import ImporterSerializer
 
 from .page import PageSerializer, PageBlockSerializer, PageFavoriteSerializer
+
+from .estimate import EstimateSerializer, EstimatePointSerializer

apiserver/plane/api/serializers/estimate.py

@@ -0,0 +1,25 @@
+# Module imports
+from .base import BaseSerializer
+
+from plane.db.models import Estimate, EstimatePoint
+
+
+class EstimateSerializer(BaseSerializer):
+    class Meta:
+        model = Estimate
+        fields = "__all__"
+        read_only_fields = [
+            "workspace",
+            "project",
+        ]
+
+
+class EstimatePointSerializer(BaseSerializer):
+    class Meta:
+        model = EstimatePoint
+        fields = "__all__"
+        read_only_fields = [
+            "estimate",
+            "workspace",
+            "project",
+        ]

apiserver/plane/api/serializers/importer.py

@@ -1,11 +1,13 @@
 # Module imports
 from .base import BaseSerializer
 from .user import UserLiteSerializer
+from .project import ProjectLiteSerializer
 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)
 
     class Meta:
         model = Importer

apiserver/plane/api/serializers/issue.py

@@ -25,6 +25,7 @@ from plane.db.models import (
     Module,
     ModuleIssue,
     IssueLink,
+    IssueAttachment,
 )
 
 
@@ -99,7 +100,7 @@ class IssueCreateSerializer(BaseSerializer):
         project = self.context["project"]
         issue = Issue.objects.create(**validated_data, project=project)
 
-        if blockers is not None:
+        if blockers is not None and len(blockers):
             IssueBlocker.objects.bulk_create(
                 [
                     IssueBlocker(
@@ -115,7 +116,7 @@ class IssueCreateSerializer(BaseSerializer):
                 batch_size=10,
             )
 
-        if assignees is not None:
+        if assignees is not None and len(assignees):
             IssueAssignee.objects.bulk_create(
                 [
                     IssueAssignee(
@@ -130,8 +131,19 @@ class IssueCreateSerializer(BaseSerializer):
                 ],
                 batch_size=10,
             )
+        else:
+            # Then assign it to default assignee
+            if project.default_assignee is not None:
+                IssueAssignee.objects.create(
+                    assignee=project.default_assignee,
+                    issue=issue,
+                    project=project,
+                    workspace=project.workspace,
+                    created_by=issue.created_by,
+                    updated_by=issue.updated_by,
+                )
 
-        if labels is not None:
+        if labels is not None and len(labels):
             IssueLabel.objects.bulk_create(
                 [
                     IssueLabel(
@@ -147,7 +159,7 @@ class IssueCreateSerializer(BaseSerializer):
                 batch_size=10,
             )
 
-        if blocks is not None:
+        if blocks is not None and len(blocks):
             IssueBlocker.objects.bulk_create(
                 [
                     IssueBlocker(
@@ -254,7 +266,8 @@ class IssueActivitySerializer(BaseSerializer):
 class IssueCommentSerializer(BaseSerializer):
     actor_detail = UserLiteSerializer(read_only=True, source="actor")
     issue_detail = IssueFlatSerializer(read_only=True, source="issue")
-    project_detail = ProjectSerializer(read_only=True, source="project")
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
 
     class Meta:
         model = IssueComment
@@ -297,6 +310,9 @@ class IssuePropertySerializer(BaseSerializer):
 
 
 class LabelSerializer(BaseSerializer):
+    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
+    project_detail = ProjectLiteSerializer(source="project", read_only=True)
+
     class Meta:
         model = Label
         fields = "__all__"
@@ -439,6 +455,21 @@ class IssueLinkSerializer(BaseSerializer):
         return IssueLink.objects.create(**validated_data)
 
 
+class IssueAttachmentSerializer(BaseSerializer):
+    class Meta:
+        model = IssueAttachment
+        fields = "__all__"
+        read_only_fields = [
+            "created_by",
+            "updated_by",
+            "created_at",
+            "updated_at",
+            "workspace",
+            "project",
+            "issue",
+        ]
+
+
 # Issue Serializer with state details
 class IssueStateSerializer(BaseSerializer):
     state_detail = StateSerializer(read_only=True, source="state")
@@ -466,6 +497,7 @@ class IssueSerializer(BaseSerializer):
     issue_cycle = IssueCycleDetailSerializer(read_only=True)
     issue_module = IssueModuleDetailSerializer(read_only=True)
     issue_link = IssueLinkSerializer(read_only=True, many=True)
+    issue_attachment = IssueAttachmentSerializer(read_only=True, many=True)
     sub_issues_count = serializers.IntegerField(read_only=True)
 
     class Meta:
@@ -490,6 +522,8 @@ class IssueLiteSerializer(BaseSerializer):
     sub_issues_count = serializers.IntegerField(read_only=True)
     cycle_id = serializers.UUIDField(read_only=True)
     module_id = serializers.UUIDField(read_only=True)
+    attachment_count = serializers.IntegerField(read_only=True)
+    link_count = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = Issue

apiserver/plane/api/serializers/view.py

@@ -25,22 +25,18 @@ class IssueViewSerializer(BaseSerializer):
 
     def create(self, validated_data):
         query_params = validated_data.get("query_data", {})
-
-        if not bool(query_params):
-            raise serializers.ValidationError(
-                {"query_data": ["Query data field cannot be empty"]}
-            )
-
-        validated_data["query"] = issue_filters(query_params, "POST")
+        if bool(query_params):
+            validated_data["query"] = issue_filters(query_params, "POST")
+        else:
+            validated_data["query"] = dict()
         return IssueView.objects.create(**validated_data)
 
     def update(self, instance, validated_data):
         query_params = validated_data.get("query_data", {})
-        if not bool(query_params):
-            raise serializers.ValidationError(
-                {"query_data": ["Query data field cannot be empty"]}
-            )
-
+        if bool(query_params):
+            validated_data["query"] = issue_filters(query_params, "POST")
+        else:
+            validated_data["query"] = dict()
         validated_data["query"] = issue_filters(query_params, "PATCH")
         return super().update(instance, validated_data)
 

apiserver/plane/api/serializers/workspace.py

@@ -5,8 +5,15 @@ from rest_framework import serializers
 from .base import BaseSerializer
 from .user import UserLiteSerializer
 
-from plane.db.models import User, Workspace, WorkspaceMember, Team, TeamMember
-from plane.db.models import Workspace, WorkspaceMember, Team, WorkspaceMemberInvite
+from plane.db.models import (
+    User,
+    Workspace,
+    WorkspaceMember,
+    Team,
+    TeamMember,
+    WorkspaceMemberInvite,
+    WorkspaceTheme,
+)
 
 
 class WorkSpaceSerializer(BaseSerializer):
@@ -100,3 +107,13 @@ class WorkspaceLiteSerializer(BaseSerializer):
             "id",
         ]
         read_only_fields = fields
+
+
+class WorkspaceThemeSerializer(BaseSerializer):
+    class Meta:
+        model = WorkspaceTheme
+        fields = "__all__"
+        read_only_fields = [
+            "workspace",
+            "actor",
+        ]

apiserver/plane/api/urls.py

@@ -42,6 +42,7 @@ from plane.api.views import (
     UserActivityGraphEndpoint,
     UserIssueCompletedGraphEndpoint,
     UserWorkspaceDashboardEndpoint,
+    WorkspaceThemeViewSet,
     ## End Workspaces
     # File Assets
     FileAssetEndpoint,
@@ -74,10 +75,17 @@ from plane.api.views import (
     SubIssuesEndpoint,
     IssueLinkViewSet,
     BulkCreateIssueLabelsEndpoint,
+    IssueAttachmentEndpoint,
     ## End Issues
     # States
     StateViewSet,
     ## End States
+    # Estimates
+    EstimateViewSet,
+    EstimatePointViewSet,
+    ProjectEstimatePointEndpoint,
+    BulkEstimatePointEndpoint,
+    ## End Estimates
     # Shortcuts
     ShortCutViewSet,
     ## End Shortcuts
@@ -133,6 +141,7 @@ from plane.api.views import (
     ## End importer
     # Search
     GlobalSearchEndpoint,
+    IssueSearchEndpoint,
     ## End Search
     # Gpt
     GPTIntegrationEndpoint,
@@ -342,6 +351,27 @@ urlpatterns = [
         WorkspaceMemberUserViewsEndpoint.as_view(),
         name="workspace-member-details",
     ),
+    path(
+        "workspaces/<str:slug>/workspace-themes/",
+        WorkspaceThemeViewSet.as_view(
+            {
+                "get": "list",
+                "post": "create",
+            }
+        ),
+        name="workspace-themes",
+    ),
+    path(
+        "workspaces/<str:slug>/workspace-themes/<uuid:pk>/",
+        WorkspaceThemeViewSet.as_view(
+            {
+                "get": "retrieve",
+                "patch": "partial_update",
+                "delete": "destroy",
+            }
+        ),
+        name="workspace-themes",
+    ),
     ## End Workspaces ##
     # Projects
     path(
@@ -477,6 +507,62 @@ urlpatterns = [
         name="project-state",
     ),
     # End States ##
+    #  States
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/estimates/",
+        EstimateViewSet.as_view(
+            {
+                "get": "list",
+                "post": "create",
+            }
+        ),
+        name="project-estimates",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/estimates/<uuid:pk>/",
+        EstimateViewSet.as_view(
+            {
+                "get": "retrieve",
+                "put": "update",
+                "patch": "partial_update",
+                "delete": "destroy",
+            }
+        ),
+        name="project-estimates",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/estimates/<uuid:estimate_id>/estimate-points/",
+        EstimatePointViewSet.as_view(
+            {
+                "get": "list",
+                "post": "create",
+            }
+        ),
+        name="project-estimate-points",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/estimates/<uuid:estimate_id>/estimate-points/<uuid:pk>/",
+        EstimatePointViewSet.as_view(
+            {
+                "get": "retrieve",
+                "put": "update",
+                "patch": "partial_update",
+                "delete": "destroy",
+            }
+        ),
+        name="project-estimates",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/project-estimates/",
+        ProjectEstimatePointEndpoint.as_view(),
+        name="project-estimate-points",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/estimates/<uuid:estimate_id>/bulk-estimate-points/",
+        BulkEstimatePointEndpoint.as_view(),
+        name="bulk-create-estimate-points",
+    ),
+    # End States ##
     # Shortcuts
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/shortcuts/",
@@ -741,6 +827,16 @@ urlpatterns = [
         ),
         name="project-issue-links",
     ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/issue-attachments/",
+        IssueAttachmentEndpoint.as_view(),
+        name="project-issue-attachments",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/issue-attachments/<uuid:pk>/",
+        IssueAttachmentEndpoint.as_view(),
+        name="project-issue-attachments",
+    ),
     ## End Issues
     ## Issue Activity
     path(
@@ -1158,6 +1254,11 @@ urlpatterns = [
         ImportServiceEndpoint.as_view(),
         name="importer",
     ),
+    path(
+        "workspaces/<str:slug>/importers/<str:service>/<uuid:pk>/",
+        ImportServiceEndpoint.as_view(),
+        name="importer",
+    ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/service/<str:service>/importers/<uuid:importer_id>/",
         UpdateServiceImportStatusEndpoint.as_view(),
@@ -1170,6 +1271,11 @@ urlpatterns = [
         GlobalSearchEndpoint.as_view(),
         name="global-search",
     ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/search-issues/",
+        IssueSearchEndpoint.as_view(),
+        name="project-issue-search",
+    ),
     ## End Search
     # Gpt
     path(

apiserver/plane/api/views/__init__.py

@@ -40,6 +40,7 @@ from .workspace import (
     UserActivityGraphEndpoint,
     UserIssueCompletedGraphEndpoint,
     UserWorkspaceDashboardEndpoint,
+    WorkspaceThemeViewSet,
 )
 from .state import StateViewSet
 from .shortcut import ShortCutViewSet
@@ -69,6 +70,7 @@ from .issue import (
     SubIssuesEndpoint,
     IssueLinkViewSet,
     BulkCreateIssueLabelsEndpoint,
+    IssueAttachmentEndpoint,
 )
 
 from .auth_extended import (
@@ -125,7 +127,14 @@ from .page import (
     CreatedbyOtherPagesEndpoint,
 )
 
-from .search import GlobalSearchEndpoint
+from .search import GlobalSearchEndpoint, IssueSearchEndpoint
 
 
 from .gpt import GPTIntegrationEndpoint
+
+from .estimate import (
+    EstimateViewSet,
+    EstimatePointViewSet,
+    ProjectEstimatePointEndpoint,
+    BulkEstimatePointEndpoint,
+)

apiserver/plane/api/views/asset.py

@@ -65,6 +65,8 @@ class FileAssetEndpoint(BaseAPIView):
 
 
 class UserAssetsEndpoint(BaseAPIView):
+    parser_classes = (MultiPartParser, FormParser)
+
     def get(self, request, asset_key):
         try:
             files = FileAsset.objects.filter(asset=asset_key, created_by=request.user)

apiserver/plane/api/views/cycle.py

@@ -28,6 +28,8 @@ from plane.db.models import (
     CycleIssue,
     Issue,
     CycleFavorite,
+    IssueLink,
+    IssueAttachment,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
 from plane.utils.grouper import group_results
@@ -226,6 +228,20 @@ class CycleIssueViewSet(BaseViewSet):
                 .prefetch_related("labels")
                 .order_by(order_by)
                 .filter(**filters)
+                .annotate(
+                    link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+                    .order_by()
+                    .annotate(count=Func(F("id"), function="Count"))
+                    .values("count")
+                )
+                .annotate(
+                    attachment_count=IssueAttachment.objects.filter(
+                        issue=OuterRef("id")
+                    )
+                    .order_by()
+                    .annotate(count=Func(F("id"), function="Count"))
+                    .values("count")
+                )
             )
 
             issues_data = IssueStateSerializer(issues, many=True).data
@@ -317,21 +333,19 @@ class CycleIssueViewSet(BaseViewSet):
 
             # Capture Issue Activity
             issue_activity.delay(
-                {
-                    "type": "issue.activity",
-                    "requested_data": json.dumps({"cycles_list": issues}),
-                    "actor_id": str(self.request.user.id),
-                    "issue_id": str(self.kwargs.get("pk", None)),
-                    "project_id": str(self.kwargs.get("project_id", None)),
-                    "current_instance": json.dumps(
-                        {
-                            "updated_cycle_issues": update_cycle_issue_activity,
-                            "created_cycle_issues": serializers.serialize(
-                                "json", record_to_create
-                            ),
-                        }
-                    ),
-                },
+                type="issue.activity.updated",
+                requested_data=json.dumps({"cycles_list": issues}),
+                actor_id=str(self.request.user.id),
+                issue_id=str(self.kwargs.get("pk", None)),
+                project_id=str(self.kwargs.get("project_id", None)),
+                current_instance=json.dumps(
+                    {
+                        "updated_cycle_issues": update_cycle_issue_activity,
+                        "created_cycle_issues": serializers.serialize(
+                            "json", record_to_create
+                        ),
+                    }
+                ),
             )
 
             # Return all Cycle Issues
@@ -370,7 +384,8 @@ class CycleDateCheckEndpoint(BaseAPIView):
 
             cycles = Cycle.objects.filter(
                 Q(start_date__lte=start_date, end_date__gte=start_date)
-                | Q(start_date__gte=end_date, end_date__lte=end_date),
+                | Q(start_date__lte=end_date, end_date__gte=end_date)
+                | Q(start_date__gte=start_date, end_date__lte=end_date),
                 workspace__slug=slug,
                 project_id=project_id,
             )

apiserver/plane/api/views/estimate.py

@@ -0,0 +1,245 @@
+# Django imports
+from django.db import IntegrityError
+
+# Third party imports
+from rest_framework.response import Response
+from rest_framework import status
+from sentry_sdk import capture_exception
+
+# Module imports
+from .base import BaseViewSet, BaseAPIView
+from plane.api.permissions import ProjectEntityPermission
+from plane.db.models import Project, Estimate, EstimatePoint
+from plane.api.serializers import EstimateSerializer, EstimatePointSerializer
+
+
+class EstimateViewSet(BaseViewSet):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+    model = Estimate
+    serializer_class = EstimateSerializer
+
+    def get_queryset(self):
+        return (
+            super()
+            .get_queryset()
+            .filter(workspace__slug=self.kwargs.get("slug"))
+            .filter(project_id=self.kwargs.get("project_id"))
+            .filter(project__project_projectmember__member=self.request.user)
+            .select_related("project")
+            .select_related("workspace")
+            .distinct()
+        )
+
+    def perform_create(self, serializer):
+        serializer.save(project_id=self.kwargs.get("project_id"))
+
+
+class EstimatePointViewSet(BaseViewSet):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+    model = EstimatePoint
+    serializer_class = EstimatePointSerializer
+
+    def get_queryset(self):
+        return (
+            super()
+            .get_queryset()
+            .filter(workspace__slug=self.kwargs.get("slug"))
+            .filter(project_id=self.kwargs.get("project_id"))
+            .filter(project__project_projectmember__member=self.request.user)
+            .filter(estimate_id=self.kwargs.get("estimate_id"))
+            .select_related("project")
+            .select_related("workspace")
+            .distinct()
+        )
+
+    def perform_create(self, serializer):
+        serializer.save(
+            project_id=self.kwargs.get("project_id"),
+            estimate_id=self.kwargs.get("estimate_id"),
+        )
+
+    def create(self, request, slug, project_id, estimate_id):
+        try:
+            serializer = EstimatePointSerializer(data=request.data)
+            if serializer.is_valid():
+                serializer.save(estimate_id=estimate_id, project_id=project_id)
+                return Response(serializer.data, status=status.HTTP_201_CREATED)
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+        except IntegrityError as e:
+            if "already exists" in str(e):
+                return Response(
+                    {"error": "The estimate point is already taken"},
+                    status=status.HTTP_410_GONE,
+                )
+            else:
+                capture_exception(e)
+                return Response(
+                    {"error": "Something went wrong please try again later"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
+    def partial_update(self, request, slug, project_id, estimate_id, pk):
+        try:
+            estimate_point = EstimatePoint.objects.get(
+                pk=pk,
+                estimate_id=estimate_id,
+                project_id=project_id,
+                workspace__slug=slug,
+            )
+            serializer = EstimatePointSerializer(
+                estimate_point, data=request.data, partial=True
+            )
+            if serializer.is_valid():
+                serializer.save(estimate_id=estimate_id, project_id=project_id)
+                return Response(serializer.data, status=status.HTTP_201_CREATED)
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+        except EstimatePoint.DoesNotExist:
+            return Response(
+                {"error": "Estimate Point does not exist"},
+                status=status.HTTP_404_NOT_FOUND,
+            )
+        except IntegrityError as e:
+            if "already exists" in str(e):
+                return Response(
+                    {"error": "The estimate point value is already taken"},
+                    status=status.HTTP_410_GONE,
+                )
+            else:
+                capture_exception(e)
+                return Response(
+                    {"error": "Something went wrong please try again later"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
+
+class ProjectEstimatePointEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
+    def get(self, request, slug, project_id):
+        try:
+            project = Project.objects.get(workspace__slug=slug, pk=project_id)
+            if project.estimate_id is not None:
+                estimate_points = EstimatePoint.objects.filter(
+                    estimate_id=project.estimate_id,
+                    project_id=project_id,
+                    workspace__slug=slug,
+                )
+                serializer = EstimatePointSerializer(estimate_points, many=True)
+                return Response(serializer.data, status=status.HTTP_200_OK)
+            return Response([], status=status.HTTP_200_OK)
+        except Exception as e:
+            capture_exception(e)
+            return Response(
+                {"error": "Something went wrong please try again later"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+
+class BulkEstimatePointEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
+    def post(self, request, slug, project_id, estimate_id):
+        try:
+            estimate = Estimate.objects.get(
+                pk=estimate_id, workspace__slug=slug, project=project_id
+            )
+
+            estimate_points = request.data.get("estimate_points", [])
+
+            if not len(estimate_points) or len(estimate_points) > 8:
+                return Response(
+                    {"error": "Estimate points are required"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
+            estimate_points = EstimatePoint.objects.bulk_create(
+                [
+                    EstimatePoint(
+                        estimate=estimate,
+                        key=estimate_point.get("key", 0),
+                        value=estimate_point.get("value", ""),
+                        description=estimate_point.get("description", ""),
+                        project_id=project_id,
+                        workspace_id=estimate.workspace_id,
+                        created_by=request.user,
+                        updated_by=request.user,
+                    )
+                    for estimate_point in estimate_points
+                ],
+                batch_size=10,
+                ignore_conflicts=True,
+            )
+
+            serializer = EstimatePointSerializer(estimate_points, many=True)
+
+            return Response(serializer.data, status=status.HTTP_200_OK)
+        except Estimate.DoesNotExist:
+            return Response(
+                {"error": "Estimate does not exist"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        except Exception as e:
+            capture_exception(e)
+            return Response(
+                {"error": "Something went wrong please try again later"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+    def patch(self, request, slug, project_id, estimate_id):
+        try:
+            if not len(request.data.get("estimate_points", [])):
+                return Response(
+                    {"error": "Estimate points are required"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
+            estimate_points_data = request.data.get("estimate_points", [])
+
+            estimate_points = EstimatePoint.objects.filter(
+                pk__in=[
+                    estimate_point.get("id") for estimate_point in estimate_points_data
+                ],
+                workspace__slug=slug,
+                project_id=project_id,
+                estimate_id=estimate_id,
+            )
+
+            print(estimate_points)
+            updated_estimate_points = []
+            for estimate_point in estimate_points:
+                # Find the data for that estimate point
+                estimate_point_data = [
+                    point
+                    for point in estimate_points_data
+                    if point.get("id") == str(estimate_point.id)
+                ]
+                print(estimate_point_data)
+                if len(estimate_point_data):
+                    estimate_point.value = estimate_point_data[0].get(
+                        "value", estimate_point.value
+                    )
+                    updated_estimate_points.append(estimate_point)
+
+            EstimatePoint.objects.bulk_update(
+                updated_estimate_points, ["value"], batch_size=10
+            )
+            serializer = EstimatePointSerializer(estimate_points, many=True)
+            return Response(serializer.data, status=status.HTTP_200_OK)
+        except Estimate.DoesNotExist:
+            return Response(
+                {"error": "Estimate does not exist"}, status=status.HTTP_400_BAD_REQUEST
+            )
+        except Exception as e:
+            print(e)
+            return Response(
+                {"error": "Something went wrong please try again later"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )

apiserver/plane/api/views/importer.py

@@ -65,29 +65,35 @@ class ServiceIssueImportSummaryEndpoint(BaseAPIView):
                 )
 
             if service == "jira":
-                project_name = request.data.get("project_name", "")
-                api_token = request.data.get("api_token", "")
-                email = request.data.get("email", "")
-                cloud_hostname = request.data.get("cloud_hostname", "")
-                if (
-                    not bool(project_name)
-                    or not bool(api_token)
-                    or not bool(email)
-                    or not bool(cloud_hostname)
-                ):
-                    return Response(
-                        {
-                            "error": "Project name, Project key, API token, Cloud hostname and email are requied"
-                        },
-                        status=status.HTTP_400_BAD_REQUEST,
-                    )
+                # Check for all the keys
+                params = {
+                    "project_key": "Project key is required",
+                    "api_token": "API token is required",
+                    "email": "Email is required",
+                    "cloud_hostname": "Cloud hostname is required",
+                }
 
-                return Response(
-                    jira_project_issue_summary(
-                        email, api_token, project_name, cloud_hostname
-                    ),
-                    status=status.HTTP_200_OK,
+                for key, error_message in params.items():
+                    if not request.GET.get(key, False):
+                        return Response(
+                            {"error": error_message}, status=status.HTTP_400_BAD_REQUEST
+                        )
+
+                project_key = request.GET.get("project_key", "")
+                api_token = request.GET.get("api_token", "")
+                email = request.GET.get("email", "")
+                cloud_hostname = request.GET.get("cloud_hostname", "")
+
+                response = jira_project_issue_summary(
+                    email, api_token, project_key, cloud_hostname
                 )
+                if "error" in response:
+                    return Response(response, status=status.HTTP_400_BAD_REQUEST)
+                else:
+                    return Response(
+                        response,
+                        status=status.HTTP_200_OK,
+                    )
             return Response(
                 {"error": "Service not supported yet"},
                 status=status.HTTP_400_BAD_REQUEST,
@@ -213,8 +219,10 @@ class ImportServiceEndpoint(BaseAPIView):
 
     def get(self, request, slug):
         try:
-            imports = Importer.objects.filter(workspace__slug=slug).order_by(
-                "-created_at"
+            imports = (
+                Importer.objects.filter(workspace__slug=slug)
+                .order_by("-created_at")
+                .select_related("initiated_by", "project", "workspace")
             )
             serializer = ImporterSerializer(imports, many=True)
             return Response(serializer.data)
@@ -225,6 +233,20 @@ class ImportServiceEndpoint(BaseAPIView):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
+    def delete(self, request, slug, service, pk):
+        try:
+            importer = Importer.objects.filter(
+                pk=pk, service=service, workspace__slug=slug
+            )
+            importer.delete()
+            return Response(status=status.HTTP_204_NO_CONTENT)
+        except Exception as e:
+            capture_exception(e)
+            return Response(
+                {"error": "Something went wrong please try again later"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
 
 class UpdateServiceImportStatusEndpoint(BaseAPIView):
     def post(self, request, slug, project_id, service, importer_id):

apiserver/plane/api/views/issue.py

@@ -12,6 +12,7 @@ from django.views.decorators.gzip import gzip_page
 # Third Party imports
 from rest_framework.response import Response
 from rest_framework import status
+from rest_framework.parsers import MultiPartParser, FormParser
 from sentry_sdk import capture_exception
 
 # Module imports
@@ -28,6 +29,7 @@ from plane.api.serializers import (
     IssueFlatSerializer,
     IssueLinkSerializer,
     IssueLiteSerializer,
+    IssueAttachmentSerializer,
 )
 from plane.api.permissions import (
     ProjectEntityPermission,
@@ -43,6 +45,7 @@ from plane.db.models import (
     IssueProperty,
     Label,
     IssueLink,
+    IssueAttachment,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
 from plane.utils.grouper import group_results
@@ -82,16 +85,14 @@ class IssueViewSet(BaseViewSet):
         )
         if current_instance is not None:
             issue_activity.delay(
-                {
-                    "type": "issue.activity.updated",
-                    "requested_data": requested_data,
-                    "actor_id": str(self.request.user.id),
-                    "issue_id": str(self.kwargs.get("pk", None)),
-                    "project_id": str(self.kwargs.get("project_id", None)),
-                    "current_instance": json.dumps(
-                        IssueSerializer(current_instance).data, cls=DjangoJSONEncoder
-                    ),
-                },
+                type="issue.activity.updated",
+                requested_data=requested_data,
+                actor_id=str(self.request.user.id),
+                issue_id=str(self.kwargs.get("pk", None)),
+                project_id=str(self.kwargs.get("project_id", None)),
+                current_instance=json.dumps(
+                    IssueSerializer(current_instance).data, cls=DjangoJSONEncoder
+                ),
             )
 
         return super().perform_update(serializer)
@@ -102,18 +103,16 @@ class IssueViewSet(BaseViewSet):
         )
         if current_instance is not None:
             issue_activity.delay(
-                {
-                    "type": "issue.activity.deleted",
-                    "requested_data": json.dumps(
-                        {"issue_id": str(self.kwargs.get("pk", None))}
-                    ),
-                    "actor_id": str(self.request.user.id),
-                    "issue_id": str(self.kwargs.get("pk", None)),
-                    "project_id": str(self.kwargs.get("project_id", None)),
-                    "current_instance": json.dumps(
-                        IssueSerializer(current_instance).data, cls=DjangoJSONEncoder
-                    ),
-                },
+                type="issue.activity.deleted",
+                requested_data=json.dumps(
+                    {"issue_id": str(self.kwargs.get("pk", None))}
+                ),
+                actor_id=str(self.request.user.id),
+                issue_id=str(self.kwargs.get("pk", None)),
+                project_id=str(self.kwargs.get("project_id", None)),
+                current_instance=json.dumps(
+                    IssueSerializer(current_instance).data, cls=DjangoJSONEncoder
+                ),
             )
         return super().perform_destroy(instance)
 
@@ -149,6 +148,20 @@ class IssueViewSet(BaseViewSet):
                 .filter(**filters)
                 .annotate(cycle_id=F("issue_cycle__id"))
                 .annotate(module_id=F("issue_module__id"))
+                .annotate(
+                    link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+                    .order_by()
+                    .annotate(count=Func(F("id"), function="Count"))
+                    .values("count")
+                )
+                .annotate(
+                    attachment_count=IssueAttachment.objects.filter(
+                        issue=OuterRef("id")
+                    )
+                    .order_by()
+                    .annotate(count=Func(F("id"), function="Count"))
+                    .values("count")
+                )
             )
 
             issue_queryset = (
@@ -187,16 +200,12 @@ class IssueViewSet(BaseViewSet):
 
                 # Track the issue
                 issue_activity.delay(
-                    {
-                        "type": "issue.activity.created",
-                        "requested_data": json.dumps(
-                            self.request.data, cls=DjangoJSONEncoder
-                        ),
-                        "actor_id": str(request.user.id),
-                        "issue_id": str(serializer.data.get("id", None)),
-                        "project_id": str(project_id),
-                        "current_instance": None,
-                    },
+                    type="issue.activity.created",
+                    requested_data=json.dumps(self.request.data, cls=DjangoJSONEncoder),
+                    actor_id=str(request.user.id),
+                    issue_id=str(serializer.data.get("id", None)),
+                    project_id=str(project_id),
+                    current_instance=None,
                 )
                 return Response(serializer.data, status=status.HTTP_201_CREATED)
             return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -237,6 +246,20 @@ class UserWorkSpaceIssues(BaseAPIView):
                 .prefetch_related("assignees")
                 .prefetch_related("labels")
                 .order_by("-created_at")
+                .annotate(
+                    link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+                    .order_by()
+                    .annotate(count=Func(F("id"), function="Count"))
+                    .values("count")
+                )
+                .annotate(
+                    attachment_count=IssueAttachment.objects.filter(
+                        issue=OuterRef("id")
+                    )
+                    .order_by()
+                    .annotate(count=Func(F("id"), function="Count"))
+                    .values("count")
+                )
             )
             serializer = IssueLiteSerializer(issues, many=True)
             return Response(serializer.data, status=status.HTTP_200_OK)
@@ -328,14 +351,12 @@ class IssueCommentViewSet(BaseViewSet):
             actor=self.request.user if self.request.user is not None else None,
         )
         issue_activity.delay(
-            {
-                "type": "comment.activity.created",
-                "requested_data": json.dumps(serializer.data, cls=DjangoJSONEncoder),
-                "actor_id": str(self.request.user.id),
-                "issue_id": str(self.kwargs.get("issue_id")),
-                "project_id": str(self.kwargs.get("project_id")),
-                "current_instance": None,
-            },
+            type="comment.activity.created",
+            requested_data=json.dumps(serializer.data, cls=DjangoJSONEncoder),
+            actor_id=str(self.request.user.id),
+            issue_id=str(self.kwargs.get("issue_id")),
+            project_id=str(self.kwargs.get("project_id")),
+            current_instance=None,
         )
 
     def perform_update(self, serializer):
@@ -345,17 +366,15 @@ class IssueCommentViewSet(BaseViewSet):
         )
         if current_instance is not None:
             issue_activity.delay(
-                {
-                    "type": "comment.activity.updated",
-                    "requested_data": requested_data,
-                    "actor_id": str(self.request.user.id),
-                    "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,
-                        cls=DjangoJSONEncoder,
-                    ),
-                },
+                type="comment.activity.updated",
+                requested_data=requested_data,
+                actor_id=str(self.request.user.id),
+                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,
+                    cls=DjangoJSONEncoder,
+                ),
             )
 
         return super().perform_update(serializer)
@@ -366,19 +385,17 @@ class IssueCommentViewSet(BaseViewSet):
         )
         if current_instance is not None:
             issue_activity.delay(
-                {
-                    "type": "comment.activity.deleted",
-                    "requested_data": json.dumps(
-                        {"comment_id": str(self.kwargs.get("pk", None))}
-                    ),
-                    "actor_id": str(self.request.user.id),
-                    "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,
-                        cls=DjangoJSONEncoder,
-                    ),
-                },
+                type="comment.activity.deleted",
+                requested_data=json.dumps(
+                    {"comment_id": str(self.kwargs.get("pk", None))}
+                ),
+                actor_id=str(self.request.user.id),
+                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,
+                    cls=DjangoJSONEncoder,
+                ),
             )
         return super().perform_destroy(instance)
 
@@ -632,6 +649,54 @@ class IssueLinkViewSet(BaseViewSet):
             project_id=self.kwargs.get("project_id"),
             issue_id=self.kwargs.get("issue_id"),
         )
+        issue_activity.delay(
+            type="link.activity.created",
+            requested_data=json.dumps(serializer.data, cls=DjangoJSONEncoder),
+            actor_id=str(self.request.user.id),
+            issue_id=str(self.kwargs.get("issue_id")),
+            project_id=str(self.kwargs.get("project_id")),
+            current_instance=None,
+        )
+
+    def perform_update(self, serializer):
+        requested_data = json.dumps(self.request.data, cls=DjangoJSONEncoder)
+        current_instance = (
+            self.get_queryset().filter(pk=self.kwargs.get("pk", None)).first()
+        )
+        if current_instance is not None:
+            issue_activity.delay(
+                type="link.activity.updated",
+                requested_data=requested_data,
+                actor_id=str(self.request.user.id),
+                issue_id=str(self.kwargs.get("issue_id", None)),
+                project_id=str(self.kwargs.get("project_id", None)),
+                current_instance=json.dumps(
+                    IssueLinkSerializer(current_instance).data,
+                    cls=DjangoJSONEncoder,
+                ),
+            )
+
+        return super().perform_update(serializer)
+
+    def perform_destroy(self, instance):
+        current_instance = (
+            self.get_queryset().filter(pk=self.kwargs.get("pk", None)).first()
+        )
+        if current_instance is not None:
+            issue_activity.delay(
+                type="link.activity.deleted",
+                requested_data=json.dumps(
+                    {"link_id": str(self.kwargs.get("pk", None))}
+                ),
+                actor_id=str(self.request.user.id),
+                issue_id=str(self.kwargs.get("issue_id", None)),
+                project_id=str(self.kwargs.get("project_id", None)),
+                current_instance=json.dumps(
+                    IssueLinkSerializer(current_instance).data,
+                    cls=DjangoJSONEncoder,
+                ),
+            )
+        return super().perform_destroy(instance)
 
     def get_queryset(self):
         return (
@@ -683,3 +748,72 @@ class BulkCreateIssueLabelsEndpoint(BaseAPIView):
                 {"error": "Something went wrong please try again later"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
+
+
+class IssueAttachmentEndpoint(BaseAPIView):
+    serializer_class = IssueAttachmentSerializer
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+    model = IssueAttachment
+    parser_classes = (MultiPartParser, FormParser)
+
+    def post(self, request, slug, project_id, issue_id):
+        try:
+            serializer = IssueAttachmentSerializer(data=request.data)
+            if serializer.is_valid():
+                serializer.save(project_id=project_id, issue_id=issue_id)
+                issue_activity.delay(
+                    type="attachment.activity.created",
+                    requested_data=None,
+                    actor_id=str(self.request.user.id),
+                    issue_id=str(self.kwargs.get("issue_id", None)),
+                    project_id=str(self.kwargs.get("project_id", None)),
+                    current_instance=json.dumps(
+                        serializer.data,
+                        cls=DjangoJSONEncoder,
+                    ),
+                )
+                return Response(serializer.data, status=status.HTTP_201_CREATED)
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+        except Exception as e:
+            capture_exception(e)
+            return Response(
+                {"error": "Something went wrong please try again later"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+    def delete(self, request, slug, project_id, issue_id, pk):
+        try:
+            issue_attachment = IssueAttachment.objects.get(pk=pk)
+            issue_attachment.asset.delete(save=False)
+            issue_attachment.delete()
+            issue_activity.delay(
+                type="attachment.activity.deleted",
+                requested_data=None,
+                actor_id=str(self.request.user.id),
+                issue_id=str(self.kwargs.get("issue_id", None)),
+                project_id=str(self.kwargs.get("project_id", None)),
+                current_instance=None,
+            )
+
+            return Response(status=status.HTTP_204_NO_CONTENT)
+        except IssueAttachment.DoesNotExist:
+            return Response(
+                {"error": "Issue Attachment does not exist"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+    def get(self, request, slug, project_id, issue_id):
+        try:
+            issue_attachments = IssueAttachment.objects.filter(
+                issue_id=issue_id, workspace__slug=slug, project_id=project_id
+            )
+            serilaizer = IssueAttachmentSerializer(issue_attachments, many=True)
+            return Response(serilaizer.data, status=status.HTTP_200_OK)
+        except Exception as e:
+            capture_exception(e)
+            return Response(
+                {"error": "Something went wrong please try again later"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )

apiserver/plane/api/views/module.py

@@ -31,6 +31,8 @@ from plane.db.models import (
     Issue,
     ModuleLink,
     ModuleFavorite,
+    IssueLink,
+    IssueAttachment,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
 from plane.utils.grouper import group_results
@@ -204,6 +206,20 @@ class ModuleIssueViewSet(BaseViewSet):
                 .prefetch_related("labels")
                 .order_by(order_by)
                 .filter(**filters)
+                .annotate(
+                    link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+                    .order_by()
+                    .annotate(count=Func(F("id"), function="Count"))
+                    .values("count")
+                )
+                .annotate(
+                    attachment_count=IssueAttachment.objects.filter(
+                        issue=OuterRef("id")
+                    )
+                    .order_by()
+                    .annotate(count=Func(F("id"), function="Count"))
+                    .values("count")
+                )
             )
 
             issues_data = IssueStateSerializer(issues, many=True).data
@@ -286,21 +302,19 @@ class ModuleIssueViewSet(BaseViewSet):
 
             # Capture Issue Activity
             issue_activity.delay(
-                {
-                    "type": "issue.activity",
-                    "requested_data": json.dumps({"modules_list": issues}),
-                    "actor_id": str(self.request.user.id),
-                    "issue_id": str(self.kwargs.get("pk", None)),
-                    "project_id": str(self.kwargs.get("project_id", None)),
-                    "current_instance": json.dumps(
-                        {
-                            "updated_module_issues": update_module_issue_activity,
-                            "created_module_issues": serializers.serialize(
-                                "json", record_to_create
-                            ),
-                        }
-                    ),
-                },
+                type="issue.activity.updated",
+                requested_data=json.dumps({"modules_list": issues}),
+                actor_id=str(self.request.user.id),
+                issue_id=str(self.kwargs.get("pk", None)),
+                project_id=str(self.kwargs.get("project_id", None)),
+                current_instance=json.dumps(
+                    {
+                        "updated_module_issues": update_module_issue_activity,
+                        "created_module_issues": serializers.serialize(
+                            "json", record_to_create
+                        ),
+                    }
+                ),
             )
 
             return Response(

apiserver/plane/api/views/search.py

@@ -12,6 +12,7 @@ from sentry_sdk import capture_exception
 # Module imports
 from .base import BaseAPIView
 from plane.db.models import Workspace, Project, Issue, Cycle, Module, Page, IssueView
+from plane.utils.issue_search import search_issues
 
 
 class GlobalSearchEndpoint(BaseAPIView):
@@ -24,20 +25,26 @@ class GlobalSearchEndpoint(BaseAPIView):
         q = Q()
         for field in fields:
             q |= Q(**{f"{field}__icontains": query})
-        return Workspace.objects.filter(
-            q, workspace_member__member=self.request.user
-        ).distinct().values("name", "id", "slug")
+        return (
+            Workspace.objects.filter(q, workspace_member__member=self.request.user)
+            .distinct()
+            .values("name", "id", "slug")
+        )
 
     def filter_projects(self, query, slug, project_id):
         fields = ["name"]
         q = Q()
         for field in fields:
             q |= Q(**{f"{field}__icontains": query})
-        return Project.objects.filter(
-            q,
-            Q(project_projectmember__member=self.request.user) | Q(network=2),
-            workspace__slug=slug,
-        ).distinct().values("name", "id", "identifier", "workspace__slug")
+        return (
+            Project.objects.filter(
+                q,
+                Q(project_projectmember__member=self.request.user) | Q(network=2),
+                workspace__slug=slug,
+            )
+            .distinct()
+            .values("name", "id", "identifier", "workspace__slug")
+        )
 
     def filter_issues(self, query, slug, project_id):
         fields = ["name", "sequence_id"]
@@ -49,18 +56,22 @@ class GlobalSearchEndpoint(BaseAPIView):
                     q |= Q(**{"sequence_id": sequence_id})
             else:
                 q |= Q(**{f"{field}__icontains": query})
-        return Issue.objects.filter(
-            q,
-            project__project_projectmember__member=self.request.user,
-            workspace__slug=slug,
-            project_id=project_id,
-        ).distinct().values(
-            "name",
-            "id",
-            "sequence_id",
-            "project__identifier",
-            "project_id",
-            "workspace__slug",
+        return (
+            Issue.objects.filter(
+                q,
+                project__project_projectmember__member=self.request.user,
+                workspace__slug=slug,
+                project_id=project_id,
+            )
+            .distinct()
+            .values(
+                "name",
+                "id",
+                "sequence_id",
+                "project__identifier",
+                "project_id",
+                "workspace__slug",
+            )
         )
 
     def filter_cycles(self, query, slug, project_id):
@@ -68,16 +79,20 @@ class GlobalSearchEndpoint(BaseAPIView):
         q = Q()
         for field in fields:
             q |= Q(**{f"{field}__icontains": query})
-        return Cycle.objects.filter(
-            q,
-            project__project_projectmember__member=self.request.user,
-            workspace__slug=slug,
-            project_id=project_id,
-        ).distinct().values(
-            "name",
-            "id",
-            "project_id",
-            "workspace__slug",
+        return (
+            Cycle.objects.filter(
+                q,
+                project__project_projectmember__member=self.request.user,
+                workspace__slug=slug,
+                project_id=project_id,
+            )
+            .distinct()
+            .values(
+                "name",
+                "id",
+                "project_id",
+                "workspace__slug",
+            )
         )
 
     def filter_modules(self, query, slug, project_id):
@@ -85,16 +100,20 @@ class GlobalSearchEndpoint(BaseAPIView):
         q = Q()
         for field in fields:
             q |= Q(**{f"{field}__icontains": query})
-        return Module.objects.filter(
-            q,
-            project__project_projectmember__member=self.request.user,
-            workspace__slug=slug,
-            project_id=project_id,
-        ).distinct().values(
-            "name",
-            "id",
-            "project_id",
-            "workspace__slug",
+        return (
+            Module.objects.filter(
+                q,
+                project__project_projectmember__member=self.request.user,
+                workspace__slug=slug,
+                project_id=project_id,
+            )
+            .distinct()
+            .values(
+                "name",
+                "id",
+                "project_id",
+                "workspace__slug",
+            )
         )
 
     def filter_pages(self, query, slug, project_id):
@@ -102,16 +121,20 @@ class GlobalSearchEndpoint(BaseAPIView):
         q = Q()
         for field in fields:
             q |= Q(**{f"{field}__icontains": query})
-        return Page.objects.filter(
-            q,
-            project__project_projectmember__member=self.request.user,
-            workspace__slug=slug,
-            project_id=project_id,
-        ).distinct().values(
-            "name",
-            "id",
-            "project_id",
-            "workspace__slug",
+        return (
+            Page.objects.filter(
+                q,
+                project__project_projectmember__member=self.request.user,
+                workspace__slug=slug,
+                project_id=project_id,
+            )
+            .distinct()
+            .values(
+                "name",
+                "id",
+                "project_id",
+                "workspace__slug",
+            )
         )
 
     def filter_views(self, query, slug, project_id):
@@ -119,16 +142,20 @@ class GlobalSearchEndpoint(BaseAPIView):
         q = Q()
         for field in fields:
             q |= Q(**{f"{field}__icontains": query})
-        return IssueView.objects.filter(
-            q,
-            project__project_projectmember__member=self.request.user,
-            workspace__slug=slug,
-            project_id=project_id,
-        ).distinct().values(
-            "name",
-            "id",
-            "project_id",
-            "workspace__slug",
+        return (
+            IssueView.objects.filter(
+                q,
+                project__project_projectmember__member=self.request.user,
+                workspace__slug=slug,
+                project_id=project_id,
+            )
+            .distinct()
+            .values(
+                "name",
+                "id",
+                "project_id",
+                "workspace__slug",
+            )
         )
 
     def get(self, request, slug, project_id):
@@ -173,3 +200,53 @@ class GlobalSearchEndpoint(BaseAPIView):
                 {"error": "Something went wrong please try again later"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
+
+
+class IssueSearchEndpoint(BaseAPIView):
+    def get(self, request, slug, project_id):
+        try:
+            query = request.query_params.get("search", False)
+            parent = request.query_params.get("parent", False)
+            blocker_blocked_by = request.query_params.get("blocker_blocked_by", False)
+            issue_id = request.query_params.get("issue_id", False)
+
+            issues = search_issues(query)
+            issues = issues.filter(
+                workspace__slug=slug,
+                project_id=project_id,
+                project__project_projectmember__member=self.request.user,
+            )
+
+            if parent == "true" and issue_id:
+                issue = Issue.objects.get(pk=issue_id)
+                issues = issues.filter(
+                    ~Q(pk=issue_id), ~Q(pk=issue.parent_id), parent__isnull=True
+                ).exclude(
+                    pk__in=Issue.objects.filter(parent__isnull=False).values_list(
+                        "parent_id", flat=True
+                    )
+                )
+            if blocker_blocked_by == "true" and issue_id:
+                issues = issues.filter(blocker_issues=issue_id, blocked_issues=issue_id)
+
+            return Response(
+                issues.values(
+                    "name",
+                    "id",
+                    "sequence_id",
+                    "project__identifier",
+                    "project_id",
+                    "workspace__slug",
+                ),
+                status=status.HTTP_200_OK,
+            )
+        except Issue.DoesNotExist:
+            return Response(
+                {"error": "Issue Does not exist"}, status=status.HTTP_400_BAD_REQUEST
+            )
+        except Exception as e:
+            capture_exception(e)
+            return Response(
+                {"error": "Something went wrong please try again later"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )

apiserver/plane/api/views/workspace.py

@@ -36,6 +36,7 @@ from plane.api.serializers import (
     WorkSpaceMemberInviteSerializer,
     UserLiteSerializer,
     ProjectMemberSerializer,
+    WorkspaceThemeSerializer,
 )
 from plane.api.views.base import BaseAPIView
 from . import BaseViewSet
@@ -48,6 +49,7 @@ from plane.db.models import (
     ProjectMember,
     IssueActivity,
     Issue,
+    WorkspaceTheme,
 )
 from plane.api.permissions import WorkSpaceBasePermission, WorkSpaceAdminPermission
 from plane.bgtasks.workspace_invitation_task import workspace_invitation
@@ -752,3 +754,35 @@ class UserWorkspaceDashboardEndpoint(BaseAPIView):
                 {"error": "Something went wrong please try again later"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
+
+
+class WorkspaceThemeViewSet(BaseViewSet):
+    permission_classes = [
+        WorkSpaceAdminPermission,
+    ]
+    model = WorkspaceTheme
+    serializer_class = WorkspaceThemeSerializer
+
+    def get_queryset(self):
+        return super().get_queryset().filter(workspace__slug=self.kwargs.get("slug"))
+
+    def create(self, request, slug):
+        try:
+            workspace = Workspace.objects.get(slug=slug)
+            serializer = WorkspaceThemeSerializer(data=request.data)
+            if serializer.is_valid():
+                serializer.save(workspace=workspace, actor=request.user)
+                return Response(serializer.data, status=status.HTTP_201_CREATED)
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+        except Workspace.DoesNotExist:
+            return Response(
+                {"error": "Workspace does not exist"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        except Exception as e:
+            print(e)
+            return Response(
+                {"error": "Something went wrong please try again later"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+

apiserver/plane/bgtasks/email_verification_task.py

@@ -4,14 +4,16 @@ from django.template.loader import render_to_string
 from django.utils.html import strip_tags
 
 # Third party imports
-from django_rq import job
+from celery import shared_task
+
+
 from sentry_sdk import capture_exception
 
 # Module imports
 from plane.db.models import User
 
 
-@job("default")
+@shared_task
 def email_verification(first_name, email, token, current_site):
 
     try:

apiserver/plane/bgtasks/forgot_password_task.py

@@ -4,14 +4,14 @@ from django.template.loader import render_to_string
 from django.utils.html import strip_tags
 
 # Third party imports
-from django_rq import job
+from celery import shared_task
 from sentry_sdk import capture_exception
 
 # Module imports
 from plane.db.models import User
 
 
-@job("default")
+@shared_task
 def forgot_password(first_name, email, uidb64, token, current_site):
 
     try:

apiserver/plane/bgtasks/importer_task.py

@@ -11,7 +11,7 @@ from django.core.serializers.json import DjangoJSONEncoder
 from django.contrib.auth.hashers import make_password
 
 # Third Party imports
-from django_rq import job
+from celery import shared_task
 from sentry_sdk import capture_exception
 
 # Module imports
@@ -29,7 +29,7 @@ from plane.db.models import (
 from .workspace_invitation_task import workspace_invitation
 
 
-@job("default")
+@shared_task
 def service_importer(service, importer_id):
     try:
         importer = Importer.objects.get(pk=importer_id)
@@ -38,54 +38,55 @@ def service_importer(service, importer_id):
 
         users = importer.data.get("users", [])
 
-        # For all invited users create the uers
-        new_users = User.objects.bulk_create(
-            [
-                User(
-                    email=user.get("email").strip().lower(),
-                    username=uuid.uuid4().hex,
-                    password=make_password(uuid.uuid4().hex),
-                    is_password_autoset=True,
-                )
-                for user in users
-                if user.get("import", False) == "invite"
-            ],
-            batch_size=10,
-            ignore_conflicts=True,
-        )
+        # Check if we need to import users as well
+        if len(users):
+            # For all invited users create the uers
+            new_users = User.objects.bulk_create(
+                [
+                    User(
+                        email=user.get("email").strip().lower(),
+                        username=uuid.uuid4().hex,
+                        password=make_password(uuid.uuid4().hex),
+                        is_password_autoset=True,
+                    )
+                    for user in users
+                    if user.get("import", False) == "invite"
+                ],
+                batch_size=10,
+                ignore_conflicts=True,
+            )
 
-        workspace_users = User.objects.filter(
-            email__in=[
-                user.get("email").strip().lower()
-                for user in users
-                if user.get("import", False) == "invite"
-                or user.get("import", False) == "map"
-            ]
-        )
+            workspace_users = User.objects.filter(
+                email__in=[
+                    user.get("email").strip().lower()
+                    for user in users
+                    if user.get("import", False) == "invite"
+                    or user.get("import", False) == "map"
+                ]
+            )
 
+            # Add new users to Workspace and project automatically
+            WorkspaceMember.objects.bulk_create(
+                [
+                    WorkspaceMember(member=user, workspace_id=importer.workspace_id)
+                    for user in workspace_users
+                ],
+                batch_size=100,
+                ignore_conflicts=True,
+            )
 
-        # Add new users to Workspace and project automatically
-        WorkspaceMember.objects.bulk_create(
-            [
-                WorkspaceMember(member=user, workspace_id=importer.workspace_id)
-                for user in workspace_users
-            ],
-            batch_size=100,
-            ignore_conflicts=True,
-        )
-
-        ProjectMember.objects.bulk_create(
-            [
-                ProjectMember(
-                    project_id=importer.project_id,
-                    workspace_id=importer.workspace_id,
-                    member=user,
-                )
-                for user in workspace_users
-            ],
-            batch_size=100,
-            ignore_conflicts=True,
-        )
+            ProjectMember.objects.bulk_create(
+                [
+                    ProjectMember(
+                        project_id=importer.project_id,
+                        workspace_id=importer.workspace_id,
+                        member=user,
+                    )
+                    for user in workspace_users
+                ],
+                batch_size=100,
+                ignore_conflicts=True,
+            )
 
         # Check if sync config is on for github importers
         if service == "github" and importer.config.get("sync", False):

apiserver/plane/bgtasks/issue_activites_task.py

@@ -7,7 +7,7 @@ from django.conf import settings
 from django.core.serializers.json import DjangoJSONEncoder
 
 # Third Party imports
-from django_rq import job
+from celery import shared_task
 from sentry_sdk import capture_exception
 
 # Module imports
@@ -136,6 +136,7 @@ def track_priority(
                     comment=f"{actor.email} updated the priority to {requested_data.get('priority')}",
                 )
             )
+    print(issue_activities)
 
 
 # Track chnages in state of the issue
@@ -633,6 +634,40 @@ def create_issue_activity(
     )
 
 
+def track_estimate_points(
+    requested_data, current_instance, issue_id, project, actor, issue_activities
+):
+    if current_instance.get("estimate_point") != requested_data.get("estimate_point"):
+        if requested_data.get("estimate_point") == None:
+            issue_activities.append(
+                IssueActivity(
+                    issue_id=issue_id,
+                    actor=actor,
+                    verb="updated",
+                    old_value=current_instance.get("estimate_point"),
+                    new_value=requested_data.get("estimate_point"),
+                    field="estimate_point",
+                    project=project,
+                    workspace=project.workspace,
+                    comment=f"{actor.email} updated the estimate point to None",
+                )
+            )
+        else:
+            issue_activities.append(
+                IssueActivity(
+                    issue_id=issue_id,
+                    actor=actor,
+                    verb="updated",
+                    old_value=current_instance.get("estimate_point"),
+                    new_value=requested_data.get("estimate_point"),
+                    field="estimate_point",
+                    project=project,
+                    workspace=project.workspace,
+                    comment=f"{actor.email} updated the estimate point to {requested_data.get('estimate_point')}",
+                )
+            )
+
+
 def update_issue_activity(
     requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
@@ -650,7 +685,14 @@ def update_issue_activity(
         "blockers_list": track_blockings,
         "cycles_list": track_cycles,
         "modules_list": track_modules,
+        "estimate_point": track_estimate_points,
     }
+
+    requested_data = json.loads(requested_data) if requested_data is not None else None
+    current_instance = (
+        json.loads(current_instance) if current_instance is not None else None
+    )
+
     for key in requested_data:
         func = ISSUE_ACTIVITY_MAPPER.get(key, None)
         if func is not None:
@@ -664,9 +706,29 @@ def update_issue_activity(
             )
 
 
+def delete_issue_activity(
+    requested_data, current_instance, issue_id, project, actor, issue_activities
+):
+    issue_activities.append(
+        IssueActivity(
+            project=project,
+            workspace=project.workspace,
+            comment=f"{actor.email} deleted the issue",
+            verb="deleted",
+            actor=actor,
+            field="issue",
+        )
+    )
+
+
 def create_comment_activity(
     requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
+    requested_data = json.loads(requested_data) if requested_data is not None else None
+    current_instance = (
+        json.loads(current_instance) if current_instance is not None else None
+    )
+
     issue_activities.append(
         IssueActivity(
             issue_id=issue_id,
@@ -686,6 +748,11 @@ def create_comment_activity(
 def update_comment_activity(
     requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
+    requested_data = json.loads(requested_data) if requested_data is not None else None
+    current_instance = (
+        json.loads(current_instance) if current_instance is not None else None
+    )
+
     if current_instance.get("comment_html") != requested_data.get("comment_html"):
         issue_activities.append(
             IssueActivity(
@@ -705,21 +772,6 @@ def update_comment_activity(
         )
 
 
-def delete_issue_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities
-):
-    issue_activities.append(
-        IssueActivity(
-            project=project,
-            workspace=project.workspace,
-            comment=f"{actor.email} deleted the issue",
-            verb="deleted",
-            actor=actor,
-            field="issue",
-        )
-    )
-
-
 def delete_comment_activity(
     requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
@@ -736,28 +788,119 @@ def delete_comment_activity(
     )
 
 
+def create_link_activity(
+    requested_data, current_instance, issue_id, project, actor, issue_activities
+):
+    requested_data = json.loads(requested_data) if requested_data is not None else None
+    current_instance = (
+        json.loads(current_instance) if current_instance is not None else None
+    )
+
+    issue_activities.append(
+        IssueActivity(
+            issue_id=issue_id,
+            project=project,
+            workspace=project.workspace,
+            comment=f"{actor.email} created a link",
+            verb="created",
+            actor=actor,
+            field="link",
+            new_value=requested_data.get("url", ""),
+            new_identifier=requested_data.get("id", None),
+        )
+    )
+
+
+def update_link_activity(
+    requested_data, current_instance, issue_id, project, actor, issue_activities
+):
+    requested_data = json.loads(requested_data) if requested_data is not None else None
+    current_instance = (
+        json.loads(current_instance) if current_instance is not None else None
+    )
+
+    if current_instance.get("url") != requested_data.get("url"):
+        issue_activities.append(
+            IssueActivity(
+                issue_id=issue_id,
+                project=project,
+                workspace=project.workspace,
+                comment=f"{actor.email} updated a link",
+                verb="updated",
+                actor=actor,
+                field="link",
+                old_value=current_instance.get("url", ""),
+                old_identifier=current_instance.get("id"),
+                new_value=requested_data.get("url", ""),
+                new_identifier=current_instance.get("id", None),
+            )
+        )
+
+
+def delete_link_activity(
+    requested_data, current_instance, issue_id, project, actor, issue_activities
+):
+    issue_activities.append(
+        IssueActivity(
+            issue_id=issue_id,
+            project=project,
+            workspace=project.workspace,
+            comment=f"{actor.email} deleted the link",
+            verb="deleted",
+            actor=actor,
+            field="link",
+        )
+    )
+
+
+def create_attachment_activity(
+    requested_data, current_instance, issue_id, project, actor, issue_activities
+):
+    requested_data = json.loads(requested_data) if requested_data is not None else None
+    current_instance = (
+        json.loads(current_instance) if current_instance is not None else None
+    )
+
+    issue_activities.append(
+        IssueActivity(
+            issue_id=issue_id,
+            project=project,
+            workspace=project.workspace,
+            comment=f"{actor.email} created an attachment",
+            verb="created",
+            actor=actor,
+            field="attachment",
+            new_value=current_instance.get("access", ""),
+            new_identifier=current_instance.get("id", None),
+        )
+    )
+
+
+def delete_attachment_activity(
+    requested_data, current_instance, issue_id, project, actor, issue_activities
+):
+    issue_activities.append(
+        IssueActivity(
+            issue_id=issue_id,
+            project=project,
+            workspace=project.workspace,
+            comment=f"{actor.email} deleted the attachment",
+            verb="deleted",
+            actor=actor,
+            field="attachment",
+        )
+    )
+
+
 # Receive message from room group
-@job("default")
-def issue_activity(event):
+@shared_task
+def issue_activity(
+    type, requested_data, current_instance, issue_id, actor_id, project_id
+):
     try:
         issue_activities = []
-        type = event.get("type")
-        requested_data = (
-            json.loads(event.get("requested_data"))
-            if event.get("current_instance") is not None
-            else None
-        )
-        current_instance = (
-            json.loads(event.get("current_instance"))
-            if event.get("current_instance") is not None
-            else None
-        )
-        issue_id = event.get("issue_id", None)
-        actor_id = event.get("actor_id")
-        project_id = event.get("project_id")
 
         actor = User.objects.get(pk=actor_id)
-
         project = Project.objects.get(pk=project_id)
 
         ACTIVITY_MAPPER = {
@@ -767,6 +910,11 @@ def issue_activity(event):
             "comment.activity.created": create_comment_activity,
             "comment.activity.updated": update_comment_activity,
             "comment.activity.deleted": delete_comment_activity,
+            "link.activity.created": create_link_activity,
+            "link.activity.updated": update_link_activity,
+            "link.activity.deleted": delete_link_activity,
+            "attachment.activity.created": create_attachment_activity,
+            "attachment.activity.deleted": delete_attachment_activity,
         }
 
         func = ACTIVITY_MAPPER.get(type)
@@ -799,5 +947,6 @@ def issue_activity(event):
                     )
         return
     except Exception as e:
+        print(e)
         capture_exception(e)
         return

apiserver/plane/bgtasks/magic_link_code_task.py

@@ -4,13 +4,12 @@ from django.template.loader import render_to_string
 from django.utils.html import strip_tags
 
 # Third party imports
-from django_rq import job
+from celery import shared_task
 from sentry_sdk import capture_exception
 
 
-@job("default")
+@shared_task
 def magic_link(email, key, token, current_site):
-
     try:
         realtivelink = f"/magic-sign-in/?password={token}&key={key}"
         abs_url = "http://" + current_site + realtivelink

apiserver/plane/bgtasks/project_invitation_task.py

@@ -4,18 +4,16 @@ from django.template.loader import render_to_string
 from django.utils.html import strip_tags
 
 # Third party imports
-from django_rq import job
+from celery import shared_task
 from sentry_sdk import capture_exception
 
 # Module imports
 from plane.db.models import Project, User, ProjectMemberInvite
 
 
-@job("default")
+@shared_task
 def project_invitation(email, project_id, token, current_site):
-
     try:
-
         project = Project.objects.get(pk=project_id)
         project_member_invite = ProjectMemberInvite.objects.get(
             token=token, email=email
@@ -35,7 +33,9 @@ def project_invitation(email, project_id, token, current_site):
             "invitation_url": abs_url,
         }
 
-        html_content = render_to_string("emails/invitations/project_invitation.html", context)
+        html_content = render_to_string(
+            "emails/invitations/project_invitation.html", context
+        )
 
         text_content = strip_tags(html_content)
 

apiserver/plane/bgtasks/workspace_invitation_task.py

@@ -5,7 +5,7 @@ from django.utils.html import strip_tags
 from django.conf import settings
 
 # Third party imports
-from django_rq import job
+from celery import shared_task
 from sentry_sdk import capture_exception
 from slack_sdk import WebClient
 from slack_sdk.errors import SlackApiError
@@ -14,7 +14,7 @@ from slack_sdk.errors import SlackApiError
 from plane.db.models import Workspace, User, WorkspaceMemberInvite
 
 
-@job("default")
+@shared_task
 def workspace_invitation(email, workspace_id, token, current_site, invitor):
     try:
         workspace = Workspace.objects.get(pk=workspace_id)

apiserver/plane/celery.py

@@ -0,0 +1,17 @@
+import os
+from celery import Celery
+from plane.settings.redis import redis_instance
+
+# Set the default Django settings module for the 'celery' program.
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "plane.settings.production")
+
+ri = redis_instance()
+
+app = Celery("plane")
+
+# Using a string here means the worker will not have to
+# pickle the object when using Windows.
+app.config_from_object("django.conf:settings", namespace="CELERY")
+
+# Load task modules from all registered Django app configs.
+app.autodiscover_tasks()

apiserver/plane/db/migrations/0026_alter_projectmember_view_props.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.18 on 2023-04-04 21:50
+
+from django.db import migrations, models
+import plane.db.models.project
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0025_auto_20230331_0203'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='projectmember',
+            name='view_props',
+            field=models.JSONField(default=plane.db.models.project.get_default_props),
+        ),
+    ]

apiserver/plane/db/migrations/0027_auto_20230409_0312.py

@@ -0,0 +1,97 @@
+# Generated by Django 3.2.18 on 2023-04-08 21:42
+
+from django.conf import settings
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+import plane.db.models.issue
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0026_alter_projectmember_view_props'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Estimate',
+            fields=[
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
+                ('id', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('name', models.CharField(max_length=255)),
+                ('description', models.TextField(blank=True, verbose_name='Estimate Description')),
+                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='estimate_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
+                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_estimate', to='db.project')),
+                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='estimate_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Last Modified By')),
+                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workspace_estimate', to='db.workspace')),
+            ],
+            options={
+                'verbose_name': 'Estimate',
+                'verbose_name_plural': 'Estimates',
+                'db_table': 'estimates',
+                'ordering': ('name',),
+                'unique_together': {('name', 'project')},
+            },
+        ),
+        migrations.RemoveField(
+            model_name='issue',
+            name='attachments',
+        ),
+        migrations.AddField(
+            model_name='issue',
+            name='estimate_point',
+            field=models.IntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(7)]),
+        ),
+        migrations.CreateModel(
+            name='IssueAttachment',
+            fields=[
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
+                ('id', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('attributes', models.JSONField(default=dict)),
+                ('asset', models.FileField(upload_to=plane.db.models.issue.get_upload_path, validators=[plane.db.models.issue.file_size])),
+                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='issueattachment_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
+                ('issue', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='issue_attachment', to='db.issue')),
+                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_issueattachment', to='db.project')),
+                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='issueattachment_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Last Modified By')),
+                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workspace_issueattachment', to='db.workspace')),
+            ],
+            options={
+                'verbose_name': 'Issue Attachment',
+                'verbose_name_plural': 'Issue Attachments',
+                'db_table': 'issue_attachments',
+                'ordering': ('-created_at',),
+            },
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='estimate',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='projects', to='db.estimate'),
+        ),
+        migrations.CreateModel(
+            name='EstimatePoint',
+            fields=[
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
+                ('id', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('key', models.IntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(7)])),
+                ('description', models.TextField(blank=True)),
+                ('value', models.CharField(max_length=20)),
+                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='estimatepoint_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
+                ('estimate', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='points', to='db.estimate')),
+                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_estimatepoint', to='db.project')),
+                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='estimatepoint_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Last Modified By')),
+                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workspace_estimatepoint', to='db.workspace')),
+            ],
+            options={
+                'verbose_name': 'Estimate Point',
+                'verbose_name_plural': 'Estimate Points',
+                'db_table': 'estimate_points',
+                'ordering': ('value',),
+                'unique_together': {('value', 'estimate')},
+            },
+        ),
+    ]

apiserver/plane/db/migrations/0028_auto_20230414_1703.py

@@ -0,0 +1,48 @@
+# Generated by Django 3.2.18 on 2023-04-14 11:33
+
+from django.conf import settings
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0027_auto_20230409_0312'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='theme',
+            field=models.JSONField(default=dict),
+        ),
+        migrations.AlterField(
+            model_name='issue',
+            name='estimate_point',
+            field=models.IntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(7)]),
+        ),
+        migrations.CreateModel(
+            name='WorkspaceTheme',
+            fields=[
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
+                ('id', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('name', models.CharField(max_length=300)),
+                ('colors', models.JSONField(default=dict)),
+                ('actor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='themes', to=settings.AUTH_USER_MODEL)),
+                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='workspacetheme_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
+                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='workspacetheme_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Last Modified By')),
+                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='themes', to='db.workspace')),
+            ],
+            options={
+                'verbose_name': 'Workspace Theme',
+                'verbose_name_plural': 'Workspace Themes',
+                'db_table': 'workspace_themes',
+                'ordering': ('-created_at',),
+                'unique_together': {('workspace', 'name')},
+            },
+        ),
+    ]

apiserver/plane/db/models/__init__.py

@@ -8,6 +8,7 @@ from .workspace import (
     Team,
     WorkspaceMemberInvite,
     TeamMember,
+    WorkspaceTheme,
 )
 
 from .project import (
@@ -32,6 +33,7 @@ from .issue import (
     IssueBlocker,
     IssueLink,
     IssueSequence,
+    IssueAttachment,
 )
 
 from .asset import FileAsset
@@ -61,4 +63,6 @@ from .integration import (
 
 from .importer import Importer
 
-from .page import Page, PageBlock, PageFavorite, PageLabel
+from .page import Page, PageBlock, PageFavorite, PageLabel
+
+from .estimate import Estimate, EstimatePoint

apiserver/plane/db/models/estimate.py

@@ -0,0 +1,46 @@
+# Django imports
+from django.db import models
+from django.core.validators import MinValueValidator, MaxValueValidator
+
+# Module imports
+from . import ProjectBaseModel
+
+
+class Estimate(ProjectBaseModel):
+    name = models.CharField(max_length=255)
+    description = models.TextField(verbose_name="Estimate Description", blank=True)
+
+    def __str__(self):
+        """Return name of the estimate"""
+        return f"{self.name} <{self.project.name}>"
+
+    class Meta:
+        unique_together = ["name", "project"]
+        verbose_name = "Estimate"
+        verbose_name_plural = "Estimates"
+        db_table = "estimates"
+        ordering = ("name",)
+
+
+class EstimatePoint(ProjectBaseModel):
+    estimate = models.ForeignKey(
+        "db.Estimate",
+        on_delete=models.CASCADE,
+        related_name="points",
+    )
+    key = models.IntegerField(
+        default=0, validators=[MinValueValidator(0), MaxValueValidator(7)]
+    )
+    description = models.TextField(blank=True)
+    value = models.CharField(max_length=20)
+
+    def __str__(self):
+        """Return name of the estimate"""
+        return f"{self.estimate.name} <{self.key}> <{self.value}>"
+
+    class Meta:
+        unique_together = ["value", "estimate"]
+        verbose_name = "Estimate Point"
+        verbose_name_plural = "Estimate Points"
+        db_table = "estimate_points"
+        ordering = ("value",)

apiserver/plane/db/models/issue.py

@@ -1,3 +1,6 @@
+# Python import
+from uuid import uuid4
+
 # Django imports
 from django.contrib.postgres.fields import ArrayField
 from django.db import models
@@ -5,6 +8,8 @@ from django.conf import settings
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 from django.utils import timezone
+from django.core.validators import MinValueValidator, MaxValueValidator
+from django.core.exceptions import ValidationError
 
 # Module imports
 from . import ProjectBaseModel
@@ -33,6 +38,9 @@ class Issue(ProjectBaseModel):
         blank=True,
         related_name="state_issue",
     )
+    estimate_point = models.IntegerField(
+        validators=[MinValueValidator(0), MaxValueValidator(7)], null=True, blank=True
+    )
     name = models.CharField(max_length=255, verbose_name="Issue Name")
     description = models.JSONField(blank=True, default=dict)
     description_html = models.TextField(blank=True, default="<p></p>")
@@ -54,7 +62,6 @@ class Issue(ProjectBaseModel):
         through_fields=("issue", "assignee"),
     )
     sequence_id = models.IntegerField(default=1, verbose_name="Issue Sequence ID")
-    attachments = ArrayField(models.URLField(), size=10, blank=True, default=list)
     labels = models.ManyToManyField(
         "db.Label", blank=True, related_name="labels", through="IssueLabel"
     )
@@ -194,6 +201,38 @@ class IssueLink(ProjectBaseModel):
         return f"{self.issue.name} {self.url}"
 
 
+def get_upload_path(instance, filename):
+    return f"{instance.workspace.id}/{uuid4().hex}-{filename}"
+
+
+def file_size(value):
+    limit = 5 * 1024 * 1024
+    if value.size > limit:
+        raise ValidationError("File too large. Size should not exceed 5 MB.")
+
+
+class IssueAttachment(ProjectBaseModel):
+    attributes = models.JSONField(default=dict)
+    asset = models.FileField(
+        upload_to=get_upload_path,
+        validators=[
+            file_size,
+        ],
+    )
+    issue = models.ForeignKey(
+        "db.Issue", on_delete=models.CASCADE, related_name="issue_attachment"
+    )
+
+    class Meta:
+        verbose_name = "Issue Attachment"
+        verbose_name_plural = "Issue Attachments"
+        db_table = "issue_attachments"
+        ordering = ("-created_at",)
+
+    def __str__(self):
+        return f"{self.issue.name} {self.asset}"
+
+
 class IssueActivity(ProjectBaseModel):
     issue = models.ForeignKey(
         Issue, on_delete=models.SET_NULL, null=True, related_name="issue_activity"

apiserver/plane/db/models/project.py

@@ -26,7 +26,7 @@ def get_default_props():
         "collapsed": True,
         "issueView": "list",
         "filterIssue": None,
-        "groupByProperty": True,
+        "groupByProperty": None,
         "showEmptyGroups": True,
     }
 
@@ -69,6 +69,9 @@ class Project(BaseModel):
     issue_views_view = models.BooleanField(default=True)
     page_view = models.BooleanField(default=True)
     cover_image = models.URLField(blank=True, null=True, max_length=800)
+    estimate = models.ForeignKey(
+        "db.Estimate", on_delete=models.SET_NULL, related_name="projects", null=True
+    )
 
     def __str__(self):
         """Return name of the project"""
@@ -130,7 +133,7 @@ class ProjectMember(ProjectBaseModel):
     )
     comment = models.TextField(blank=True, null=True)
     role = models.PositiveSmallIntegerField(choices=ROLE_CHOICES, default=10)
-    view_props = models.JSONField(null=True)
+    view_props = models.JSONField(default=get_default_props)
     default_props = models.JSONField(default=get_default_props)
 
     class Meta:

apiserver/plane/db/models/user.py

@@ -72,6 +72,7 @@ class User(AbstractBaseUser, PermissionsMixin):
     my_issues_prop = models.JSONField(null=True)
     role = models.CharField(max_length=300, null=True, blank=True)
     is_bot = models.BooleanField(default=False)
+    theme = models.JSONField(default=dict)
 
     USERNAME_FIELD = "email"
 

apiserver/plane/db/models/workspace.py

@@ -36,7 +36,6 @@ class Workspace(BaseModel):
         ordering = ("-created_at",)
 
 
-
 class WorkspaceMember(BaseModel):
     workspace = models.ForeignKey(
         "db.Workspace", on_delete=models.CASCADE, related_name="workspace_member"
@@ -111,7 +110,6 @@ class Team(BaseModel):
 
 
 class TeamMember(BaseModel):
-
     workspace = models.ForeignKey(
         Workspace, on_delete=models.CASCADE, related_name="team_member"
     )
@@ -129,3 +127,24 @@ class TeamMember(BaseModel):
         verbose_name_plural = "Team Members"
         db_table = "team_members"
         ordering = ("-created_at",)
+
+
+class WorkspaceTheme(BaseModel):
+    workspace = models.ForeignKey(
+        "db.Workspace", on_delete=models.CASCADE, related_name="themes"
+    )
+    name = models.CharField(max_length=300)
+    actor = models.ForeignKey(
+        settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="themes"
+    )
+    colors = models.JSONField(default=dict)
+
+    def __str__(self):
+        return str(self.name) + str(self.actor.email)
+
+    class Meta:
+        unique_together = ["workspace", "name"]
+        verbose_name = "Workspace Theme"
+        verbose_name_plural = "Workspace Themes"
+        db_table = "workspace_themes"
+        ordering = ("-created_at",)

apiserver/plane/settings/common.py

@@ -35,7 +35,6 @@ INSTALLED_APPS = [
     "rest_framework_simplejwt.token_blacklist",
     "corsheaders",
     "taggit",
-    "django_rq",
 ]
 
 MIDDLEWARE = [
@@ -208,3 +207,7 @@ SIMPLE_JWT = {
     "SLIDING_TOKEN_LIFETIME": timedelta(minutes=5),
     "SLIDING_TOKEN_REFRESH_LIFETIME": timedelta(days=1),
 }
+
+CELERY_TIMEZONE = TIME_ZONE
+CELERY_TASK_SERIALIZER = 'json'
+CELERY_ACCEPT_CONTENT = ['application/json']

apiserver/plane/settings/local.py

@@ -59,16 +59,8 @@ if os.environ.get("SENTRY_DSN", False):
 
 REDIS_HOST = "localhost"
 REDIS_PORT = 6379
-REDIS_URL = False
+REDIS_URL = os.environ.get("REDIS_URL")
 
-RQ_QUEUES = {
-    "default": {
-        "HOST": "localhost",
-        "PORT": 6379,
-        "DB": 0,
-        "DEFAULT_TIMEOUT": 360,
-    },
-}
 
 MEDIA_URL = "/uploads/"
 MEDIA_ROOT = os.path.join(BASE_DIR, "uploads")
@@ -88,3 +80,6 @@ GPT_ENGINE = os.environ.get("GPT_ENGINE", "text-davinci-003")
 SLACK_BOT_TOKEN = os.environ.get("SLACK_BOT_TOKEN", False)
 
 LOGGER_BASE_URL = os.environ.get("LOGGER_BASE_URL", False)
+
+CELERY_RESULT_BACKEND = os.environ.get("REDIS_URL")
+CELERY_BROKER_URL = os.environ.get("REDIS_URL")

apiserver/plane/settings/production.py

@@ -1,5 +1,7 @@
 """Production settings and globals."""
 from urllib.parse import urlparse
+import ssl
+import certifi
 
 import dj_database_url
 from urllib.parse import urlparse
@@ -236,3 +238,9 @@ GPT_ENGINE = os.environ.get("GPT_ENGINE", "text-davinci-003")
 SLACK_BOT_TOKEN = os.environ.get("SLACK_BOT_TOKEN", False)
 
 LOGGER_BASE_URL = os.environ.get("LOGGER_BASE_URL", False)
+
+redis_url = os.environ.get("REDIS_URL")
+broker_url = f"{redis_url}?ssl_cert_reqs={ssl.CERT_NONE.name}&ssl_ca_certs={certifi.where()}"
+
+CELERY_RESULT_BACKEND = broker_url
+CELERY_BROKER_URL = broker_url

apiserver/plane/settings/redis.py

@@ -1,23 +1,25 @@
+import os
 import redis
 from django.conf import settings
 from urllib.parse import urlparse
 
+
 def redis_instance():
-    # Run in local redis url is false
-    if not settings.REDIS_URL:
-        ri = redis.StrictRedis(host=settings.REDIS_HOST, port=settings.REDIS_PORT, db=0)
+    # connect to redis
+    if (
+        settings.DOCKERIZED
+        or os.environ.get("DJANGO_SETTINGS_MODULE", "plane.settings.production")
+        == "plane.settings.local"
+    ):
+        ri = redis.Redis.from_url(settings.REDIS_URL, db=0)
     else:
-    # Run in prod redis url is true check with dockerized value
-        if settings.DOCKERIZED:
-            ri = redis.from_url(settings.REDIS_URL, db=0)
-        else:
-            url = urlparse(settings.REDIS_URL)
-            ri = redis.Redis(
-                host=url.hostname,
-                port=url.port,
-                password=url.password,
-                ssl=True,
-                ssl_cert_reqs=None,
-            )
-    
-    return ri
+        url = urlparse(settings.REDIS_URL)
+        ri = redis.Redis(
+            host=url.hostname,
+            port=url.port,
+            password=url.password,
+            ssl=True,
+            ssl_cert_reqs=None,
+        )
+
+    return ri

apiserver/plane/settings/staging.py

@@ -1,5 +1,7 @@
 """Production settings and globals."""
 from urllib.parse import urlparse
+import ssl
+import certifi
 
 import dj_database_url
 from urllib.parse import urlparse
@@ -9,7 +11,6 @@ from sentry_sdk.integrations.django import DjangoIntegration
 from sentry_sdk.integrations.redis import RedisIntegration
 
 from .common import *  # noqa
-
 # Database
 DEBUG = True
 DATABASES = {
@@ -197,3 +198,9 @@ GPT_ENGINE = os.environ.get("GPT_ENGINE", "text-davinci-003")
 SLACK_BOT_TOKEN = os.environ.get("SLACK_BOT_TOKEN", False)
 
 LOGGER_BASE_URL = os.environ.get("LOGGER_BASE_URL", False)
+
+redis_url = os.environ.get("REDIS_URL")
+broker_url = f"{redis_url}?ssl_cert_reqs={ssl.CERT_NONE.name}&ssl_ca_certs={certifi.where()}"
+
+CELERY_RESULT_BACKEND = broker_url
+CELERY_BROKER_URL = broker_url

apiserver/plane/utils/importers/jira.py

@@ -3,33 +3,33 @@ from requests.auth import HTTPBasicAuth
 from sentry_sdk import capture_exception
 
 
-def jira_project_issue_summary(email, api_token, project_name, hostname):
+def jira_project_issue_summary(email, api_token, project_key, hostname):
     try:
         auth = HTTPBasicAuth(email, api_token)
         headers = {"Accept": "application/json"}
 
-        issue_url = f"https://{hostname}/rest/api/3/search?jql=project={project_name} AND issuetype=Story"
+        issue_url = f"https://{hostname}/rest/api/3/search?jql=project={project_key} AND issuetype=Story"
         issue_response = requests.request(
             "GET", issue_url, headers=headers, auth=auth
         ).json()["total"]
 
-        module_url = f"https://{hostname}/rest/api/3/search?jql=project={project_name} AND issuetype=Epic"
+        module_url = f"https://{hostname}/rest/api/3/search?jql=project={project_key} AND issuetype=Epic"
         module_response = requests.request(
             "GET", module_url, headers=headers, auth=auth
         ).json()["total"]
 
-        status_url = f"https://{hostname}/rest/api/3/status/?jql=project={project_name}"
+        status_url = f"https://{hostname}/rest/api/3/status/?jql=project={project_key}"
         status_response = requests.request(
             "GET", status_url, headers=headers, auth=auth
         ).json()
 
-        labels_url = f"https://{hostname}/rest/api/3/label/?jql=project={project_name}"
+        labels_url = f"https://{hostname}/rest/api/3/label/?jql=project={project_key}"
         labels_response = requests.request(
             "GET", labels_url, headers=headers, auth=auth
         ).json()["total"]
 
         users_url = (
-            f"https://{hostname}/rest/api/3/users/search?jql=project={project_name}"
+            f"https://{hostname}/rest/api/3/users/search?jql=project={project_key}"
         )
         users_response = requests.request(
             "GET", users_url, headers=headers, auth=auth

apiserver/plane/utils/issue_search.py

@@ -0,0 +1,23 @@
+# Python imports
+import re
+
+# Django imports
+from django.db.models import Q
+
+# Module imports
+from plane.db.models import Issue
+
+
+def search_issues(query):
+    fields = ["name", "sequence_id"]
+    q = Q()
+    for field in fields:
+        if field == "sequence_id":
+            sequences = re.findall(r"\d+\.\d+|\d+", query)
+            for sequence_id in sequences:
+                q |= Q(**{"sequence_id": sequence_id})
+        else:
+            q |= Q(**{f"{field}__icontains": query})
+    return Issue.objects.filter(
+        q,
+    ).distinct()

apiserver/requirements/base.txt

@@ -23,9 +23,9 @@ django-guardian==2.4.0
 dj_rest_auth==2.2.5
 google-auth==2.16.0
 google-api-python-client==2.75.0
-django-rq==2.6.0
 django-redis==5.2.0
 uvicorn==0.20.0
 channels==4.0.0
 openai==0.27.2
-slack-sdk==3.20.2
+slack-sdk==3.20.2
+celery==5.2.7

apiserver/runtime.txt

@@ -1 +1 @@
-python-3.11.2
+python-3.11.3

apiserver/templates/emails/auth/user_welcome_email.html

@@ -144,7 +144,7 @@
                                                                                  <p style="margin: 0;">We have put together some resources to help you get started. Please find them below:</p>
                                                                                  <p style="margin: 0;"> </p>
                                                                                  <ul style="margin: 0; margin-top:20px;">
-                                                                                    <li><a href="https://docs.plane.so/get-started" target="_blank" style="color: #0092ff; text-decoration: underline;">Getting started with Plane</a></li>
+                                                                                    <li><a href="https://docs.plane.so/quick-start" target="_blank" style="color: #0092ff; text-decoration: underline;">Getting started with Plane</a></li>
                                                                                     <li><a href="https://plane.so/changelog" target="_blank" style="color: #0092ff; text-decoration: underline;">Plane Changelog</a></li>
                                                                                  </ul>
                                                                               </div>

apps/app/.env.example

@@ -5,4 +5,6 @@ NEXT_PUBLIC_GITHUB_APP_NAME=""
 NEXT_PUBLIC_GITHUB_ID=""
 NEXT_PUBLIC_SENTRY_DSN=""
 NEXT_PUBLIC_ENABLE_OAUTH=0
-NEXT_PUBLIC_ENABLE_SENTRY=0
+NEXT_PUBLIC_ENABLE_SENTRY=0
+NEXT_PUBLIC_ENABLE_SESSION_RECORDER=0
+NEXT_PUBLIC_TRACK_EVENTS=0

apps/app/components/account/email-code-form.tsx

@@ -180,7 +180,6 @@ export const EmailCodeForm = ({ onSuccess }: any) => {
             </PrimaryButton>
           ) : (
             <PrimaryButton
-              type="submit"
               className="w-full text-center"
               size="md"
               onClick={() => {

apps/app/components/auth-screens/index.ts

@@ -0,0 +1,3 @@
+export * from "./project";
+export * from "./workspace";
+export * from "./not-authorized-view";

apps/app/components/auth-screens/not-authorized-view.tsx

@@ -7,16 +7,16 @@ import { useRouter } from "next/router";
 import DefaultLayout from "layouts/default-layout";
 // hooks
 import useUser from "hooks/use-user";
-// img
-import ProjectSettingImg from "public/project-setting.svg";
+// images
+import ProjectNotAuthorizedImg from "public/auth/project-not-authorized.svg";
+import WorkspaceNotAuthorizedImg from "public/auth/workspace-not-authorized.svg";
 
-type TNotAuthorizedViewProps = {
+type Props = {
   actionButton?: React.ReactNode;
+  type: "project" | "workspace";
 };
 
-export const NotAuthorizedView: React.FC<TNotAuthorizedViewProps> = (props) => {
-  const { actionButton } = props;
-
+export const NotAuthorizedView: React.FC<Props> = ({ actionButton, type }) => {
   const { user } = useUser();
   const { asPath: currentPath } = useRouter();
 
@@ -29,7 +29,12 @@ export const NotAuthorizedView: React.FC<TNotAuthorizedViewProps> = (props) => {
     >
       <div className="flex h-full w-full flex-col items-center justify-center gap-y-5 text-center">
         <div className="h-44 w-72">
-          <Image src={ProjectSettingImg} height="176" width="288" alt="ProjectSettingImg" />
+          <Image
+            src={type === "project" ? ProjectNotAuthorizedImg : WorkspaceNotAuthorizedImg}
+            height="176"
+            width="288"
+            alt="ProjectSettingImg"
+          />
         </div>
         <h1 className="text-xl font-medium text-gray-900">
           Oops! You are not authorized to view this page
@@ -37,15 +42,15 @@ export const NotAuthorizedView: React.FC<TNotAuthorizedViewProps> = (props) => {
 
         <div className="w-full text-base text-gray-500 max-w-md ">
           {user ? (
-            <p className="">
-              You have signed in as {user.email}.{" "}
+            <p>
+              You have signed in as {user.email}. <br />
               <Link href={`/signin?next=${currentPath}`}>
                 <a className="text-gray-900 font-medium">Sign in</a>
               </Link>{" "}
               with different account that has access to this page.
             </p>
           ) : (
-            <p className="">
+            <p>
               You need to{" "}
               <Link href={`/signin?next=${currentPath}`}>
                 <a className="text-gray-900 font-medium">Sign in</a>

apps/app/components/auth-screens/project/index.ts

@@ -0,0 +1 @@
+export * from "./join-project";

apps/app/components/auth-screens/project/join-project.tsx

@@ -0,0 +1,68 @@
+import { useState } from "react";
+
+import Image from "next/image";
+import { useRouter } from "next/router";
+
+import { mutate } from "swr";
+
+// services
+import projectService from "services/project.service";
+// ui
+import { PrimaryButton } from "components/ui";
+// icons
+import { AssignmentClipboardIcon } from "components/icons";
+// images
+import JoinProjectImg from "public/auth/project-not-authorized.svg";
+// fetch-keys
+import { USER_PROJECT_VIEW } from "constants/fetch-keys";
+
+export const JoinProject: React.FC = () => {
+  const [isJoiningProject, setIsJoiningProject] = useState(false);
+
+  const router = useRouter();
+  const { workspaceSlug, projectId } = router.query;
+
+  const handleJoin = () => {
+    if (!workspaceSlug || !projectId) return;
+
+    setIsJoiningProject(true);
+    projectService
+      .joinProject(workspaceSlug as string, {
+        project_ids: [projectId as string],
+      })
+      .then(async () => {
+        await mutate(USER_PROJECT_VIEW(workspaceSlug.toString()));
+        setIsJoiningProject(false);
+      })
+      .catch((err) => {
+        console.error(err);
+        setIsJoiningProject(false);
+      });
+  };
+
+  return (
+    <div className="flex h-full w-full flex-col items-center justify-center gap-y-5 text-center">
+      <div className="h-44 w-72">
+        <Image src={JoinProjectImg} height="176" width="288" alt="JoinProject" />
+      </div>
+      <h1 className="text-xl font-medium text-gray-900">You are not a member of this project</h1>
+
+      <div className="w-full max-w-md text-base text-gray-500 ">
+        <p className="mx-auto w-full text-sm md:w-3/4">
+          You are not a member of this project, but you can join this project by clicking the button
+          below.
+        </p>
+      </div>
+      <div>
+        <PrimaryButton
+          className="flex items-center gap-1"
+          loading={isJoiningProject}
+          onClick={handleJoin}
+        >
+          <AssignmentClipboardIcon height={16} width={16} color="white" />
+          {isJoiningProject ? "Joining..." : "Click to join"}
+        </PrimaryButton>
+      </div>
+    </div>
+  );
+};

apps/app/components/auth-screens/workspace/index.ts

@@ -0,0 +1 @@
+export * from "./not-a-member";

apps/app/components/auth-screens/workspace/not-a-member.tsx

@@ -0,0 +1,44 @@
+import Link from "next/link";
+import { useRouter } from "next/router";
+
+// layouts
+import DefaultLayout from "layouts/default-layout";
+// ui
+import { PrimaryButton, SecondaryButton } from "components/ui";
+
+export const NotAWorkspaceMember = () => {
+  const router = useRouter();
+
+  return (
+    <DefaultLayout
+      meta={{
+        title: "Plane - Unauthorized User",
+        description: "Unauthorized user",
+      }}
+    >
+      <div className="grid h-full place-items-center p-4">
+        <div className="space-y-8 text-center">
+          <div className="space-y-2">
+            <h3 className="text-lg font-semibold">Not Authorized!</h3>
+            <p className="text-sm text-gray-500 w-1/2 mx-auto">
+              You{"'"}re not a member of this workspace. Please contact the workspace admin to get
+              an invitation or check your pending invitations.
+            </p>
+          </div>
+          <div className="flex items-center gap-2 justify-center">
+            <Link href="/invitations">
+              <a>
+                <SecondaryButton>Check pending invites</SecondaryButton>
+              </a>
+            </Link>
+            <Link href="/create-workspace">
+              <a>
+                <PrimaryButton>Create new workspace</PrimaryButton>
+              </a>
+            </Link>
+          </div>
+        </div>
+      </div>
+    </DefaultLayout>
+  );
+};

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

@@ -177,46 +177,49 @@ export const CommandPalette: React.FC = () => {
 
   const handleKeyDown = useCallback(
     (e: KeyboardEvent) => {
+      const singleShortcutKeys = ["p", "v", "d", "h", "q", "m"];
+      const { key, ctrlKey, metaKey, altKey, shiftKey } = e;
+      if (!key) return;
+      const keyPressed = key.toLowerCase();
       if (
         !(e.target instanceof HTMLTextAreaElement) &&
         !(e.target instanceof HTMLInputElement) &&
         !(e.target as Element).classList?.contains("remirror-editor")
       ) {
-        if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === "k") {
+        if ((ctrlKey || metaKey) && keyPressed === "k") {
           e.preventDefault();
           setIsPaletteOpen(true);
-        } else if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === "c") {
-          if (e.altKey) {
+        } else if ((ctrlKey || metaKey) && keyPressed === "c") {
+          if (altKey) {
             e.preventDefault();
             copyIssueUrlToClipboard();
           }
-        } else if (e.key.toLowerCase() === "c") {
+        } else if (keyPressed === "c") {
           e.preventDefault();
           setIsIssueModalOpen(true);
-        } else if (e.key.toLowerCase() === "p") {
-          e.preventDefault();
-          setIsProjectModalOpen(true);
-        } else if (e.key.toLowerCase() === "v") {
-          e.preventDefault();
-          setIsCreateViewModalOpen(true);
-        } else if (e.key.toLowerCase() === "d") {
-          e.preventDefault();
-          setIsCreateUpdatePageModalOpen(true);
-        } else if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === "b") {
+        } else if ((ctrlKey || metaKey) && keyPressed === "b") {
           e.preventDefault();
           toggleCollapsed();
-        } else if (e.key.toLowerCase() === "h") {
-          e.preventDefault();
-          setIsShortcutsModalOpen(true);
-        } else if (e.key.toLowerCase() === "q") {
-          e.preventDefault();
-          setIsCreateCycleModalOpen(true);
-        } else if (e.key.toLowerCase() === "m") {
-          e.preventDefault();
-          setIsCreateModuleModalOpen(true);
-        } else if (e.key === "Delete") {
+        } else if (key === "Delete") {
           e.preventDefault();
           setIsBulkDeleteIssuesModalOpen(true);
+        } else if (
+          singleShortcutKeys.includes(keyPressed) &&
+          (ctrlKey || metaKey || altKey || shiftKey)
+        ) {
+          e.preventDefault();
+        } else if (keyPressed === "p") {
+          setIsProjectModalOpen(true);
+        } else if (keyPressed === "v") {
+          setIsCreateViewModalOpen(true);
+        } else if (keyPressed === "d") {
+          setIsCreateUpdatePageModalOpen(true);
+        } else if (keyPressed === "h") {
+          setIsShortcutsModalOpen(true);
+        } else if (keyPressed === "q") {
+          setIsCreateCycleModalOpen(true);
+        } else if (keyPressed === "m") {
+          setIsCreateModuleModalOpen(true);
         }
       }
     },
@@ -297,6 +300,11 @@ export const CommandPalette: React.FC = () => {
     setIsCreateViewModalOpen(true);
   };
 
+  const createNewPage = () => {
+    setIsPaletteOpen(false);
+    setIsCreateUpdatePageModalOpen(true);
+  };
+
   const createNewModule = () => {
     setIsPaletteOpen(false);
     setIsCreateModuleModalOpen(true);
@@ -652,7 +660,17 @@ export const CommandPalette: React.FC = () => {
                                   <ViewListIcon className="h-4 w-4" color="#6b7280" />
                                   Create new view
                                 </div>
-                                <kbd>Q</kbd>
+                                <kbd>V</kbd>
+                              </Command.Item>
+                            </Command.Group>
+
+                            <Command.Group heading="Page">
+                              <Command.Item onSelect={createNewPage} className="focus:outline-none">
+                                <div className="flex items-center gap-2 text-gray-700">
+                                  <DocumentTextIcon className="h-4 w-4" color="#6b7280" />
+                                  Create new page
+                                </div>
+                                <kbd>D</kbd>
                               </Command.Item>
                             </Command.Group>
                           </>

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

@@ -142,7 +142,9 @@ export const BoardHeader: React.FC<Props> = ({
           >
             {getGroupTitle()}
           </h2>
-          <span className="ml-0.5 rounded-full bg-gray-100 py-1 px-3 text-sm">
+          <span
+            className={`${isCollapsed ? "ml-0.5" : ""} rounded-full bg-gray-100 py-1 px-3 text-sm`}
+          >
             {groupedByIssues?.[groupTitle].length ?? 0}
           </span>
         </div>

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

@@ -108,7 +108,9 @@ export const SingleBoard: React.FC<Props> = ({
                     key={issue.id}
                     draggableId={issue.id}
                     index={index}
-                    isDragDisabled={isNotAllowed || selectedGroup === "created_by"}
+                    isDragDisabled={
+                      isNotAllowed || selectedGroup === "created_by" || selectedGroup === "labels"
+                    }
                   >
                     {(provided, snapshot) => (
                       <SingleBoardIssue

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

@@ -21,11 +21,12 @@ import useToast from "hooks/use-toast";
 import {
   ViewAssigneeSelect,
   ViewDueDateSelect,
+  ViewEstimateSelect,
   ViewPrioritySelect,
   ViewStateSelect,
-} from "components/issues/view-select";
+} from "components/issues";
 // ui
-import { ContextMenu, CustomMenu } from "components/ui";
+import { ContextMenu, CustomMenu, Tooltip } from "components/ui";
 // icons
 import {
   ClipboardDocumentCheckIcon,
@@ -34,7 +35,7 @@ import {
   TrashIcon,
   XMarkIcon,
   ArrowTopRightOnSquareIcon,
-
+  PaperClipIcon,
 } from "@heroicons/react/24/outline";
 // helpers
 import { handleIssuesMutation } from "constants/issue";
@@ -109,7 +110,14 @@ export const SingleBoardIssue: React.FC<Props> = ({
         >(
           CYCLE_ISSUES_WITH_PARAMS(cycleId as string, params),
           (prevData) =>
-            handleIssuesMutation(formData, groupTitle ?? "", selectedGroup, index, prevData),
+            handleIssuesMutation(
+              formData,
+              groupTitle ?? "",
+              selectedGroup,
+              index,
+              orderBy,
+              prevData
+            ),
           false
         );
       else if (moduleId)
@@ -121,10 +129,17 @@ export const SingleBoardIssue: React.FC<Props> = ({
         >(
           MODULE_ISSUES_WITH_PARAMS(moduleId as string),
           (prevData) =>
-            handleIssuesMutation(formData, groupTitle ?? "", selectedGroup, index, prevData),
+            handleIssuesMutation(
+              formData,
+              groupTitle ?? "",
+              selectedGroup,
+              index,
+              orderBy,
+              prevData
+            ),
           false
         );
-      else
+      else {
         mutate<
           | {
               [key: string]: IIssue[];
@@ -132,10 +147,21 @@ export const SingleBoardIssue: React.FC<Props> = ({
           | IIssue[]
         >(
           PROJECT_ISSUES_LIST_WITH_PARAMS(projectId as string, params),
-          (prevData) =>
-            handleIssuesMutation(formData, groupTitle ?? "", selectedGroup, index, prevData),
+          (prevData) => {
+            if (!prevData) return prevData;
+
+            return handleIssuesMutation(
+              formData,
+              groupTitle ?? "",
+              selectedGroup,
+              index,
+              orderBy,
+              prevData
+            );
+          },
           false
         );
+      }
 
       issuesService
         .patchIssue(workspaceSlug as string, projectId as string, issue.id, formData)
@@ -152,7 +178,18 @@ export const SingleBoardIssue: React.FC<Props> = ({
           console.log(error);
         });
     },
-    [workspaceSlug, projectId, cycleId, moduleId, issue, groupTitle, index, selectedGroup, params]
+    [
+      workspaceSlug,
+      projectId,
+      cycleId,
+      moduleId,
+      issue,
+      groupTitle,
+      index,
+      selectedGroup,
+      orderBy,
+      params,
+    ]
   );
 
   const getStyle = (
@@ -343,6 +380,34 @@ export const SingleBoardIssue: React.FC<Props> = ({
                 selfPositioned
               />
             )}
+            {properties.estimate && (
+              <ViewEstimateSelect
+                issue={issue}
+                partialUpdateIssue={partialUpdateIssue}
+                isNotAllowed={isNotAllowed}
+                selfPositioned
+              />
+            )}
+            {properties.link && (
+              <div className="flex items-center rounded-md shadow-sm px-2.5 py-1 cursor-default text-xs border border-gray-200">
+                <Tooltip tooltipHeading="Link" tooltipContent={`${issue.link_count}`}>
+                  <div className="flex items-center gap-1 text-gray-500">
+                    <LinkIcon className="h-3.5 w-3.5 text-gray-500" />
+                    {issue.link_count}
+                  </div>
+                </Tooltip>
+              </div>
+            )}
+            {properties.attachment_count && (
+              <div className="flex items-center rounded-md shadow-sm px-2.5 py-1 cursor-default text-xs border border-gray-200">
+                <Tooltip tooltipHeading="Attachment" tooltipContent={`${issue.attachment_count}`}>
+                  <div className="flex items-center gap-1 text-gray-500">
+                    <PaperClipIcon className="h-3.5 w-3.5 text-gray-500 -rotate-45" />
+                    {issue.attachment_count}
+                  </div>
+                </Tooltip>
+              </div>
+            )}
           </div>
         </div>
       </div>

apps/app/components/core/existing-issues-list-modal.tsx

@@ -19,7 +19,12 @@ import { LayerDiagonalIcon } from "components/icons";
 // types
 import { IIssue } from "types";
 // fetch-keys
-import { CYCLE_ISSUES_WITH_PARAMS, MODULE_ISSUES_WITH_PARAMS } from "constants/fetch-keys";
+import {
+  CYCLE_DETAILS,
+  CYCLE_ISSUES_WITH_PARAMS,
+  MODULE_DETAILS,
+  MODULE_ISSUES_WITH_PARAMS,
+} from "constants/fetch-keys";
 
 type FormInput = {
   issues: string[];
@@ -76,8 +81,14 @@ export const ExistingIssuesListModal: React.FC<Props> = ({
     }
 
     await handleOnSubmit(data);
-    if (cycleId) mutate(CYCLE_ISSUES_WITH_PARAMS(cycleId as string, params));
-    if (moduleId) mutate(MODULE_ISSUES_WITH_PARAMS(moduleId as string, params));
+    if (cycleId) {
+      mutate(CYCLE_ISSUES_WITH_PARAMS(cycleId as string, params));
+      mutate(CYCLE_DETAILS(cycleId as string));
+    }
+    if (moduleId) {
+      mutate(MODULE_ISSUES_WITH_PARAMS(moduleId as string, params));
+      mutate(MODULE_DETAILS(moduleId as string));
+    }
 
     handleClose();
 

apps/app/components/core/feeds.tsx

@@ -8,6 +8,9 @@ import {
   ChartBarIcon,
   ChatBubbleBottomCenterTextIcon,
   ChatBubbleLeftEllipsisIcon,
+  LinkIcon,
+  PaperClipIcon,
+  PlayIcon,
   RectangleGroupIcon,
   Squares2X2Icon,
   TrashIcon,
@@ -70,6 +73,10 @@ const activityDetails: {
     message: "updated the description.",
     icon: <ChatBubbleBottomCenterTextIcon className="h-3 w-3 text-gray-500" aria-hidden="true" />,
   },
+  estimate_point: {
+    message: "set the estimate point to",
+    icon: <PlayIcon className="h-3 w-3 text-gray-500 -rotate-90" aria-hidden="true" />,
+  },
   target_date: {
     message: "set the due date to",
     icon: <CalendarDaysIcon className="h-3 w-3 text-gray-500" aria-hidden="true" />,
@@ -82,6 +89,18 @@ const activityDetails: {
     message: "deleted the issue.",
     icon: <TrashIcon className="h-3 w-3 text-gray-500" aria-hidden="true" />,
   },
+  estimate: {
+    message: "updated the estimate",
+    icon: <PlayIcon className="h-3 w-3 text-gray-500 -rotate-90" aria-hidden="true" />,
+  },
+  link: {
+    message: "updated the link",
+    icon: <LinkIcon className="h-3 w-3 text-gray-500" aria-hidden="true" />,
+  },
+  attachment: {
+    message: "updated the attachment",
+    icon: <PaperClipIcon className="h-3 w-3 text-gray-500 " aria-hidden="true" />,
+  },
 };
 
 export const Feeds: React.FC<any> = ({ activities }) => (
@@ -117,13 +136,20 @@ export const Feeds: React.FC<any> = ({ activities }) => (
               : "removed the priority";
         } else if (activity.field === "description") {
           action = "updated the";
+        } else if (activity.field === "attachment") {
+          action = `${activity.verb} the`;
+        } else if (activity.field === "link") {
+          action = `${activity.verb} the`;
         }
         // for values that are after the action clause
         let value: any = activity.new_value ? activity.new_value : activity.old_value;
         if (
           activity.verb === "created" &&
           activity.field !== "cycles" &&
-          activity.field !== "modules"
+          activity.field !== "modules" &&
+          activity.field !== "attachment" &&
+          activity.field !== "link" &&
+          activity.field !== "estimate"
         ) {
           const { workspace_detail, project, issue } = activity;
           value = (
@@ -160,6 +186,14 @@ export const Feeds: React.FC<any> = ({ activities }) => (
           value = renderShortNumericDateFormat(date as string);
         } else if (activity.field === "description") {
           value = "description";
+        } else if (activity.field === "attachment") {
+          value = "attachment";
+        } else if (activity.field === "link") {
+          value = "link";
+        } else if (activity.field === "estimate_point") {
+          value = activity.new_value
+            ? activity.new_value + ` Point${parseInt(activity.new_value ?? "", 10) > 1 ? "s" : ""}`
+            : "None";
         }
 
         if (activity.field === "comment") {

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

@@ -309,7 +309,19 @@ export const FilterList: React.FC<any> = ({ filters, setFilters }) => {
                   )}
                 </div>
               ) : (
-                <span className="capitalize">{filters[key as keyof typeof filters]}</span>
+                <div className="flex items-center gap-x-1 capitalize">
+                  {filters[key as keyof typeof filters]}
+                  <button
+                    type="button"
+                    onClick={() =>
+                      setFilters({
+                        [key]: null,
+                      })
+                    }
+                  >
+                    <XMarkIcon className="h-3 w-3" />
+                  </button>
+                </div>
               )}
             </div>
           );
@@ -319,6 +331,7 @@ export const FilterList: React.FC<any> = ({ filters, setFilters }) => {
           type="button"
           onClick={() =>
             setFilters({
+              type: null,
               state: null,
               priority: null,
               assignees: null,

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

@@ -17,6 +17,10 @@ import { Input, Spinner, PrimaryButton } from "components/ui";
 // hooks
 import useOutsideClickDetector from "hooks/use-outside-click-detector";
 
+const unsplashEnabled =
+  process.env.NEXT_PUBLIC_UNSPLASH_ENABLED === "true" ||
+  process.env.NEXT_PUBLIC_UNSPLASH_ENABLED === "1";
+
 const tabOptions = [
   {
     key: "unsplash",
@@ -56,10 +60,12 @@ export const ImagePickerPopover: React.FC<Props> = ({ label, value, onChange })
     onChange(images[0].urls.regular);
   }, [value, onChange, images]);
 
+  if (!unsplashEnabled) return null;
+
   return (
     <Popover className="relative z-[2]" ref={ref}>
       <Popover.Button
-        className="rounded-md border border-gray-500 bg-white px-2 py-1 text-xs text-gray-700"
+        className="rounded border border-gray-500 bg-white px-2 py-1 text-xs text-gray-700"
         onClick={() => setIsOpen((prev) => !prev)}
       >
         {label}
@@ -92,13 +98,7 @@ export const ImagePickerPopover: React.FC<Props> = ({ label, value, onChange })
               </Tab.List>
               <Tab.Panels className="h-full w-full flex-1 overflow-y-auto overflow-x-hidden">
                 <Tab.Panel className="h-full w-full space-y-4">
-                  <form
-                    onSubmit={(e) => {
-                      e.preventDefault();
-                      setSearchParams(formData.search);
-                    }}
-                    className="flex gap-x-2 pt-7"
-                  >
+                  <div className="flex gap-x-2 pt-7">
                     <Input
                       name="search"
                       className="text-sm"
@@ -107,10 +107,15 @@ export const ImagePickerPopover: React.FC<Props> = ({ label, value, onChange })
                       onChange={(e) => setFormData({ ...formData, search: e.target.value })}
                       placeholder="Search for images"
                     />
-                    <PrimaryButton type="submit" className="bg-indigo-600" size="sm">
+                    <PrimaryButton
+                      type="button"
+                      onClick={() => setSearchParams(formData.search)}
+                      className="bg-indigo-600"
+                      size="sm"
+                    >
                       Search
                     </PrimaryButton>
-                  </form>
+                  </div>
                   {images ? (
                     <div className="grid grid-cols-4 gap-4">
                       {images.map((image) => (

apps/app/components/core/index.ts

@@ -8,7 +8,6 @@ export * from "./image-upload-modal";
 export * from "./issues-view-filter";
 export * from "./issues-view";
 export * from "./link-modal";
-export * from "./not-authorized-view";
 export * from "./image-picker-popover";
 export * from "./filter-list";
 export * from "./feeds";

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

@@ -20,6 +20,7 @@ import { replaceUnderscoreIfSnakeCase } from "helpers/string.helper";
 import { Properties } from "types";
 // constants
 import { GROUP_BY_OPTIONS, ORDER_BY_OPTIONS, FILTER_ISSUE_OPTIONS } from "constants/issue";
+import useEstimateOption from "hooks/use-estimate-option";
 
 export const IssuesFilterView: React.FC = () => {
   const router = useRouter();
@@ -45,6 +46,8 @@ export const IssuesFilterView: React.FC = () => {
     projectId as string
   );
 
+  const { isEstimateActive } = useEstimateOption();
+
   return (
     <div className="flex items-center gap-2">
       <div className="flex items-center gap-x-1">
@@ -233,20 +236,24 @@ export const IssuesFilterView: React.FC = () => {
                   <div className="space-y-2 py-3">
                     <h4 className="text-sm text-gray-600">Display Properties</h4>
                     <div className="flex flex-wrap items-center gap-2">
-                      {Object.keys(properties).map((key) => (
-                        <button
-                          key={key}
-                          type="button"
-                          className={`rounded border px-2 py-1 text-xs capitalize ${
-                            properties[key as keyof Properties]
-                              ? "border-theme bg-theme text-white"
-                              : "border-gray-300"
-                          }`}
-                          onClick={() => setProperties(key as keyof Properties)}
-                        >
-                          {key === "key" ? "ID" : replaceUnderscoreIfSnakeCase(key)}
-                        </button>
-                      ))}
+                      {Object.keys(properties).map((key) => {
+                        if (key === "estimate" && !isEstimateActive) return null;
+
+                        return (
+                          <button
+                            key={key}
+                            type="button"
+                            className={`rounded border px-2 py-1 text-xs capitalize ${
+                              properties[key as keyof Properties]
+                                ? "border-theme bg-theme text-white"
+                                : "border-gray-300"
+                            }`}
+                            onClick={() => setProperties(key as keyof Properties)}
+                          >
+                            {key === "key" ? "ID" : replaceUnderscoreIfSnakeCase(key)}
+                          </button>
+                        );
+                      })}
                     </div>
                   </div>
                 </div>

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

@@ -10,6 +10,9 @@ import { DragDropContext, DropResult } from "react-beautiful-dnd";
 import issuesService from "services/issues.service";
 import stateService from "services/state.service";
 import modulesService from "services/modules.service";
+import trackEventServices from "services/track-event.service";
+// contexts
+import { useProjectMyMembership } from "contexts/project-member.context";
 // hooks
 import useToast from "hooks/use-toast";
 import useIssuesView from "hooks/use-issues-view";
@@ -20,7 +23,7 @@ import StrictModeDroppable from "components/dnd/StrictModeDroppable";
 import { CreateUpdateViewModal } from "components/views";
 import { TransferIssues, TransferIssuesModal } from "components/cycles";
 // ui
-import { EmptySpace, EmptySpaceItem, PrimaryButton, Spinner } from "components/ui";
+import { EmptySpace, EmptySpaceItem, EmptyState, PrimaryButton, Spinner } from "components/ui";
 import { CalendarView } from "./calendar-view";
 // icons
 import {
@@ -29,11 +32,13 @@ import {
   RectangleStackIcon,
   TrashIcon,
 } from "@heroicons/react/24/outline";
-import { ExclamationIcon, TransferIcon } from "components/icons";
+// images
+import emptyIssue from "public/empty-state/empty-issue.svg";
 // helpers
 import { getStatesList } from "helpers/state.helper";
+import { orderArrayBy } from "helpers/array.helper";
 // types
-import { IIssue, IIssueFilterOptions, UserAuth } from "types";
+import { IIssue, IIssueFilterOptions } from "types";
 // fetch-keys
 import {
   CYCLE_DETAILS,
@@ -43,19 +48,18 @@ import {
   PROJECT_ISSUES_LIST_WITH_PARAMS,
   STATE_LIST,
 } from "constants/fetch-keys";
+// image
 
 type Props = {
   type?: "issue" | "cycle" | "module";
   openIssuesListModal?: () => void;
   isCompleted?: boolean;
-  userAuth: UserAuth;
 };
 
 export const IssuesView: React.FC<Props> = ({
   type = "issue",
   openIssuesListModal,
   isCompleted = false,
-  userAuth,
 }) => {
   // create issue modal
   const [createIssueModal, setCreateIssueModal] = useState(false);
@@ -83,6 +87,8 @@ export const IssuesView: React.FC<Props> = ({
   const router = useRouter();
   const { workspaceSlug, projectId, cycleId, moduleId, viewId } = router.query;
 
+  const { memberRole } = useProjectMyMembership();
+
   const { setToastAlert } = useToast();
 
   const {
@@ -186,71 +192,31 @@ export const IssuesView: React.FC<Props> = ({
 
         const sourceGroup = source.droppableId; // source group id
 
-        // TODO: move this mutation logic to a separate function
-        if (cycleId)
-          mutate<{
-            [key: string]: IIssue[];
-          }>(
-            CYCLE_ISSUES_WITH_PARAMS(cycleId as string, params),
-            (prevData) => {
-              if (!prevData) return prevData;
+        mutate<{
+          [key: string]: IIssue[];
+        }>(
+          cycleId
+            ? CYCLE_ISSUES_WITH_PARAMS(cycleId as string, params)
+            : moduleId
+            ? MODULE_ISSUES_WITH_PARAMS(moduleId as string, params)
+            : PROJECT_ISSUES_LIST_WITH_PARAMS(projectId as string, params),
+          (prevData) => {
+            if (!prevData) return prevData;
 
-              const sourceGroupArray = prevData[sourceGroup];
-              const destinationGroupArray = groupedByIssues[destinationGroup];
+            const sourceGroupArray = prevData[sourceGroup];
+            const destinationGroupArray = groupedByIssues[destinationGroup];
 
-              sourceGroupArray.splice(source.index, 1);
-              destinationGroupArray.splice(destination.index, 0, draggedItem);
+            sourceGroupArray.splice(source.index, 1);
+            destinationGroupArray.splice(destination.index, 0, draggedItem);
 
-              return {
-                ...prevData,
-                [sourceGroup]: sourceGroupArray,
-                [destinationGroup]: destinationGroupArray,
-              };
-            },
-            false
-          );
-        else if (moduleId)
-          mutate<{
-            [key: string]: IIssue[];
-          }>(
-            MODULE_ISSUES_WITH_PARAMS(moduleId as string, params),
-            (prevData) => {
-              if (!prevData) return prevData;
-
-              const sourceGroupArray = prevData[sourceGroup];
-              const destinationGroupArray = groupedByIssues[destinationGroup];
-
-              sourceGroupArray.splice(source.index, 1);
-              destinationGroupArray.splice(destination.index, 0, draggedItem);
-
-              return {
-                ...prevData,
-                [sourceGroup]: sourceGroupArray,
-                [destinationGroup]: destinationGroupArray,
-              };
-            },
-            false
-          );
-        else
-          mutate<{ [key: string]: IIssue[] }>(
-            PROJECT_ISSUES_LIST_WITH_PARAMS(projectId as string, params),
-            (prevData) => {
-              if (!prevData) return prevData;
-
-              const sourceGroupArray = prevData[sourceGroup];
-              const destinationGroupArray = groupedByIssues[destinationGroup];
-
-              sourceGroupArray.splice(source.index, 1);
-              destinationGroupArray.splice(destination.index, 0, draggedItem);
-
-              return {
-                ...prevData,
-                [sourceGroup]: sourceGroupArray,
-                [destinationGroup]: destinationGroupArray,
-              };
-            },
-            false
-          );
+            return {
+              ...prevData,
+              [sourceGroup]: orderArrayBy(sourceGroupArray, orderBy),
+              [destinationGroup]: orderArrayBy(destinationGroupArray, orderBy),
+            };
+          },
+          false
+        );
 
         // patch request
         issuesService
@@ -259,7 +225,22 @@ export const IssuesView: React.FC<Props> = ({
             state: draggedItem.state,
             sort_order: draggedItem.sort_order,
           })
-          .then(() => {
+          .then((response) => {
+            const sourceStateBeforeDrag = states.find((state) => state.name === source.droppableId);
+
+            if (
+              sourceStateBeforeDrag?.group !== "completed" &&
+              response?.state_detail?.group === "completed"
+            )
+              trackEventServices.trackIssueMarkedAsDoneEvent({
+                workspaceSlug,
+                workspaceId: draggedItem.workspace,
+                projectName: draggedItem.project_detail.name,
+                projectIdentifier: draggedItem.project_detail.identifier,
+                projectId,
+                issueId: draggedItem.id,
+              });
+
             if (cycleId) {
               mutate(CYCLE_ISSUES_WITH_PARAMS(cycleId as string, params));
               mutate(CYCLE_DETAILS(cycleId as string));
@@ -282,6 +263,7 @@ export const IssuesView: React.FC<Props> = ({
       orderBy,
       handleDeleteIssue,
       params,
+      states,
     ]
   );
 
@@ -377,6 +359,9 @@ export const IssuesView: React.FC<Props> = ({
     (key) => filters[key as keyof IIssueFilterOptions] === null
   );
 
+  const areFiltersApplied =
+    Object.keys(filters).length > 0 && nullFilters.length !== Object.keys(filters).length;
+
   return (
     <>
       <CreateUpdateViewModal
@@ -406,11 +391,15 @@ export const IssuesView: React.FC<Props> = ({
         handleClose={() => setTransferIssuesModal(false)}
         isOpen={transferIssuesModal}
       />
-      <div className="mb-5 -mt-4">
-        <div className="flex items-center justify-between gap-2">
-          <FilterList filters={filters} setFilters={setFilters} />
-          {Object.keys(filters).length > 0 &&
-            nullFilters.length !== Object.keys(filters).length && (
+      {issueView !== "calendar" && (
+        <>
+          <div
+            className={`flex items-center justify-between gap-2 ${
+              issueView === "list" && areFiltersApplied ? "px-8 mt-6" : "-mt-2"
+            }`}
+          >
+            <FilterList filters={filters} setFilters={setFilters} />
+            {areFiltersApplied && (
               <PrimaryButton
                 onClick={() => {
                   if (viewId) {
@@ -431,20 +420,19 @@ export const IssuesView: React.FC<Props> = ({
                 {viewId ? "Update" : "Save"} view
               </PrimaryButton>
             )}
-        </div>
-      </div>
-
-      {Object.keys(filters).length > 0 && nullFilters.length !== Object.keys(filters).length && (
-        <div className="mb-5 border-t" />
+          </div>
+          {areFiltersApplied && (
+            <div className={` ${issueView === "list" ? "mt-4" : "my-4"} border-t`} />
+          )}
+        </>
       )}
-
       <DragDropContext onDragEnd={handleOnDragEnd}>
         <StrictModeDroppable droppableId="trashBox">
           {(provided, snapshot) => (
             <div
               className={`${
                 trashBox ? "pointer-events-auto opacity-100" : "pointer-events-none opacity-0"
-              } fixed top-9 right-9 z-20 flex h-28 w-96 flex-col items-center justify-center gap-2 rounded border-2 border-red-500 bg-red-100 p-3 text-xs font-medium italic text-red-500 ${
+              } fixed top-9 right-9 z-30 flex h-28 w-96 flex-col items-center justify-center gap-2 rounded border-2 border-red-500 bg-red-100 p-3 text-xs font-medium italic text-red-500 ${
                 snapshot.isDraggingOver ? "bg-red-500 text-white" : ""
               } duration-200`}
               ref={provided.innerRef}
@@ -452,7 +440,6 @@ export const IssuesView: React.FC<Props> = ({
             >
               <TrashIcon className="h-4 w-4" />
               Drop issue here to delete
-              {provided.placeholder}
             </div>
           )}
         </StrictModeDroppable>
@@ -477,7 +464,7 @@ export const IssuesView: React.FC<Props> = ({
                       : null
                   }
                   isCompleted={isCompleted}
-                  userAuth={userAuth}
+                  userAuth={memberRole}
                 />
               ) : issueView === "kanban" ? (
                 <AllBoards
@@ -497,12 +484,19 @@ export const IssuesView: React.FC<Props> = ({
                       : null
                   }
                   isCompleted={isCompleted}
-                  userAuth={userAuth}
+                  userAuth={memberRole}
                 />
               ) : (
                 <CalendarView />
               )}
             </>
+          ) : type === "issue" ? (
+            <EmptyState
+              type="issue"
+              title="Create New Issue"
+              description="Issues help you track individual pieces of work. With Issues, keep track of what's going on, who is working on it, and what's done."
+              imgURL={emptyIssue}
+            />
           ) : (
             <div className="grid h-full w-full place-items-center px-4 sm:px-0">
               <EmptySpace

apps/app/components/core/list-view/all-lists.tsx

@@ -36,7 +36,7 @@ export const AllLists: React.FC<Props> = ({
   return (
     <>
       {groupedByIssues && (
-        <div className="flex flex-col space-y-5">
+        <div className="flex flex-col space-y-5 bg-white">
           {Object.keys(groupedByIssues).map((singleGroup) => {
             const currentState =
               selectedGroup === "state" ? states?.find((s) => s.id === singleGroup) : null;

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

@@ -13,6 +13,7 @@ import useToast from "hooks/use-toast";
 import {
   ViewAssigneeSelect,
   ViewDueDateSelect,
+  ViewEstimateSelect,
   ViewPrioritySelect,
   ViewStateSelect,
 } from "components/issues/view-select";
@@ -28,6 +29,7 @@ import {
   TrashIcon,
   XMarkIcon,
   ArrowTopRightOnSquareIcon,
+  PaperClipIcon,
 } from "@heroicons/react/24/outline";
 // helpers
 import { copyTextToClipboard, truncateText } from "helpers/string.helper";
@@ -80,7 +82,7 @@ export const SingleListIssue: React.FC<Props> = ({
 
   const { setToastAlert } = useToast();
 
-  const { groupByProperty: selectedGroup, params } = useIssueView();
+  const { groupByProperty: selectedGroup, orderBy, params } = useIssueView();
 
   const partialUpdateIssue = useCallback(
     (formData: Partial<IIssue>) => {
@@ -95,7 +97,14 @@ export const SingleListIssue: React.FC<Props> = ({
         >(
           CYCLE_ISSUES_WITH_PARAMS(cycleId as string, params),
           (prevData) =>
-            handleIssuesMutation(formData, groupTitle ?? "", selectedGroup, index, prevData),
+            handleIssuesMutation(
+              formData,
+              groupTitle ?? "",
+              selectedGroup,
+              index,
+              orderBy,
+              prevData
+            ),
           false
         );
 
@@ -108,7 +117,14 @@ export const SingleListIssue: React.FC<Props> = ({
         >(
           MODULE_ISSUES_WITH_PARAMS(moduleId as string, params),
           (prevData) =>
-            handleIssuesMutation(formData, groupTitle ?? "", selectedGroup, index, prevData),
+            handleIssuesMutation(
+              formData,
+              groupTitle ?? "",
+              selectedGroup,
+              index,
+              orderBy,
+              prevData
+            ),
           false
         );
 
@@ -120,7 +136,7 @@ export const SingleListIssue: React.FC<Props> = ({
       >(
         PROJECT_ISSUES_LIST_WITH_PARAMS(projectId as string, params),
         (prevData) =>
-          handleIssuesMutation(formData, groupTitle ?? "", selectedGroup, index, prevData),
+          handleIssuesMutation(formData, groupTitle ?? "", selectedGroup, index, orderBy, prevData),
         false
       );
 
@@ -136,7 +152,18 @@ export const SingleListIssue: React.FC<Props> = ({
           } else mutate(PROJECT_ISSUES_LIST_WITH_PARAMS(projectId as string, params));
         });
     },
-    [workspaceSlug, projectId, cycleId, moduleId, issue, groupTitle, index, selectedGroup, params]
+    [
+      workspaceSlug,
+      projectId,
+      cycleId,
+      moduleId,
+      issue,
+      groupTitle,
+      index,
+      selectedGroup,
+      orderBy,
+      params,
+    ]
   );
 
   const handleCopyText = () => {
@@ -189,9 +216,9 @@ export const SingleListIssue: React.FC<Props> = ({
           </ContextMenu.Item>
         </a>
       </ContextMenu>
-      <div className="border-b border-gray-300 last:border-b-0">
+      <div className="border-b mx-6 border-gray-300 last:border-b-0">
         <div
-          className="flex items-center justify-between gap-2 px-4 py-3"
+          className="flex items-center justify-between gap-2  py-3"
           onContextMenu={(e) => {
             e.preventDefault();
             setContextMenu(true);
@@ -273,6 +300,34 @@ export const SingleListIssue: React.FC<Props> = ({
                 isNotAllowed={isNotAllowed}
               />
             )}
+            {properties.estimate && (
+              <ViewEstimateSelect
+                issue={issue}
+                partialUpdateIssue={partialUpdateIssue}
+                position="right"
+                isNotAllowed={isNotAllowed}
+              />
+            )}
+            {properties.link && (
+              <div className="flex items-center rounded-md shadow-sm px-2.5 py-1 cursor-default text-xs border border-gray-200">
+                <Tooltip tooltipHeading="Link" tooltipContent={`${issue.link_count}`}>
+                  <div className="flex items-center gap-1 text-gray-500">
+                    <LinkIcon className="h-3.5 w-3.5 text-gray-500" />
+                    {issue.link_count}
+                  </div>
+                </Tooltip>
+              </div>
+            )}
+            {properties.attachment_count && (
+              <div className="flex items-center rounded-md shadow-sm px-2.5 py-1 cursor-default text-xs border border-gray-200">
+                <Tooltip tooltipHeading="Attachment" tooltipContent={`${issue.attachment_count}`}>
+                  <div className="flex items-center gap-1 text-gray-500">
+                    <PaperClipIcon className="h-3.5 w-3.5 text-gray-500 -rotate-45" />
+                    {issue.attachment_count}
+                  </div>
+                </Tooltip>
+              </div>
+            )}
             {type && !isNotAllowed && (
               <CustomMenu width="auto" ellipsis>
                 <CustomMenu.MenuItem onClick={editIssue}>

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

@@ -132,10 +132,10 @@ export const SingleList: React.FC<Props> = ({
   return (
     <Disclosure key={groupTitle} as="div" defaultOpen>
       {({ open }) => (
-        <div className="rounded-[10px] border border-gray-300 bg-white">
+        <div className="bg-white">
           <div
             className={`flex items-center justify-between bg-gray-100 px-5 py-3 ${
-              open ? "rounded-t-[10px]" : "rounded-[10px]"
+              open ? "" : "rounded-[10px]"
             }`}
           >
             <Disclosure.Button>

apps/app/components/cycles/modal.tsx

@@ -21,6 +21,7 @@ import {
   CYCLE_COMPLETE_LIST,
   CYCLE_CURRENT_AND_UPCOMING_LIST,
   CYCLE_DRAFT_LIST,
+  CYCLE_INCOMPLETE_LIST,
 } from "constants/fetch-keys";
 
 type CycleModalProps = {
@@ -56,6 +57,7 @@ export const CreateUpdateCycleModal: React.FC<CycleModalProps> = ({
           default:
             mutate(CYCLE_DRAFT_LIST(projectId as string));
         }
+        mutate(CYCLE_INCOMPLETE_LIST(projectId as string));
         handleClose();
 
         setToastAlert({

apps/app/components/cycles/sidebar.tsx

@@ -350,7 +350,7 @@ export const CycleDetailsSidebar: React.FC<Props> = ({
             </div>
 
             <div className="flex w-full flex-col items-center justify-start gap-2 border-t border-gray-300 px-6 py-6 ">
-              <Disclosure>
+              <Disclosure defaultOpen>
                 {({ open }) => (
                   <div
                     className={`relative  flex  h-full w-full flex-col ${open ? "" : "flex-row"}`}
@@ -430,7 +430,7 @@ export const CycleDetailsSidebar: React.FC<Props> = ({
             </div>
 
             <div className="flex w-full flex-col items-center justify-start gap-2 border-t border-gray-300 px-6 py-6 ">
-              <Disclosure>
+              <Disclosure defaultOpen>
                 {({ open }) => (
                   <div
                     className={`relative  flex  h-full w-full flex-col ${open ? "" : "flex-row"}`}

apps/app/components/cycles/single-cycle-card.tsx

@@ -239,91 +239,114 @@ export const SingleCycleCard: React.FC<TSingleStatProps> = ({
   return (
     <div>
       <div className="flex flex-col rounded-[10px] bg-white text-xs shadow">
-        <div className="flex h-full flex-col gap-4 rounded-b-[10px] p-4">
-          <div className="flex items-start justify-between gap-1">
-            <Tooltip tooltipContent={cycle.name} position="top-left">
-              <Link href={`/${workspaceSlug}/projects/${projectId}/cycles/${cycle.id}`}>
-                <a className="w-full">
+        <Link href={`/${workspaceSlug}/projects/${projectId}/cycles/${cycle.id}`}>
+          <a className="w-full">
+            <div className="flex h-full flex-col gap-4 rounded-b-[10px] p-4">
+              <div className="flex items-start justify-between gap-1">
+                <Tooltip tooltipContent={cycle.name} position="top-left">
                   <h3 className="break-all text-lg font-semibold">
                     {truncateText(cycle.name, 75)}
                   </h3>
-                </a>
-              </Link>
-            </Tooltip>
-            {cycle.is_favorite ? (
-              <button onClick={handleRemoveFromFavorites}>
-                <StarIcon className="h-4 w-4 text-orange-400" fill="#f6ad55" />
-              </button>
-            ) : (
-              <button onClick={handleAddToFavorites}>
-                <StarIcon className="h-4 w-4 " color="#858E96" />
-              </button>
-            )}
-          </div>
+                </Tooltip>
+                {cycle.is_favorite ? (
+                  <button
+                    onClick={(e) => {
+                      e.preventDefault();
+                      handleRemoveFromFavorites();
+                    }}
+                  >
+                    <StarIcon className="h-4 w-4 text-orange-400" fill="#f6ad55" />
+                  </button>
+                ) : (
+                  <button
+                    onClick={(e) => {
+                      e.preventDefault();
+                      handleAddToFavorites();
+                    }}
+                  >
+                    <StarIcon className="h-4 w-4 " color="#858E96" />
+                  </button>
+                )}
+              </div>
 
-          <div className="flex items-center justify-start gap-5">
-            <div className="flex items-start gap-1 ">
-              <CalendarDaysIcon className="h-4 w-4 text-gray-900" />
-              <span className="text-gray-400">Start :</span>
-              <span>{renderShortDateWithYearFormat(startDate)}</span>
+              <div className="flex items-center justify-start gap-5">
+                <div className="flex items-start gap-1 ">
+                  <CalendarDaysIcon className="h-4 w-4 text-gray-900" />
+                  <span className="text-gray-400">Start :</span>
+                  <span>{renderShortDateWithYearFormat(startDate)}</span>
+                </div>
+                <div className="flex items-start gap-1 ">
+                  <TargetIcon className="h-4 w-4 text-gray-900" />
+                  <span className="text-gray-400">End :</span>
+                  <span>{renderShortDateWithYearFormat(endDate)}</span>
+                </div>
+              </div>
+
+              <div className="flex items-center justify-between mt-4">
+                <div className="flex items-center gap-2.5">
+                  {cycle.owned_by.avatar && cycle.owned_by.avatar !== "" ? (
+                    <Image
+                      src={cycle.owned_by.avatar}
+                      height={16}
+                      width={16}
+                      className="rounded-full"
+                      alt={cycle.owned_by.first_name}
+                    />
+                  ) : (
+                    <span className="flex h-5 w-5 items-center justify-center rounded-full bg-gray-800 capitalize  text-white">
+                      {cycle.owned_by.first_name.charAt(0)}
+                    </span>
+                  )}
+                  <span className="text-gray-900">{cycle.owned_by.first_name}</span>
+                </div>
+                <div className="flex items-center">
+                  {!isCompleted && (
+                    <button
+                      onClick={(e) => {
+                        e.preventDefault();
+                        handleEditCycle();
+                      }}
+                      className="flex cursor-pointer items-center rounded p-1 duration-300 hover:bg-gray-100"
+                    >
+                      <span>
+                        <PencilIcon className="h-4 w-4" />
+                      </span>
+                    </button>
+                  )}
+
+                  <CustomMenu width="auto" verticalEllipsis>
+                    {!isCompleted && (
+                      <CustomMenu.MenuItem
+                        onClick={(e) => {
+                          e.preventDefault();
+                          handleDeleteCycle();
+                        }}
+                      >
+                        <span className="flex items-center justify-start gap-2">
+                          <TrashIcon className="h-4 w-4" />
+                          <span>Delete cycle</span>
+                        </span>
+                      </CustomMenu.MenuItem>
+                    )}
+                    <CustomMenu.MenuItem
+                      onClick={(e) => {
+                        e.preventDefault();
+                        handleCopyText();
+                      }}
+                    >
+                      <span className="flex items-center justify-start gap-2">
+                        <LinkIcon className="h-4 w-4" />
+                        <span>Copy cycle link</span>
+                      </span>
+                    </CustomMenu.MenuItem>
+                  </CustomMenu>
+                </div>
+              </div>
             </div>
-            <div className="flex items-start gap-1 ">
-              <TargetIcon className="h-4 w-4 text-gray-900" />
-              <span className="text-gray-400">End :</span>
-              <span>{renderShortDateWithYearFormat(endDate)}</span>
-            </div>
-          </div>
-        </div>
+          </a>
+        </Link>
 
         <div className="flex h-full flex-col rounded-b-[10px]">
-          <div className="flex items-center justify-between p-4">
-            <div className="flex items-center gap-2.5">
-              {cycle.owned_by.avatar && cycle.owned_by.avatar !== "" ? (
-                <Image
-                  src={cycle.owned_by.avatar}
-                  height={16}
-                  width={16}
-                  className="rounded-full"
-                  alt={cycle.owned_by.first_name}
-                />
-              ) : (
-                <span className="flex h-5 w-5 items-center justify-center rounded-full bg-gray-800 capitalize  text-white">
-                  {cycle.owned_by.first_name.charAt(0)}
-                </span>
-              )}
-              <span className="text-gray-900">{cycle.owned_by.first_name}</span>
-            </div>
-            <div className="flex items-center">
-              {!isCompleted && (
-                <button
-                  onClick={handleEditCycle}
-                  className="flex cursor-pointer items-center rounded p-1 duration-300 hover:bg-gray-100"
-                >
-                  <span>
-                    <PencilIcon className="h-4 w-4" />
-                  </span>
-                </button>
-              )}
-
-              <CustomMenu width="auto" verticalEllipsis>
-                {!isCompleted && (
-                  <CustomMenu.MenuItem onClick={handleDeleteCycle}>
-                    <span className="flex items-center justify-start gap-2">
-                      <TrashIcon className="h-4 w-4" />
-                      <span>Delete cycle</span>
-                    </span>
-                  </CustomMenu.MenuItem>
-                )}
-                <CustomMenu.MenuItem onClick={handleCopyText}>
-                  <span className="flex items-center justify-start gap-2">
-                    <LinkIcon className="h-4 w-4" />
-                    <span>Copy cycle link</span>
-                  </span>
-                </CustomMenu.MenuItem>
-              </CustomMenu>
-            </div>
-          </div>
-
           <Disclosure>
             {({ open }) => (
               <div

apps/app/components/cycles/transfer-issues-modal.tsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react";
 
 import { useRouter } from "next/router";
 
-import useSWR from "swr";
+import useSWR, { mutate } from "swr";
 
 // component
 import { Dialog, Transition } from "@headlessui/react";
@@ -12,11 +12,14 @@ import cyclesService from "services/cycles.service";
 import useToast from "hooks/use-toast";
 //icons
 import { MagnifyingGlassIcon, XMarkIcon } from "@heroicons/react/24/outline";
-import { ContrastIcon, CyclesIcon, ExclamationIcon } from "components/icons";
+import { ContrastIcon, CyclesIcon, ExclamationIcon, TransferIcon } from "components/icons";
 // fetch-key
-import { CYCLE_INCOMPLETE_LIST } from "constants/fetch-keys";
+import { CYCLE_INCOMPLETE_LIST, CYCLE_ISSUES_WITH_PARAMS } from "constants/fetch-keys";
 // types
 import { ICycle } from "types";
+//helper
+import { getDateRangeStatus } from "helpers/date-time.helper";
+import useIssuesView from "hooks/use-issues-view";
 
 type Props = {
   isOpen: boolean;
@@ -29,12 +32,15 @@ export const TransferIssuesModal: React.FC<Props> = ({ isOpen, handleClose }) =>
   const router = useRouter();
   const { workspaceSlug, projectId, cycleId } = router.query;
 
+  const { params } = useIssuesView();
+
   const { setToastAlert } = useToast();
 
   const transferIssue = async (payload: any) => {
     await cyclesService
       .transferIssues(workspaceSlug as string, projectId as string, cycleId as string, payload)
       .then((res) => {
+        mutate(CYCLE_ISSUES_WITH_PARAMS(cycleId as string, params));
         setToastAlert({
           type: "success",
           title: "Issues transfered successfully",
@@ -100,12 +106,15 @@ export const TransferIssuesModal: React.FC<Props> = ({ isOpen, handleClose }) =>
               <Dialog.Panel className="relative transform rounded-lg bg-white py-5 text-left shadow-xl transition-all sm:w-full sm:max-w-2xl">
                 <div className="flex flex-col gap-4">
                   <div className="flex items-center justify-between px-5">
-                    <h4 className="text-gray-700 text-base">Transfer Issues</h4>
+                    <div className="flex items-center gap-2">
+                      <TransferIcon className="h-4 w-5" color="#495057" />
+                      <h4 className="text-gray-700 font-medium text-[1.50rem]">Transfer Issues</h4>
+                    </div>
                     <button onClick={handleClose}>
                       <XMarkIcon className="h-4 w-4" />
                     </button>
                   </div>
-                  <div className="flex items-center gap-2 pb-3 px-5 border-b border-gray-200">
+                  <div className="flex items-center gap-2 pb-3 mt-2 px-5 border-b border-gray-200">
                     <MagnifyingGlassIcon className="h-4 w-4 text-gray-500" />
                     <input
                       className="outline-none"
@@ -120,16 +129,21 @@ export const TransferIssuesModal: React.FC<Props> = ({ isOpen, handleClose }) =>
                         filteredOptions.map((option: ICycle) => (
                           <button
                             key={option.id}
-                            className="flex items-center gap-4 px-4 py-3 text-gray-600 text-sm rounded w-full hover:bg-gray-100"
+                            className="flex items-center gap-4 py-3 px-2 text-gray-600 text-sm rounded w-full hover:bg-gray-100"
                             onClick={() => {
                               transferIssue({
-                                new_cycle_id: option.id,
+                                new_cycle_id: option?.id,
                               });
                               handleClose();
                             }}
                           >
                             <ContrastIcon className="h-5 w-5" />
-                            <span>{option.name}</span>
+                            <div className="flex justify-between w-full">
+                              <span>{option?.name}</span>
+                              <span className=" flex bg-gray-200 capitalize px-2 rounded-full items-center">
+                                {getDateRangeStatus(option?.start_date, option?.end_date)}
+                              </span>
+                            </div>
                           </button>
                         ))
                       ) : (

apps/app/components/cycles/transfer-issues.tsx

@@ -46,7 +46,7 @@ export const TransferIssues: React.FC<Props> = ({ handleClick }) => {
       {transferableIssuesCount > 0 && (
         <div>
           <PrimaryButton onClick={handleClick} className="flex items-center gap-3 rounded-lg">
-            <TransferIcon className="h-4 w-4" />
+            <TransferIcon className="h-4 w-4" color="white"/>
             <span className="text-white">Transfer Issues</span>
           </PrimaryButton>
         </div>

apps/app/components/emoji-icon-picker/index.tsx

@@ -82,7 +82,7 @@ const EmojiIconPicker: React.FC<Props> = ({
                           setOpenColorPicker(false);
                         }}
                         className={`-my-1 w-1/2 border-b pb-2 text-center text-sm font-medium outline-none transition-colors ${
-                          selected ? "border-theme" : "border-transparent"
+                          selected ? "border-theme text-theme" : "border-transparent text-gray-500"
                         }`}
                       >
                         {tab.title}
@@ -95,12 +95,12 @@ const EmojiIconPicker: React.FC<Props> = ({
                 <Tab.Panel>
                   {recentEmojis.length > 0 && (
                     <div className="py-2">
-                      {/* <h3 className="mb-2">Recent Emojis</h3> */}
-                      <div className="grid grid-cols-10">
+                      <h3 className="mb-2 ml-1 text-xs text-gray-400">Recent</h3>
+                      <div className="grid grid-cols-8 gap-2">
                         {recentEmojis.map((emoji) => (
                           <button
                             type="button"
-                            className="h-4 w-4 select-none text-sm hover:bg-hover-gray flex items-center justify-between"
+                            className="h-4 w-4 select-none text-base hover:bg-hover-gray flex items-center justify-between"
                             key={emoji}
                             onClick={() => {
                               onChange(emoji);
@@ -115,12 +115,11 @@ const EmojiIconPicker: React.FC<Props> = ({
                   )}
                   <hr className="w-full h-[1px] mb-2" />
                   <div>
-                    {/* <h3 className="mb-1">All Emojis</h3> */}
-                    <div className="grid grid-cols-10 gap-y-1">
+                    <div className="grid grid-cols-8 gap-x-2 gap-y-3">
                       {emojis.map((emoji) => (
                         <button
                           type="button"
-                          className="h-4 w-4 mb-1 select-none text-sm hover:bg-hover-gray flex items-center"
+                          className="h-4 w-4 ml-1 select-none text-base hover:bg-hover-gray flex justify-center items-center"
                           key={emoji}
                           onClick={() => {
                             onChange(emoji);
@@ -135,54 +134,53 @@ const EmojiIconPicker: React.FC<Props> = ({
                   </div>
                 </Tab.Panel>
                 <div className="py-2">
-                  <div className="relative">
-                    <div className="pb-2 flex items-center justify-between">
-                      {[
-                        "#D687FF",
-                        "#F7AE59",
-                        "#FF6B00",
-                        "#8CC1FF",
-                        "#FCBE1D",
-                        "#18904F",
-                        "#ADF672",
-                        "#05C3FF",
-                        "#000000",
-                      ].map((curCol) => (
-                        <span
-                          className="w-4 h-4 rounded-full cursor-pointer"
-                          style={{ backgroundColor: curCol }}
-                          onClick={() => setActiveColor(curCol)}
-                        />
-                      ))}
-                      <button
-                        type="button"
-                        onClick={() => setOpenColorPicker((prev) => !prev)}
-                        className="flex items-center gap-1"
-                      >
-                        <span
-                          className="w-4 h-4 rounded-full conical-gradient"
-                          style={{ backgroundColor: activeColor }}
-                        />
-                      </button>
-                    </div>
-                    <div>
-                      <TwitterPicker
-                        className={`m-2 !absolute top-4 left-4 z-10 ${
-                          openColorPicker ? "block" : "hidden"
-                        }`}
-                        color={activeColor}
-                        onChange={(color) => {
-                          setActiveColor(color.hex);
-                          if (onIconColorChange) onIconColorChange(color.hex);
-                        }}
-                        triangle="hide"
-                        width="205px"
-                      />
-                    </div>
-                  </div>
-                  <hr className="w-full h-[1px] mb-1" />
                   <Tab.Panel className="flex h-full w-full flex-col justify-center">
-                    <div className="grid grid-cols-10 mt-1 ml-1 gap-1">
+                    <div className="relative">
+                      <div className="pb-2 px-1 flex items-center justify-between">
+                        {[
+                          "#FF6B00",
+                          "#8CC1FF",
+                          "#FCBE1D",
+                          "#18904F",
+                          "#ADF672",
+                          "#05C3FF",
+                          "#000000",
+                        ].map((curCol) => (
+                          <span
+                            className="w-4 h-4 rounded-full cursor-pointer"
+                            style={{ backgroundColor: curCol }}
+                            onClick={() => setActiveColor(curCol)}
+                          />
+                        ))}
+                        <button
+                          type="button"
+                          onClick={() => setOpenColorPicker((prev) => !prev)}
+                          className="flex items-center gap-1"
+                        >
+                          <span
+                            className="w-4 h-4 rounded-full conical-gradient"
+                            style={{ backgroundColor: activeColor }}
+                          />
+                        </button>
+                      </div>
+                      <div>
+                        <TwitterPicker
+                          className={`m-2 !absolute top-4 left-4 z-10 ${
+                            openColorPicker ? "block" : "hidden"
+                          }`}
+                          color={activeColor}
+                          onChange={(color) => {
+                            setActiveColor(color.hex);
+                            if (onIconColorChange) onIconColorChange(color.hex);
+                          }}
+                          triangle="hide"
+                          width="205px"
+                        />
+                      </div>
+                    </div>
+                    <hr className="w-full h-[1px] mb-1" />
+
+                    <div className="grid grid-cols-8 mt-1 ml-1 gap-x-2 gap-y-3">
                       {icons.material_rounded.map((icon) => (
                         <button
                           type="button"
@@ -195,7 +193,7 @@ const EmojiIconPicker: React.FC<Props> = ({
                         >
                           <span
                             style={{ color: activeColor }}
-                            className="material-symbols-rounded text-base"
+                            className="material-symbols-rounded text-lg"
                           >
                             {icon.name}
                           </span>

apps/app/components/estimates/create-update-estimate-modal.tsx

@@ -0,0 +1,205 @@
+import React, { useEffect } from "react";
+
+import { useRouter } from "next/router";
+
+import { mutate } from "swr";
+
+// react-hook-form
+import { useForm } from "react-hook-form";
+// services
+import estimatesService from "services/estimates.service";
+// ui
+import { Input, PrimaryButton, SecondaryButton, TextArea } from "components/ui";
+import { Dialog, Transition } from "@headlessui/react";
+
+// hooks
+import useToast from "hooks/use-toast";
+
+// types
+import { IEstimate } from "types";
+// fetch-keys
+import { ESTIMATES_LIST } from "constants/fetch-keys";
+
+type Props = {
+  isOpen: boolean;
+  handleClose: () => void;
+  data?: IEstimate;
+};
+
+const defaultValues: Partial<IEstimate> = {
+  name: "",
+  description: "",
+};
+
+export const CreateUpdateEstimateModal: React.FC<Props> = ({ handleClose, data, isOpen }) => {
+  const {
+    register,
+    formState: { errors, isSubmitting },
+    handleSubmit,
+    reset,
+  } = useForm<IEstimate>({
+    defaultValues,
+  });
+
+  const router = useRouter();
+  const { workspaceSlug, projectId } = router.query;
+
+  const { setToastAlert } = useToast();
+
+  const createEstimate = async (formData: IEstimate) => {
+    if (!workspaceSlug || !projectId) return;
+
+    const payload = {
+      name: formData.name,
+      description: formData.description,
+    };
+
+    await estimatesService
+      .createEstimate(workspaceSlug as string, projectId as string, payload)
+      .then((res) => {
+        mutate<IEstimate[]>(
+          ESTIMATES_LIST(projectId as string),
+          (prevData) => [res, ...(prevData ?? [])],
+          false
+        );
+        handleClose();
+      })
+      .catch(() => {
+        setToastAlert({
+          type: "error",
+          title: "Error!",
+          message: "Error: Estimate could not be created",
+        });
+      });
+  };
+
+  const updateEstimate = async (formData: IEstimate) => {
+    if (!workspaceSlug || !projectId || !data) return;
+
+    const payload = {
+      name: formData.name,
+      description: formData.description,
+    };
+
+    mutate<IEstimate[]>(
+      ESTIMATES_LIST(projectId as string),
+      (prevData) =>
+        prevData?.map((p) => {
+          if (p.id === data.id) return { ...p, ...payload };
+
+          return p;
+        }),
+      false
+    );
+
+    await estimatesService
+      .patchEstimate(workspaceSlug as string, projectId as string, data?.id as string, payload)
+      .then(() => {
+        handleClose();
+      })
+      .catch(() => {
+        setToastAlert({
+          type: "error",
+          title: "Error!",
+          message: "Error: Estimate could not be updated",
+        });
+      });
+    handleClose();
+  };
+
+  useEffect(() => {
+    reset({
+      ...defaultValues,
+      ...data,
+    });
+  }, [data, reset]);
+
+  return (
+    <>
+      <Transition.Root show={isOpen} as={React.Fragment}>
+        <Dialog as="div" className="relative z-20" onClose={handleClose}>
+          <Transition.Child
+            as={React.Fragment}
+            enter="ease-out duration-300"
+            enterFrom="opacity-0"
+            enterTo="opacity-100"
+            leave="ease-in duration-200"
+            leaveFrom="opacity-100"
+            leaveTo="opacity-0"
+          >
+            <div className="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity" />
+          </Transition.Child>
+
+          <div className="fixed inset-0 z-20 overflow-y-auto">
+            <div className="flex min-h-full items-center justify-center p-4 text-center sm:p-0">
+              <Transition.Child
+                as={React.Fragment}
+                enter="ease-out duration-300"
+                enterFrom="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+                enterTo="opacity-100 translate-y-0 sm:scale-100"
+                leave="ease-in duration-200"
+                leaveFrom="opacity-100 translate-y-0 sm:scale-100"
+                leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+              >
+                <Dialog.Panel className="relative transform rounded-lg bg-white px-5 py-8 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
+                  <form
+                    onSubmit={data ? handleSubmit(updateEstimate) : handleSubmit(createEstimate)}
+                  >
+                    <div className="space-y-3">
+                      <div className="text-lg font-medium leading-6">
+                        {data ? "Update" : "Create"} Estimate
+                      </div>
+                      <div>
+                        <Input
+                          id="name"
+                          name="name"
+                          type="name"
+                          placeholder="Title"
+                          autoComplete="off"
+                          mode="transparent"
+                          className="resize-none text-xl"
+                          error={errors.name}
+                          register={register}
+                          validations={{
+                            required: "Title is required",
+                            maxLength: {
+                              value: 255,
+                              message: "Title should be less than 255 characters",
+                            },
+                          }}
+                        />
+                      </div>
+                      <div>
+                        <TextArea
+                          id="description"
+                          name="description"
+                          placeholder="Description"
+                          className="h-32 resize-none text-sm"
+                          mode="transparent"
+                          error={errors.description}
+                          register={register}
+                        />
+                      </div>
+                    </div>
+                    <div className="mt-5 flex justify-end gap-2">
+                      <SecondaryButton onClick={handleClose}>Cancel</SecondaryButton>
+                      <PrimaryButton type="submit" loading={isSubmitting}>
+                        {data
+                          ? isSubmitting
+                            ? "Updating Estimate..."
+                            : "Update Estimate"
+                          : isSubmitting
+                          ? "Creating Estimate..."
+                          : "Create Estimate"}
+                      </PrimaryButton>
+                    </div>
+                  </form>
+                </Dialog.Panel>
+              </Transition.Child>
+            </div>
+          </div>
+        </Dialog>
+      </Transition.Root>
+    </>
+  );
+};

apps/app/components/estimates/delete-estimate-modal.tsx

@@ -0,0 +1,104 @@
+import React, { useEffect, useState } from "react";
+
+// headless ui
+import { Dialog, Transition } from "@headlessui/react";
+// types
+import { IEstimate } from "types";
+
+// icons
+import { ExclamationTriangleIcon } from "@heroicons/react/24/outline";
+// ui
+import { SecondaryButton, DangerButton } from "components/ui";
+
+type Props = {
+  isOpen: boolean;
+  handleClose: () => void;
+  data: IEstimate;
+  handleDelete: () => void;
+};
+
+export const DeleteEstimateModal: React.FC<Props> = ({
+  isOpen,
+  handleClose,
+  data,
+  handleDelete,
+}) => {
+  const [isDeleteLoading, setIsDeleteLoading] = useState(false);
+
+  useEffect(() => {
+    setIsDeleteLoading(false);
+  }, [isOpen]);
+
+  const onClose = () => {
+    setIsDeleteLoading(false);
+    handleClose();
+  };
+
+  return (
+    <Transition.Root show={isOpen} as={React.Fragment}>
+      <Dialog as="div" className="relative z-20" onClose={onClose}>
+        <Transition.Child
+          as={React.Fragment}
+          enter="ease-out duration-300"
+          enterFrom="opacity-0"
+          enterTo="opacity-100"
+          leave="ease-in duration-200"
+          leaveFrom="opacity-100"
+          leaveTo="opacity-0"
+        >
+          <div className="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity" />
+        </Transition.Child>
+
+        <div className="fixed inset-0 z-10 overflow-y-auto">
+          <div className="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
+            <Transition.Child
+              as={React.Fragment}
+              enter="ease-out duration-300"
+              enterFrom="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+              enterTo="opacity-100 translate-y-0 sm:scale-100"
+              leave="ease-in duration-200"
+              leaveFrom="opacity-100 translate-y-0 sm:scale-100"
+              leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+            >
+              <Dialog.Panel className="relative transform overflow-hidden rounded-lg bg-white text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl">
+                <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-100 p-4">
+                      <ExclamationTriangleIcon
+                        className="h-6 w-6 text-red-600"
+                        aria-hidden="true"
+                      />
+                    </span>
+                    <span className="flex items-center justify-start">
+                      <h3 className="text-xl font-medium 2xl:text-2xl">Delete Estimate</h3>
+                    </span>
+                  </div>
+                  <span>
+                    <p className="break-all text-sm leading-7 text-gray-500">
+                      Are you sure you want to delete estimate-{" "}
+                      <span className="break-all font-semibold">{data.name}</span>
+                      {""}? All of the data related to the estiamte will be permanently removed.
+                      This action cannot be undone.
+                    </p>
+                  </span>
+                  <div className="flex justify-end gap-2">
+                    <SecondaryButton onClick={onClose}>Cancel</SecondaryButton>
+                    <DangerButton
+                      onClick={() => {
+                        setIsDeleteLoading(true);
+                        handleDelete();
+                      }}
+                      loading={isDeleteLoading}
+                    >
+                      {isDeleteLoading ? "Deleting..." : "Delete Estimate"}
+                    </DangerButton>
+                  </div>
+                </div>
+              </Dialog.Panel>
+            </Transition.Child>
+          </div>
+        </div>
+      </Dialog>
+    </Transition.Root>
+  );
+};

apps/app/components/estimates/estimate-points-modal.tsx

@@ -0,0 +1,357 @@
+import React, { useEffect, useRef, useState } from "react";
+
+import { useRouter } from "next/router";
+
+import { useForm } from "react-hook-form";
+
+import { mutate } from "swr";
+// headless ui
+import { Dialog, Transition } from "@headlessui/react";
+// hooks
+import useToast from "hooks/use-toast";
+// ui
+import { Input, PrimaryButton, SecondaryButton } from "components/ui";
+
+// icons
+import { ExclamationTriangleIcon } from "@heroicons/react/24/outline";
+// types
+import type { IEstimate, IEstimatePoint } from "types";
+
+import estimatesService from "services/estimates.service";
+import { ESTIMATE_POINTS_LIST } from "constants/fetch-keys";
+
+type Props = {
+  isOpen: boolean;
+  data?: IEstimatePoint[];
+  estimate: IEstimate | null;
+  onClose: () => void;
+};
+
+interface FormValues {
+  value1: string;
+  value2: string;
+  value3: string;
+  value4: string;
+  value5: string;
+  value6: string;
+}
+
+const defaultValues: FormValues = {
+  value1: "",
+  value2: "",
+  value3: "",
+  value4: "",
+  value5: "",
+  value6: "",
+};
+
+export const EstimatePointsModal: React.FC<Props> = ({ isOpen, data, estimate, onClose }) => {
+  const router = useRouter();
+  const { workspaceSlug, projectId } = router.query;
+
+  const { setToastAlert } = useToast();
+
+  const {
+    register,
+    formState: { isSubmitting },
+    handleSubmit,
+    reset,
+  } = useForm<FormValues>({ defaultValues });
+
+  const handleClose = () => {
+    onClose();
+    reset();
+  };
+
+  const createEstimatePoints = async (formData: FormValues) => {
+    if (!workspaceSlug || !projectId) return;
+
+    const payload = {
+      estimate_points: [
+        {
+          key: 0,
+          value: formData.value1,
+        },
+        {
+          key: 1,
+          value: formData.value2,
+        },
+        {
+          key: 2,
+          value: formData.value3,
+        },
+        {
+          key: 3,
+          value: formData.value4,
+        },
+        {
+          key: 4,
+          value: formData.value5,
+        },
+        {
+          key: 5,
+          value: formData.value6,
+        },
+      ],
+    };
+
+    await estimatesService
+      .createEstimatePoints(
+        workspaceSlug as string,
+        projectId as string,
+        estimate?.id as string,
+        payload
+      )
+      .then(() => {
+        handleClose();
+      })
+      .catch(() => {
+        setToastAlert({
+          type: "error",
+          title: "Error!",
+          message: "Estimate points could not be created. Please try again.",
+        });
+      });
+  };
+
+  const updateEstimatePoints = async (formData: FormValues) => {
+    if (!workspaceSlug || !projectId || !data || data.length === 0) return;
+
+    const payload = {
+      estimate_points: data.map((d, index) => ({
+        id: d.id,
+        value: (formData as any)[`value${index + 1}`],
+      })),
+    };
+
+    await estimatesService
+      .patchEstimatePoints(
+        workspaceSlug as string,
+        projectId as string,
+        estimate?.id as string,
+        payload
+      )
+      .then(() => {
+        handleClose();
+      })
+      .catch(() => {
+        setToastAlert({
+          type: "error",
+          title: "Error!",
+          message: "Estimate points could not be created. Please try again.",
+        });
+      });
+  };
+
+  const onSubmit = async (formData: FormValues) => {
+    if (data && data.length !== 0) await updateEstimatePoints(formData);
+    else await createEstimatePoints(formData);
+
+    if (estimate) mutate(ESTIMATE_POINTS_LIST(estimate.id));
+  };
+
+  useEffect(() => {
+    if (!data || data.length < 6) return;
+
+    reset({
+      ...defaultValues,
+      value1: data[0].value,
+      value2: data[1].value,
+      value3: data[2].value,
+      value4: data[3].value,
+      value5: data[4].value,
+      value6: data[5].value,
+    });
+  }, [data, reset]);
+
+  return (
+    <Transition.Root show={isOpen} as={React.Fragment}>
+      <Dialog as="div" className="relative z-20" onClose={() => handleClose()}>
+        <Transition.Child
+          as={React.Fragment}
+          enter="ease-out duration-300"
+          enterFrom="opacity-0"
+          enterTo="opacity-100"
+          leave="ease-in duration-200"
+          leaveFrom="opacity-100"
+          leaveTo="opacity-0"
+        >
+          <div className="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity" />
+        </Transition.Child>
+
+        <div className="fixed inset-0 z-20 overflow-y-auto">
+          <div className="flex min-h-full items-center justify-center p-4 text-center sm:p-0">
+            <Transition.Child
+              as={React.Fragment}
+              enter="ease-out duration-300"
+              enterFrom="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+              enterTo="opacity-100 translate-y-0 sm:scale-100"
+              leave="ease-in duration-200"
+              leaveFrom="opacity-100 translate-y-0 sm:scale-100"
+              leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+            >
+              <Dialog.Panel className="relative transform rounded-lg bg-white px-5 py-8 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
+                <form onSubmit={handleSubmit(onSubmit)}>
+                  <div className="space-y-3">
+                    <div className="flex flex-col gap-3">
+                      <h4 className="text-lg font-medium leading-6">
+                        {data ? "Update" : "Create"} Estimate Points
+                      </h4>
+                      <div className="grid grid-cols-3 gap-3">
+                        <div className="flex items-center">
+                          <span className="bg-gray-100 h-full flex items-center rounded-lg">
+                            <span className="px-2 rounded-lg text-sm  text-gray-600">1</span>
+                            <span className="bg-white rounded-lg">
+                              <Input
+                                id="name"
+                                name="value1"
+                                type="name"
+                                placeholder="Value"
+                                autoComplete="off"
+                                register={register}
+                                validations={{
+                                  required: "value is required",
+                                  maxLength: {
+                                    value: 10,
+                                    message: "Name should be less than 10 characters",
+                                  },
+                                }}
+                              />
+                            </span>
+                          </span>
+                        </div>
+                        <div className="flex items-center">
+                          <span className="bg-gray-100 h-full flex items-center rounded-lg">
+                            <span className="px-2 rounded-lg text-sm  text-gray-600">2</span>
+                            <span className="bg-white rounded-lg">
+                              <Input
+                                id="name"
+                                name="value2"
+                                type="name"
+                                placeholder="Value"
+                                autoComplete="off"
+                                register={register}
+                                validations={{
+                                  required: "value is required",
+                                  maxLength: {
+                                    value: 10,
+                                    message: "Name should be less than 10 characters",
+                                  },
+                                }}
+                              />
+                            </span>
+                          </span>
+                        </div>
+                        <div className="flex items-center">
+                          <span className="bg-gray-100 h-full flex items-center rounded-lg">
+                            <span className="px-2 rounded-lg text-sm text-gray-600">3</span>
+                            <span className="bg-white rounded-lg">
+                              <Input
+                                id="name"
+                                name="value3"
+                                type="name"
+                                placeholder="Value"
+                                autoComplete="off"
+                                register={register}
+                                validations={{
+                                  required: "value is required",
+                                  maxLength: {
+                                    value: 10,
+                                    message: "Name should be less than 10 characters",
+                                  },
+                                }}
+                              />
+                            </span>
+                          </span>
+                        </div>
+                        <div className="flex items-center">
+                          <span className="bg-gray-100 h-full flex items-center rounded-lg">
+                            <span className="px-2 rounded-lg text-sm  text-gray-600">4</span>
+                            <span className="bg-white rounded-lg">
+                              <Input
+                                id="name"
+                                name="value4"
+                                type="name"
+                                placeholder="Value"
+                                autoComplete="off"
+                                register={register}
+                                validations={{
+                                  required: "value is required",
+                                  maxLength: {
+                                    value: 10,
+                                    message: "Name should be less than 10 characters",
+                                  },
+                                }}
+                              />
+                            </span>
+                          </span>
+                        </div>
+                        <div className="flex items-center">
+                          <span className="bg-gray-100 h-full flex items-center rounded-lg">
+                            <span className="px-2 rounded-lg text-sm  text-gray-600">5</span>
+                            <span className="bg-white rounded-lg">
+                              <Input
+                                id="name"
+                                name="value5"
+                                type="name"
+                                placeholder="Value"
+                                autoComplete="off"
+                                register={register}
+                                validations={{
+                                  required: "value is required",
+                                  maxLength: {
+                                    value: 10,
+                                    message: "Name should be less than 10 characters",
+                                  },
+                                }}
+                              />
+                            </span>
+                          </span>
+                        </div>
+                        <div className="flex items-center">
+                          <span className="bg-gray-100 h-full flex items-center rounded-lg">
+                            <span className="px-2 rounded-lg text-sm  text-gray-600">6</span>
+                            <span className="bg-white rounded-lg">
+                              <Input
+                                id="name"
+                                name="value6"
+                                type="name"
+                                placeholder="Value"
+                                autoComplete="off"
+                                register={register}
+                                validations={{
+                                  required: "value is required",
+                                  maxLength: {
+                                    value: 10,
+                                    message: "Name should be less than 10 characters",
+                                  },
+                                }}
+                              />
+                            </span>
+                          </span>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+
+                  <div className="mt-5 flex justify-end gap-2">
+                    <SecondaryButton onClick={() => handleClose()}>Cancel</SecondaryButton>
+                    <PrimaryButton type="submit" loading={isSubmitting}>
+                      {data && data.length > 0
+                        ? isSubmitting
+                          ? "Updating Points..."
+                          : "Update Points"
+                        : isSubmitting
+                        ? "Creating Points..."
+                        : "Create Points"}
+                    </PrimaryButton>
+                  </div>
+                </form>
+              </Dialog.Panel>
+            </Transition.Child>
+          </div>
+        </div>
+      </Dialog>
+    </Transition.Root>
+  );
+};

apps/app/components/estimates/index.tsx

@@ -0,0 +1,4 @@
+export * from "./create-update-estimate-modal";
+export * from "./single-estimate";
+export * from "./estimate-points-modal"
+export * from "./delete-estimate-modal"

apps/app/components/estimates/single-estimate.tsx

@@ -0,0 +1,185 @@
+import React, { useState } from "react";
+
+import { useRouter } from "next/router";
+
+import useSWR from "swr";
+
+// services
+import estimatesService from "services/estimates.service";
+import projectService from "services/project.service";
+// hooks
+import useToast from "hooks/use-toast";
+import useProjectDetails from "hooks/use-project-details";
+// components
+import { EstimatePointsModal, DeleteEstimateModal } from "components/estimates";
+// ui
+import { CustomMenu } from "components/ui";
+//icons
+import {
+  PencilIcon,
+  TrashIcon,
+  SquaresPlusIcon,
+  ListBulletIcon,
+} from "@heroicons/react/24/outline";
+// types
+import { IEstimate, IProject } from "types";
+// fetch-keys
+import { ESTIMATE_POINTS_LIST } from "constants/fetch-keys";
+import { orderArrayBy } from "helpers/array.helper";
+
+type Props = {
+  estimate: IEstimate;
+  editEstimate: (estimate: IEstimate) => void;
+  handleEstimateDelete: (estimateId: string) => void;
+};
+
+export const SingleEstimate: React.FC<Props> = ({
+  estimate,
+  editEstimate,
+  handleEstimateDelete,
+}) => {
+  const [isEstimatePointsModalOpen, setIsEstimatePointsModalOpen] = useState(false);
+  const [isDeleteEstimateModalOpen, setIsDeleteEstimateModalOpen] = useState(false);
+
+
+  const router = useRouter();
+  const { workspaceSlug, projectId } = router.query;
+
+  const { setToastAlert } = useToast();
+
+  const { projectDetails, mutateProjectDetails } = useProjectDetails();
+
+  const { data: estimatePoints } = useSWR(
+    workspaceSlug && projectId ? ESTIMATE_POINTS_LIST(estimate.id) : null,
+    workspaceSlug && projectId
+      ? () =>
+          estimatesService.getEstimatesPointsList(
+            workspaceSlug as string,
+            projectId as string,
+            estimate.id
+          )
+      : null
+  );
+
+  const handleUseEstimate = async () => {
+    if (!workspaceSlug || !projectId) return;
+
+    const payload = {
+      estimate: estimate.id,
+    };
+
+    mutateProjectDetails((prevData) => {
+      if (!prevData) return prevData;
+
+      return { ...prevData, estimate: estimate.id };
+    }, false);
+
+    await projectService
+      .updateProject(workspaceSlug as string, projectId as string, payload)
+      .catch(() => {
+        setToastAlert({
+          type: "error",
+          title: "Error!",
+          message: "Estimate points could not be used. Please try again.",
+        });
+      });
+  };
+
+  return (
+    <>
+      <EstimatePointsModal
+        isOpen={isEstimatePointsModalOpen}
+        estimate={estimate}
+        onClose={() => setIsEstimatePointsModalOpen(false)}
+        data={estimatePoints ? orderArrayBy(estimatePoints, "key") : undefined}
+      />
+      <div className="gap-2 py-3">
+        <div className="flex justify-between items-center">
+          <div>
+            <h6 className="flex items-center gap-2 font-medium text-base w-[40vw] truncate">
+              {estimate.name}
+              {projectDetails?.estimate && projectDetails?.estimate === estimate.id && (
+                <span className="capitalize px-2 py-0.5 text-xs rounded bg-green-100 text-green-500">
+                  In use
+                </span>
+              )}
+            </h6>
+            <p className="font-sm text-gray-400 font-normal text-[14px] w-[40vw] truncate">
+              {estimate.description}
+            </p>
+          </div>
+          <CustomMenu ellipsis>
+            {projectDetails?.estimate !== estimate.id &&
+              estimatePoints &&
+              estimatePoints.length > 0 && (
+                <CustomMenu.MenuItem onClick={handleUseEstimate}>
+                  <div className="flex items-center justify-start gap-2">
+                    <SquaresPlusIcon className="h-3.5 w-3.5" />
+                    <span>Use estimate</span>
+                  </div>
+                </CustomMenu.MenuItem>
+              )}
+            <CustomMenu.MenuItem onClick={() => setIsEstimatePointsModalOpen(true)}>
+              <div className="flex items-center justify-start gap-2">
+                <ListBulletIcon className="h-3.5 w-3.5" />
+                <span>
+                  {estimatePoints && estimatePoints?.length > 0 ? "Edit points" : "Create points"}
+                </span>
+              </div>
+            </CustomMenu.MenuItem>
+            <CustomMenu.MenuItem
+              onClick={() => {
+                editEstimate(estimate);
+              }}
+            >
+              <div className="flex items-center justify-start gap-2">
+                <PencilIcon className="h-3.5 w-3.5" />
+                <span>Edit estimate</span>
+              </div>
+            </CustomMenu.MenuItem>
+            {projectDetails?.estimate !== estimate.id && (
+              <CustomMenu.MenuItem
+                onClick={() => {
+                  setIsDeleteEstimateModalOpen(true);
+                }}
+              >
+                <div className="flex items-center justify-start gap-2">
+                  <TrashIcon className="h-3.5 w-3.5" />
+                  <span>Delete estimate</span>
+                </div>
+              </CustomMenu.MenuItem>
+            )}
+          </CustomMenu>
+        </div>
+        {estimatePoints && estimatePoints.length > 0 ? (
+          <div className="flex text-sm text-gray-400">
+            Estimate points (
+            <span className="flex gap-1">
+              {estimatePoints.map((point, index) => (
+                <h6 key={point.id}>
+                  {point.value}
+                  {index !== estimatePoints.length - 1 && ","}{" "}
+                </h6>
+              ))}
+            </span>
+            )
+          </div>
+        ) : (
+          <div>
+            <p className="text-sm text-gray-400">No estimate points</p>
+          </div>
+        )}
+      </div>
+
+      <DeleteEstimateModal
+        isOpen={isDeleteEstimateModalOpen}
+        handleClose={() => setIsDeleteEstimateModalOpen(false)}
+        data={estimate}
+        handleDelete={() => {
+          handleEstimateDelete(estimate.id);
+          setIsDeleteEstimateModalOpen(false);
+        }}
+      />
+    </>
+  );
+};

apps/app/components/icons/attachment-icon.tsx

@@ -1,19 +1,59 @@
-import React from "react";
+import {
+  AudioIcon,
+  CssIcon,
+  CsvIcon,
+  DefaultIcon,
+  DocIcon,
+  FigmaIcon,
+  HtmlIcon,
+  JavaScriptIcon,
+  JpgIcon,
+  PdfIcon,
+  PngIcon,
+  SheetIcon,
+  SvgIcon,
+  TxtIcon,
+  VideoIcon,
+} from "components/icons";
 
-import type { Props } from "./types";
+export const getFileIcon = (fileType: string) => {
+  switch (fileType) {
+    case "pdf":
+      return <PdfIcon height={28} width={28} />;
+    case "csv":
+      return <CsvIcon height={28} width={28} />;
+    case "xlsx":
+      return <SheetIcon height={28} width={28} />;
+    case "css":
+      return <CssIcon height={28} width={28} />;
+    case "doc":
+      return <DocIcon height={28} width={28} />;
+    case "fig":
+      return <FigmaIcon height={28} width={28} />;
+    case "html":
+      return <HtmlIcon height={28} width={28} />;
+    case "png":
+      return <PngIcon height={28} width={28} />;
+    case "jpg":
+      return <JpgIcon height={28} width={28} />;
+    case "js":
+      return <JavaScriptIcon height={28} width={28} />;
+    case "txt":
+      return <TxtIcon height={28} width={28} />;
+    case "svg":
+      return <SvgIcon height={28} width={28} />;
+    case "mp3":
+      return <AudioIcon height={28} width={28} />;
+    case "wav":
+      return <AudioIcon height={28} width={28} />;
+    case "mp4":
+      return <VideoIcon height={28} width={28} />;
+    case "wmv":
+      return <VideoIcon height={28} width={28} />;
+    case "mkv":
+      return <VideoIcon height={28} width={28} />;
 
-export const AttachmentIcon: React.FC<Props> = ({ width, height, className }) => (
-    <svg
-      width={width}
-      height={height}
-      className={className}
-      viewBox="0 0 24 24"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M18.75 20C18.4 20 18.1042 19.8792 17.8625 19.6375C17.6208 19.3958 17.5 19.1 17.5 18.75V5.25C17.5 4.9 17.6208 4.60417 17.8625 4.3625C18.1042 4.12083 18.4 4 18.75 4C19.1 4 19.3958 4.12083 19.6375 4.3625C19.8792 4.60417 20 4.9 20 5.25V18.75C20 19.1 19.8792 19.3958 19.6375 19.6375C19.3958 19.8792 19.1 20 18.75 20ZM6.275 20C6.09167 20 5.92083 19.9667 5.7625 19.9C5.60417 19.8333 5.47083 19.7458 5.3625 19.6375C5.25417 19.5292 5.16667 19.3958 5.1 19.2375C5.03333 19.0792 5 18.9167 5 18.75V15.25C5 14.9 5.12083 14.6042 5.3625 14.3625C5.60417 14.1208 5.9 14 6.25 14C6.6 14 6.89583 14.1208 7.1375 14.3625C7.37917 14.6042 7.5 14.9 7.5 15.25V18.75C7.5 18.9167 7.46667 19.0792 7.4 19.2375C7.33333 19.3958 7.24583 19.5292 7.1375 19.6375C7.02917 19.7458 6.9 19.8333 6.75 19.9C6.6 19.9667 6.44167 20 6.275 20ZM12.5 20C12.15 20 11.8542 19.8792 11.6125 19.6375C11.3708 19.3958 11.25 19.1 11.25 18.75V10.25C11.25 9.9 11.3708 9.60417 11.6125 9.3625C11.8542 9.12083 12.15 9 12.5 9C12.85 9 13.1458 9.12083 13.3875 9.3625C13.6292 9.60417 13.75 9.9 13.75 10.25V18.75C13.75 19.1 13.6292 19.3958 13.3875 19.6375C13.1458 19.8792 12.85 20 12.5 20Z"
-        fill="#212529"
-      />
-    </svg>
-  );
+    default:
+      return <DefaultIcon height={28} width={28} />;
+  }
+};

apps/app/components/icons/audio-file-icon.tsx

@@ -0,0 +1,9 @@
+import React from "react";
+import Image from "next/image";
+
+import type { Props } from "./types";
+import AudioFileIcon from "public/attachment/audio-icon.png";
+
+export const AudioIcon: React.FC<Props> = ({ width, height  }) => (
+  <Image src={AudioFileIcon} height={height} width={width} alt="AudioFileIcon" />
+);

apps/app/components/icons/css-file-icon.tsx

@@ -0,0 +1,9 @@
+import React from "react";
+import Image from "next/image";
+
+import type { Props } from "./types";
+import CssFileIcon from "public/attachment/css-icon.png";
+
+export const CssIcon: React.FC<Props> = ({ width, height  }) => (
+  <Image src={CssFileIcon} height={height} width={width} alt="CssFileIcon" />
+);

apps/app/components/icons/csv-file-icon.tsx

@@ -0,0 +1,9 @@
+import React from "react";
+import Image from "next/image";
+
+import type { Props } from "./types";
+import CSVFileIcon from "public/attachment/csv-icon.png";
+
+export const CsvIcon: React.FC<Props> = ({ width , height }) => (
+  <Image src={CSVFileIcon} height={height} width={width} alt="CSVFileIcon" />
+);

apps/app/components/icons/default-file-icon.tsx

@@ -0,0 +1,9 @@
+import React from "react";
+import Image from "next/image";
+
+import type { Props } from "./types";
+import DefaultFileIcon from "public/attachment/default-icon.png";
+
+export const DefaultIcon: React.FC<Props> = ({ width, height  }) => (
+  <Image src={DefaultFileIcon} height={height} width={width} alt="DefaultFileIcon" />
+);

apps/app/components/icons/doc-file-icon.tsx

@@ -0,0 +1,9 @@
+import React from "react";
+import Image from "next/image";
+
+import type { Props } from "./types";
+import DocFileIcon from "public/attachment/doc-icon.png";
+
+export const DocIcon: React.FC<Props> = ({ width , height }) => (
+  <Image src={DocFileIcon} height={height} width={width} alt="DocFileIcon" />
+);

apps/app/components/icons/figma-file-icon.tsx

@@ -0,0 +1,9 @@
+import React from "react";
+import Image from "next/image";
+
+import type { Props } from "./types";
+import FigmaFileIcon from "public/attachment/figma-icon.png";
+
+export const FigmaIcon: React.FC<Props> = ({ width , height }) => (
+  <Image src={FigmaFileIcon} height={height} width={width} alt="FigmaFileIcon" />
+);

apps/app/components/icons/html-file-icon.tsx

@@ -0,0 +1,9 @@
+import React from "react";
+import Image from "next/image";
+
+import type { Props } from "./types";
+import HtmlFileIcon from "public/attachment/html-icon.png";
+
+export const HtmlIcon: React.FC<Props> = ({ width, height  }) => (
+  <Image src={HtmlFileIcon} height={height} width={width} alt="HtmlFileIcon" />
+);

apps/app/components/icons/img-file-icon.tsx

@@ -0,0 +1,9 @@
+import React from "react";
+import Image from "next/image";
+
+import type { Props } from "./types";
+import ImgFileIcon from "public/attachment/img-icon.png";
+
+export const ImgIcon: React.FC<Props> = ({ width , height }) => (
+  <Image src={ImgFileIcon} height={height} width={width} alt="ImgFileIcon" />
+);

apps/app/components/icons/index.ts

@@ -56,4 +56,20 @@ export * from "./users";
 export * from "./import-layers";
 export * from "./check";
 export * from "./water-drop-icon";
-export * from "./transfer-icon";
+export * from "./transfer-icon";
+export * from "./pdf-file-icon";
+export * from "./csv-file-icon";
+export * from "./sheet-file-icon";
+export * from "./doc-file-icon";
+export * from "./html-file-icon";
+export * from "./css-file-icon";
+export * from "./js-file-icon";
+export * from "./figma-file-icon";
+export * from "./img-file-icon";
+export * from "./png-file-icon";
+export * from "./jpg-file-icon";
+export * from "./svg-file-icon";
+export * from "./txt-file-icon";
+export * from "./default-file-icon";
+export * from "./video-file-icon";
+export * from "./audio-file-icon";

apps/app/components/icons/jpg-file-icon.tsx

@@ -0,0 +1,9 @@
+import React from "react";
+import Image from "next/image";
+
+import type { Props } from "./types";
+import JpgFileIcon from "public/attachment/jpg-icon.png";
+
+export const JpgIcon: React.FC<Props> = ({ width, height  }) => (
+  <Image src={JpgFileIcon} height={height} width={width} alt="JpgFileIcon" />
+);

apps/app/components/icons/js-file-icon.tsx

@@ -0,0 +1,9 @@
+import React from "react";
+import Image from "next/image";
+
+import type { Props } from "./types";
+import JsFileIcon from "public/attachment/js-icon.png";
+
+export const JavaScriptIcon: React.FC<Props> = ({ width, height  }) => (
+  <Image src={JsFileIcon} height={height} width={width} alt="JsFileIcon" />
+);

apps/app/components/icons/pdf-file-icon.tsx

@@ -0,0 +1,9 @@
+import React from "react";
+import Image from "next/image";
+
+import type { Props } from "./types";
+import PDFFileIcon from "public/attachment/pdf-icon.png";
+
+export const PdfIcon: React.FC<Props> = ({ width , height  }) => (
+  <Image src={PDFFileIcon} height={height} width={width} alt="PDFFileIcon" />
+);

apps/app/components/icons/png-file-icon.tsx

@@ -0,0 +1,9 @@
+import React from "react";
+import Image from "next/image";
+
+import type { Props } from "./types";
+import PngFileIcon from "public/attachment/png-icon.png";
+
+export const PngIcon: React.FC<Props> = ({ width, height  }) => (
+  <Image src={PngFileIcon} height={height} width={width} alt="PngFileIcon" />
+);

apps/app/components/icons/sheet-file-icon.tsx

@@ -0,0 +1,9 @@
+import React from "react";
+import Image from "next/image";
+
+import type { Props } from "./types";
+import SheetFileIcon from "public/attachment/excel-icon.png";
+
+export const SheetIcon: React.FC<Props> = ({ width, height  }) => (
+  <Image src={SheetFileIcon} height={height} width={width} alt="SheetFileIcon" />
+);

apps/app/components/icons/svg-file-icon.tsx

@@ -0,0 +1,9 @@
+import React from "react";
+import Image from "next/image";
+
+import type { Props } from "./types";
+import SvgFileIcon from "public/attachment/svg-icon.png";
+
+export const SvgIcon: React.FC<Props> = ({ width, height  }) => (
+  <Image src={SvgFileIcon} height={height} width={width} alt="SvgFileIcon" />
+);

apps/app/components/icons/transfer-icon.tsx

@@ -2,7 +2,7 @@ import React from "react";
 
 import type { Props } from "./types";
 
-export const TransferIcon: React.FC<Props> = ({ width, height, className }) => (
+export const TransferIcon: React.FC<Props> = ({ width, height, className, color }) => (
     <svg
       width={width}
       height={height}
@@ -11,6 +11,6 @@ export const TransferIcon: React.FC<Props> = ({ width, height, className }) => (
       fill="none"
       xmlns="http://www.w3.org/2000/svg"
     >
-     <path d="M6.16683 14.6667C4.54183 14.6667 3.16336 14.1007 2.03141 12.9688C0.899468 11.8368 0.333496 10.4583 0.333496 8.83333C0.333496 7.125 0.941135 5.73264 2.15641 4.65625C3.37169 3.57986 4.72933 3.09028 6.22933 3.1875L4.87516 1.83333C4.75016 1.70833 4.68766 1.55903 4.68766 1.38542C4.68766 1.21181 4.75016 1.0625 4.87516 0.9375C5.00016 0.8125 5.14947 0.75 5.32308 0.75C5.49669 0.75 5.646 0.8125 5.771 0.9375L8.22933 3.39583C8.29877 3.46528 8.34739 3.53472 8.37516 3.60417C8.40294 3.67361 8.41683 3.75 8.41683 3.83333C8.41683 3.91667 8.40294 3.99306 8.37516 4.0625C8.34739 4.13194 8.29877 4.20139 8.22933 4.27083L5.771 6.72917C5.646 6.85417 5.50016 6.91319 5.3335 6.90625C5.16683 6.89931 5.021 6.83333 4.896 6.70833C4.771 6.58333 4.7085 6.43403 4.7085 6.26042C4.7085 6.08681 4.771 5.9375 4.896 5.8125L6.29183 4.41667C4.97239 4.38889 3.8578 4.79167 2.94808 5.625C2.03836 6.45833 1.5835 7.52778 1.5835 8.83333C1.5835 10.0972 2.03141 11.1771 2.92725 12.0729C3.82308 12.9688 4.90294 13.4167 6.16683 13.4167H8.04183C8.22239 13.4167 8.37169 13.4757 8.48975 13.5938C8.6078 13.7118 8.66683 13.8611 8.66683 14.0417C8.66683 14.2222 8.6078 14.3715 8.48975 14.4896C8.37169 14.6076 8.22239 14.6667 8.04183 14.6667H6.16683ZM11.5835 14.6667C11.2363 14.6667 10.9411 14.5451 10.6981 14.3021C10.455 14.059 10.3335 13.7639 10.3335 13.4167V10.0833C10.3335 9.73611 10.455 9.44097 10.6981 9.19792C10.9411 8.95486 11.2363 8.83333 11.5835 8.83333H16.5835C16.9307 8.83333 17.2259 8.95486 17.4689 9.19792C17.712 9.44097 17.8335 9.73611 17.8335 10.0833V13.4167C17.8335 13.7639 17.712 14.059 17.4689 14.3021C17.2259 14.5451 16.9307 14.6667 16.5835 14.6667H11.5835ZM11.5835 13.4167H16.5835V10.0833H11.5835V13.4167ZM11.5835 7.16667C11.2363 7.16667 10.9411 7.04514 10.6981 6.80208C10.455 6.55903 10.3335 6.26389 10.3335 5.91667V2.58333C10.3335 2.23611 10.455 1.94097 10.6981 1.69792C10.9411 1.45486 11.2363 1.33333 11.5835 1.33333H16.5835C16.9307 1.33333 17.2259 1.45486 17.4689 1.69792C17.712 1.94097 17.8335 2.23611 17.8335 2.58333V5.91667C17.8335 6.26389 17.712 6.55903 17.4689 6.80208C17.2259 7.04514 16.9307 7.16667 16.5835 7.16667H11.5835Z" fill="white"/>
+     <path d="M6.16683 14.6667C4.54183 14.6667 3.16336 14.1007 2.03141 12.9688C0.899468 11.8368 0.333496 10.4583 0.333496 8.83333C0.333496 7.125 0.941135 5.73264 2.15641 4.65625C3.37169 3.57986 4.72933 3.09028 6.22933 3.1875L4.87516 1.83333C4.75016 1.70833 4.68766 1.55903 4.68766 1.38542C4.68766 1.21181 4.75016 1.0625 4.87516 0.9375C5.00016 0.8125 5.14947 0.75 5.32308 0.75C5.49669 0.75 5.646 0.8125 5.771 0.9375L8.22933 3.39583C8.29877 3.46528 8.34739 3.53472 8.37516 3.60417C8.40294 3.67361 8.41683 3.75 8.41683 3.83333C8.41683 3.91667 8.40294 3.99306 8.37516 4.0625C8.34739 4.13194 8.29877 4.20139 8.22933 4.27083L5.771 6.72917C5.646 6.85417 5.50016 6.91319 5.3335 6.90625C5.16683 6.89931 5.021 6.83333 4.896 6.70833C4.771 6.58333 4.7085 6.43403 4.7085 6.26042C4.7085 6.08681 4.771 5.9375 4.896 5.8125L6.29183 4.41667C4.97239 4.38889 3.8578 4.79167 2.94808 5.625C2.03836 6.45833 1.5835 7.52778 1.5835 8.83333C1.5835 10.0972 2.03141 11.1771 2.92725 12.0729C3.82308 12.9688 4.90294 13.4167 6.16683 13.4167H8.04183C8.22239 13.4167 8.37169 13.4757 8.48975 13.5938C8.6078 13.7118 8.66683 13.8611 8.66683 14.0417C8.66683 14.2222 8.6078 14.3715 8.48975 14.4896C8.37169 14.6076 8.22239 14.6667 8.04183 14.6667H6.16683ZM11.5835 14.6667C11.2363 14.6667 10.9411 14.5451 10.6981 14.3021C10.455 14.059 10.3335 13.7639 10.3335 13.4167V10.0833C10.3335 9.73611 10.455 9.44097 10.6981 9.19792C10.9411 8.95486 11.2363 8.83333 11.5835 8.83333H16.5835C16.9307 8.83333 17.2259 8.95486 17.4689 9.19792C17.712 9.44097 17.8335 9.73611 17.8335 10.0833V13.4167C17.8335 13.7639 17.712 14.059 17.4689 14.3021C17.2259 14.5451 16.9307 14.6667 16.5835 14.6667H11.5835ZM11.5835 13.4167H16.5835V10.0833H11.5835V13.4167ZM11.5835 7.16667C11.2363 7.16667 10.9411 7.04514 10.6981 6.80208C10.455 6.55903 10.3335 6.26389 10.3335 5.91667V2.58333C10.3335 2.23611 10.455 1.94097 10.6981 1.69792C10.9411 1.45486 11.2363 1.33333 11.5835 1.33333H16.5835C16.9307 1.33333 17.2259 1.45486 17.4689 1.69792C17.712 1.94097 17.8335 2.23611 17.8335 2.58333V5.91667C17.8335 6.26389 17.712 6.55903 17.4689 6.80208C17.2259 7.04514 16.9307 7.16667 16.5835 7.16667H11.5835Z" fill={color}/>
     </svg>
   );