Merge pull request #703 from makeplane/stage-release

promote: stage-release to production

.eslintrc.js

@@ -1,8 +1,10 @@
 module.exports = {
   root: true,
+  // This tells ESLint to load the config from the package `eslint-config-custom`
+  extends: ["custom"],
   settings: {
     next: {
-      rootDir: ["app/"],
+      rootDir: ["apps/*"],
     },
   },
 };

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

@@ -44,15 +44,6 @@ 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/A92xrEGCge) 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/29tPNhaV) 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,7 +65,6 @@ 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
 
@@ -124,6 +123,14 @@ 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/.env.example

@@ -3,19 +3,15 @@ DJANGO_SETTINGS_MODULE="plane.settings.production"
 DATABASE_URL=postgres://plane:xyzzyspoon@db:5432/plane
 # Cache
 REDIS_URL=redis://redis:6379/
-# SMTP
+# SMPT
 EMAIL_HOST=""
 EMAIL_HOST_USER=""
 EMAIL_HOST_PASSWORD=""
-EMAIL_PORT="587"
-EMAIL_USE_TLS="1"
-EMAIL_FROM="Team Plane <team@mailer.plane.so>"
-# AWS
+# AWS 
 AWS_REGION=""
 AWS_ACCESS_KEY_ID=""
 AWS_SECRET_ACCESS_KEY=""
 AWS_S3_BUCKET_NAME=""
-AWS_S3_ENDPOINT_URL=""
 # FE
 WEB_URL="localhost/"
 # OAUTH
@@ -25,4 +21,4 @@ DISABLE_COLLECTSTATIC=1
 DOCKERIZED=1
 # GPT Envs
 OPENAI_API_KEY=0
-GPT_ENGINE=0
+GPT_ENGINE=0

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: celery -A plane worker -l info
+worker: python manage.py rqworker

apiserver/back_migration.py

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

apiserver/bin/worker

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

apiserver/plane/__init__.py

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

apiserver/plane/api/serializers/__init__.py

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

apiserver/plane/api/serializers/estimate.py

@@ -1,38 +0,0 @@
-# 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",
-        ]
-
-
-class EstimateReadSerializer(BaseSerializer):
-    points = EstimatePointSerializer(read_only=True, many=True)
-
-    class Meta:
-        model = Estimate
-        fields = "__all__"
-        read_only_fields = [
-            "points",
-            "name",
-            "description",
-        ]

apiserver/plane/api/serializers/importer.py

@@ -1,13 +1,11 @@
 # 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,7 +25,6 @@ from plane.db.models import (
     Module,
     ModuleIssue,
     IssueLink,
-    IssueAttachment,
 )
 
 
@@ -100,7 +99,7 @@ class IssueCreateSerializer(BaseSerializer):
         project = self.context["project"]
         issue = Issue.objects.create(**validated_data, project=project)
 
-        if blockers is not None and len(blockers):
+        if blockers is not None:
             IssueBlocker.objects.bulk_create(
                 [
                     IssueBlocker(
@@ -116,7 +115,7 @@ class IssueCreateSerializer(BaseSerializer):
                 batch_size=10,
             )
 
-        if assignees is not None and len(assignees):
+        if assignees is not None:
             IssueAssignee.objects.bulk_create(
                 [
                     IssueAssignee(
@@ -131,19 +130,8 @@ 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 and len(labels):
+        if labels is not None:
             IssueLabel.objects.bulk_create(
                 [
                     IssueLabel(
@@ -159,7 +147,7 @@ class IssueCreateSerializer(BaseSerializer):
                 batch_size=10,
             )
 
-        if blocks is not None and len(blocks):
+        if blocks is not None:
             IssueBlocker.objects.bulk_create(
                 [
                     IssueBlocker(
@@ -266,8 +254,7 @@ class IssueActivitySerializer(BaseSerializer):
 class IssueCommentSerializer(BaseSerializer):
     actor_detail = UserLiteSerializer(read_only=True, source="actor")
     issue_detail = IssueFlatSerializer(read_only=True, source="issue")
-    project_detail = ProjectLiteSerializer(read_only=True, source="project")
-    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
+    project_detail = ProjectSerializer(read_only=True, source="project")
 
     class Meta:
         model = IssueComment
@@ -310,9 +297,6 @@ 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__"
@@ -455,21 +439,6 @@ 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")
@@ -497,7 +466,6 @@ 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:
@@ -522,8 +490,6 @@ 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,18 +25,22 @@ class IssueViewSerializer(BaseSerializer):
 
     def create(self, validated_data):
         query_params = validated_data.get("query_data", {})
-        if bool(query_params):
-            validated_data["query"] = issue_filters(query_params, "POST")
-        else:
-            validated_data["query"] = dict()
+
+        if not bool(query_params):
+            raise serializers.ValidationError(
+                {"query_data": ["Query data field cannot be empty"]}
+            )
+
+        validated_data["query"] = issue_filters(query_params, "POST")
         return IssueView.objects.create(**validated_data)
 
     def update(self, instance, validated_data):
         query_params = validated_data.get("query_data", {})
-        if bool(query_params):
-            validated_data["query"] = issue_filters(query_params, "POST")
-        else:
-            validated_data["query"] = dict()
+        if not bool(query_params):
+            raise serializers.ValidationError(
+                {"query_data": ["Query data field cannot be empty"]}
+            )
+
         validated_data["query"] = issue_filters(query_params, "PATCH")
         return super().update(instance, validated_data)
 

apiserver/plane/api/serializers/workspace.py

@@ -5,15 +5,8 @@ from rest_framework import serializers
 from .base import BaseSerializer
 from .user import UserLiteSerializer
 
-from plane.db.models import (
-    User,
-    Workspace,
-    WorkspaceMember,
-    Team,
-    TeamMember,
-    WorkspaceMemberInvite,
-    WorkspaceTheme,
-)
+from plane.db.models import User, Workspace, WorkspaceMember, Team, TeamMember
+from plane.db.models import Workspace, WorkspaceMember, Team, WorkspaceMemberInvite
 
 
 class WorkSpaceSerializer(BaseSerializer):
@@ -107,13 +100,3 @@ 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,7 +42,6 @@ from plane.api.views import (
     UserActivityGraphEndpoint,
     UserIssueCompletedGraphEndpoint,
     UserWorkspaceDashboardEndpoint,
-    WorkspaceThemeViewSet,
     ## End Workspaces
     # File Assets
     FileAssetEndpoint,
@@ -75,16 +74,10 @@ from plane.api.views import (
     SubIssuesEndpoint,
     IssueLinkViewSet,
     BulkCreateIssueLabelsEndpoint,
-    IssueAttachmentEndpoint,
     ## End Issues
     # States
     StateViewSet,
-    StateDeleteIssueCheckEndpoint,
     ## End States
-    # Estimates
-    ProjectEstimatePointEndpoint,
-    BulkEstimatePointEndpoint,
-    ## End Estimates
     # Shortcuts
     ShortCutViewSet,
     ## End Shortcuts
@@ -140,14 +133,10 @@ from plane.api.views import (
     ## End importer
     # Search
     GlobalSearchEndpoint,
-    IssueSearchEndpoint,
     ## End Search
     # Gpt
     GPTIntegrationEndpoint,
     ## End Gpt
-    # Release Notes
-    ReleaseNotesEndpoint,
-    ## End Release Notes
 )
 
 
@@ -353,27 +342,6 @@ 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(
@@ -508,40 +476,7 @@ urlpatterns = [
         ),
         name="project-state",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/states/<uuid:pk>/",
-        StateDeleteIssueCheckEndpoint.as_view(),
-        name="state-delete-check",
-    ),
     # End States ##
-    #  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/",
-        BulkEstimatePointEndpoint.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
-        name="bulk-create-estimate-points",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/estimates/<uuid:estimate_id>/",
-        BulkEstimatePointEndpoint.as_view(
-            {
-                "get": "retrieve",
-                "patch": "partial_update",
-                "delete": "destroy",
-            }
-        ),
-        name="bulk-create-estimate-points",
-    ),
-    # End Estimates ##
     # Shortcuts
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/shortcuts/",
@@ -806,16 +741,6 @@ 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(
@@ -1233,11 +1158,6 @@ 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(),
@@ -1250,11 +1170,6 @@ 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(
@@ -1263,11 +1178,4 @@ urlpatterns = [
         name="importer",
     ),
     ## End Gpt
-    # Release Notes
-    path(
-        "release-notes/",
-        ReleaseNotesEndpoint.as_view(),
-        name="release-notes",
-    ),
-    ## End Release Notes
 ]

apiserver/plane/api/views/__init__.py

@@ -40,9 +40,8 @@ from .workspace import (
     UserActivityGraphEndpoint,
     UserIssueCompletedGraphEndpoint,
     UserWorkspaceDashboardEndpoint,
-    WorkspaceThemeViewSet,
 )
-from .state import StateViewSet, StateDeleteIssueCheckEndpoint
+from .state import StateViewSet
 from .shortcut import ShortCutViewSet
 from .view import IssueViewViewSet, ViewIssuesEndpoint, IssueViewFavoriteViewSet
 from .cycle import (
@@ -70,7 +69,6 @@ from .issue import (
     SubIssuesEndpoint,
     IssueLinkViewSet,
     BulkCreateIssueLabelsEndpoint,
-    IssueAttachmentEndpoint,
 )
 
 from .auth_extended import (
@@ -127,15 +125,7 @@ from .page import (
     CreatedbyOtherPagesEndpoint,
 )
 
-from .search import GlobalSearchEndpoint, IssueSearchEndpoint
+from .search import GlobalSearchEndpoint
 
 
 from .gpt import GPTIntegrationEndpoint
-
-from .estimate import (
-    ProjectEstimatePointEndpoint,
-    BulkEstimatePointEndpoint,
-)
-
-
-from .release import ReleaseNotesEndpoint

apiserver/plane/api/views/asset.py

@@ -65,8 +65,6 @@ 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/base.py

@@ -10,7 +10,7 @@ from rest_framework.views import APIView
 from rest_framework.filters import SearchFilter
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.exceptions import NotFound
-from sentry_sdk import capture_exception
+
 from django_filters.rest_framework import DjangoFilterBackend
 
 # Module imports
@@ -39,7 +39,7 @@ class BaseViewSet(ModelViewSet, BasePaginator):
         try:
             return self.model.objects.all()
         except Exception as e:
-            capture_exception(e)
+            print(e)
             raise APIException("Please check the view", status.HTTP_400_BAD_REQUEST)
 
     def dispatch(self, request, *args, **kwargs):

apiserver/plane/api/views/cycle.py

@@ -28,8 +28,6 @@ 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
@@ -228,20 +226,6 @@ 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
@@ -333,19 +317,21 @@ class CycleIssueViewSet(BaseViewSet):
 
             # Capture Issue Activity
             issue_activity.delay(
-                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
-                        ),
-                    }
-                ),
+                {
+                    "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
+                            ),
+                        }
+                    ),
+                },
             )
 
             # Return all Cycle Issues
@@ -384,8 +370,7 @@ class CycleDateCheckEndpoint(BaseAPIView):
 
             cycles = Cycle.objects.filter(
                 Q(start_date__lte=start_date, end_date__gte=start_date)
-                | Q(start_date__lte=end_date, end_date__gte=end_date)
-                | Q(start_date__gte=start_date, end_date__lte=end_date),
+                | Q(start_date__gte=end_date, end_date__lte=end_date),
                 workspace__slug=slug,
                 project_id=project_id,
             )

apiserver/plane/api/views/estimate.py

@@ -1,253 +0,0 @@
-# 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,
-    EstimateReadSerializer,
-)
-
-
-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(BaseViewSet):
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-    model = Estimate
-    serializer_class = EstimateSerializer
-
-    def list(self, request, slug, project_id):
-        try:
-            estimates = Estimate.objects.filter(
-                workspace__slug=slug, project_id=project_id
-            ).prefetch_related("points")
-            serializer = EstimateReadSerializer(estimates, many=True)
-            return Response(serializer.data, status=status.HTTP_200_OK)
-        except Exception as e:
-            print(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-    def create(self, request, slug, project_id):
-        try:
-            if not request.data.get("estimate", False):
-                return Response(
-                    {"error": "Estimate is required"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            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_serializer = EstimateSerializer(data=request.data.get("estimate"))
-            if not estimate_serializer.is_valid():
-                return Response(
-                    estimate_serializer.errors, status=status.HTTP_400_BAD_REQUEST
-                )
-            try:
-                estimate = estimate_serializer.save(project_id=project_id)
-            except IntegrityError:
-                return Response(
-                    {"errror": "Estimate with the name already exists"},
-                    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,
-            )
-
-            estimate_point_serializer = EstimatePointSerializer(
-                estimate_points, many=True
-            )
-
-            return Response(
-                {
-                    "estimate": estimate_serializer.data,
-                    "estimate_points": estimate_point_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 retrieve(self, request, slug, project_id, estimate_id):
-        try:
-            estimate = Estimate.objects.get(
-                pk=estimate_id, workspace__slug=slug, project_id=project_id
-            )
-            serializer = EstimateReadSerializer(estimate)
-            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 partial_update(self, request, slug, project_id, estimate_id):
-        try:
-            if not request.data.get("estimate", False):
-                return Response(
-                    {"error": "Estimate is required"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            if not len(request.data.get("estimate_points", [])):
-                return Response(
-                    {"error": "Estimate points are required"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            estimate = Estimate.objects.get(pk=estimate_id)
-
-            estimate_serializer = EstimateSerializer(
-                estimate, data=request.data.get("estimate"), partial=True
-            )
-            if not estimate_serializer.is_valid():
-                return Response(
-                    estimate_serializer.errors, status=status.HTTP_400_BAD_REQUEST
-                )
-            try:
-                estimate = estimate_serializer.save()
-            except IntegrityError:
-                return Response(
-                    {"errror": "Estimate with the name already exists"},
-                    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,
-            )
-
-            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)
-                ]
-                if len(estimate_point_data):
-                    estimate_point.value = estimate_point_data[0].get(
-                        "value", estimate_point.value
-                    )
-                    updated_estimate_points.append(estimate_point)
-
-            try:
-                EstimatePoint.objects.bulk_update(
-                    updated_estimate_points, ["value"], batch_size=10
-                )
-            except IntegrityError as e:
-                return Response(
-                    {"error": "Values need to be unique for each key"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            estimate_point_serializer = EstimatePointSerializer(estimate_points, many=True)
-            return Response(
-                {
-                    "estimate": estimate_serializer.data,
-                    "estimate_points": estimate_point_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 destroy(self, request, slug, project_id, estimate_id):
-        try:
-            estimate = Estimate.objects.get(
-                pk=estimate_id, workspace__slug=slug, project_id=project_id
-            )
-            estimate.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,
-            )

apiserver/plane/api/views/importer.py

@@ -65,35 +65,29 @@ class ServiceIssueImportSummaryEndpoint(BaseAPIView):
                 )
 
             if service == "jira":
-                # 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",
-                }
-
-                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:
+                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(
-                        response,
-                        status=status.HTTP_200_OK,
+                        {
+                            "error": "Project name, Project key, API token, Cloud hostname and email are requied"
+                        },
+                        status=status.HTTP_400_BAD_REQUEST,
                     )
+
+                return Response(
+                    jira_project_issue_summary(
+                        email, api_token, project_name, cloud_hostname
+                    ),
+                    status=status.HTTP_200_OK,
+                )
             return Response(
                 {"error": "Service not supported yet"},
                 status=status.HTTP_400_BAD_REQUEST,
@@ -104,7 +98,7 @@ class ServiceIssueImportSummaryEndpoint(BaseAPIView):
                 status=status.HTTP_400_BAD_REQUEST,
             )
         except Exception as e:
-            capture_exception(e)
+            print(e)
             return Response(
                 {"error": "Something went wrong please try again later"},
                 status=status.HTTP_400_BAD_REQUEST,
@@ -219,10 +213,8 @@ class ImportServiceEndpoint(BaseAPIView):
 
     def get(self, request, slug):
         try:
-            imports = (
-                Importer.objects.filter(workspace__slug=slug)
-                .order_by("-created_at")
-                .select_related("initiated_by", "project", "workspace")
+            imports = Importer.objects.filter(workspace__slug=slug).order_by(
+                "-created_at"
             )
             serializer = ImporterSerializer(imports, many=True)
             return Response(serializer.data)
@@ -233,20 +225,6 @@ 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

@@ -1,19 +1,17 @@
 # Python imports
 import json
 import random
-from itertools import chain
+from itertools import groupby, chain
 
 # Django imports
-from django.db.models import Prefetch, OuterRef, Func, F, Q, Count
+from django.db.models import Prefetch, OuterRef, Func, F, Q
 from django.core.serializers.json import DjangoJSONEncoder
 from django.utils.decorators import method_decorator
 from django.views.decorators.gzip import gzip_page
-from django.db.models.functions import Coalesce
 
 # 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
@@ -30,7 +28,6 @@ from plane.api.serializers import (
     IssueFlatSerializer,
     IssueLinkSerializer,
     IssueLiteSerializer,
-    IssueAttachmentSerializer,
 )
 from plane.api.permissions import (
     ProjectEntityPermission,
@@ -46,8 +43,6 @@ from plane.db.models import (
     IssueProperty,
     Label,
     IssueLink,
-    IssueAttachment,
-    State,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
 from plane.utils.grouper import group_results
@@ -87,14 +82,16 @@ 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)
@@ -105,16 +102,18 @@ 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)
 
@@ -150,20 +149,6 @@ 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 = (
@@ -202,12 +187,16 @@ 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)
@@ -248,20 +237,6 @@ 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)
@@ -353,12 +328,14 @@ 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):
@@ -368,15 +345,17 @@ 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)
@@ -387,17 +366,19 @@ 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)
 
@@ -592,31 +573,8 @@ class SubIssuesEndpoint(BaseAPIView):
                 .prefetch_related("labels")
             )
 
-            state_distribution = (
-                State.objects.filter(workspace__slug=slug, project_id=project_id)
-                .annotate(
-                    state_count=Count(
-                        "state_issue",
-                        filter=Q(state_issue__parent_id=issue_id),
-                    )
-                )
-                .order_by("group")
-                .values("group", "state_count")
-            )
-
-            result = {item["group"]: item["state_count"] for item in state_distribution}
-
-            serializer = IssueLiteSerializer(
-                sub_issues,
-                many=True,
-            )
-            return Response(
-                {
-                    "sub_issues": serializer.data,
-                    "state_distribution": result,
-                },
-                status=status.HTTP_200_OK,
-            )
+            serializer = IssueLiteSerializer(sub_issues, many=True)
+            return Response(serializer.data, status=status.HTTP_200_OK)
         except Exception as e:
             capture_exception(e)
             return Response(
@@ -674,54 +632,6 @@ 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 (
@@ -773,72 +683,3 @@ 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,8 +31,6 @@ 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
@@ -206,20 +204,6 @@ 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
@@ -302,19 +286,21 @@ class ModuleIssueViewSet(BaseViewSet):
 
             # Capture Issue Activity
             issue_activity.delay(
-                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
-                        ),
-                    }
-                ),
+                {
+                    "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
+                            ),
+                        }
+                    ),
+                },
             )
 
             return Response(

apiserver/plane/api/views/oauth.py

@@ -14,7 +14,7 @@ from rest_framework.permissions import AllowAny
 from rest_framework.views import APIView
 from rest_framework_simplejwt.tokens import RefreshToken
 from rest_framework import status
-from sentry_sdk import capture_exception
+
 # sso authentication
 from google.oauth2 import id_token
 from google.auth.transport import requests as google_auth_request
@@ -48,7 +48,7 @@ def validate_google_token(token, client_id):
         }
         return data
     except Exception as e:
-        capture_exception(e)
+        print(e)
         raise exceptions.AuthenticationFailed("Error with Google connection.")
 
 
@@ -305,7 +305,8 @@ class OauthEndpoint(BaseAPIView):
             )
             return Response(data, status=status.HTTP_201_CREATED)
         except Exception as e:
-            capture_exception(e)
+            print(e)
+
             return Response(
                 {
                     "error": "Something went wrong. Please try again later or contact the support team."

apiserver/plane/api/views/page.py

@@ -344,7 +344,7 @@ class RecentPagesEndpoint(BaseAPIView):
                 status=status.HTTP_200_OK,
             )
         except Exception as e:
-            capture_exception(e)
+            print(e)
             return Response(
                 {"error": "Something went wrong please try again later"},
                 status=status.HTTP_400_BAD_REQUEST,

apiserver/plane/api/views/release.py

@@ -1,21 +0,0 @@
-# Third party imports
-from rest_framework.response import Response
-from rest_framework import status
-from sentry_sdk import capture_exception
-
-# Module imports
-from .base import BaseAPIView
-from plane.utils.integrations.github import get_release_notes
-
-
-class ReleaseNotesEndpoint(BaseAPIView):
-    def get(self, request):
-        try:
-            release_notes = get_release_notes()
-            return Response(release_notes, 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/search.py

@@ -12,7 +12,6 @@ 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):
@@ -25,26 +24,20 @@ 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"]
@@ -56,22 +49,18 @@ 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):
@@ -79,20 +68,16 @@ 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):
@@ -100,20 +85,16 @@ 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):
@@ -121,20 +102,16 @@ 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):
@@ -142,20 +119,16 @@ 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):
@@ -195,57 +168,7 @@ class GlobalSearchEndpoint(BaseAPIView):
             return Response({"results": results}, 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 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)
+            print(e)
             return Response(
                 {"error": "Something went wrong please try again later"},
                 status=status.HTTP_400_BAD_REQUEST,

apiserver/plane/api/views/state.py

@@ -1,9 +1,6 @@
 # Python imports
 from itertools import groupby
 
-# Django imports
-from django.db import IntegrityError
-
 # Third party imports
 from rest_framework.response import Response
 from rest_framework import status
@@ -11,10 +8,10 @@ from sentry_sdk import capture_exception
 
 
 # Module imports
-from . import BaseViewSet, BaseAPIView
+from . import BaseViewSet
 from plane.api.serializers import StateSerializer
 from plane.api.permissions import ProjectEntityPermission
-from plane.db.models import State, Issue
+from plane.db.models import State
 
 
 class StateViewSet(BaseViewSet):
@@ -39,25 +36,6 @@ class StateViewSet(BaseViewSet):
             .distinct()
         )
 
-    def create(self, request, slug, project_id):
-        try:
-            serializer = StateSerializer(data=request.data)
-            if serializer.is_valid():
-                serializer.save(project_id=project_id)
-                return Response(serializer.data, status=status.HTTP_200_OK)
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-        except IntegrityError:
-            return Response(
-                {"error": "State with the name already exists"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
     def list(self, request, slug, project_id):
         try:
             state_dict = dict()
@@ -88,37 +66,7 @@ class StateViewSet(BaseViewSet):
                     {"error": "Default state cannot be deleted"}, status=False
                 )
 
-            # Check for any issues in the state
-            issue_exist = Issue.objects.filter(state=pk).exists()
-
-            if issue_exist:
-                return Response(
-                    {
-                        "error": "The state is not empty, only empty states can be deleted"
-                    },
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
             state.delete()
             return Response(status=status.HTTP_204_NO_CONTENT)
         except State.DoesNotExist:
             return Response({"error": "State does not exists"}, status=status.HTTP_404)
-
-
-class StateDeleteIssueCheckEndpoint(BaseAPIView):
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-
-    def get(self, request, slug, project_id, pk):
-        try:
-            issue_count = Issue.objects.filter(
-                state=pk, workspace__slug=slug, project_id=project_id
-            ).count()
-            return Response({"issue_count": issue_count}, 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/workspace.py

@@ -36,7 +36,6 @@ from plane.api.serializers import (
     WorkSpaceMemberInviteSerializer,
     UserLiteSerializer,
     ProjectMemberSerializer,
-    WorkspaceThemeSerializer,
 )
 from plane.api.views.base import BaseAPIView
 from . import BaseViewSet
@@ -49,7 +48,6 @@ 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
@@ -145,6 +143,7 @@ class UserWorkSpacesEndpoint(BaseAPIView):
             return Response(serializer.data, status=status.HTTP_200_OK)
 
         except Exception as e:
+            print(e)
             capture_exception(e)
             return Response(
                 {"error": "Something went wrong please try again later"},
@@ -332,6 +331,7 @@ class JoinWorkspaceEndpoint(BaseAPIView):
                 status=status.HTTP_404_NOT_FOUND,
             )
         except Exception as e:
+            print(e)
             capture_exception(e)
             return Response(
                 {"error": "Something went wrong please try again later"},
@@ -752,35 +752,3 @@ 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:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-

apiserver/plane/bgtasks/email_verification_task.py

@@ -2,26 +2,23 @@
 from django.core.mail import EmailMultiAlternatives
 from django.template.loader import render_to_string
 from django.utils.html import strip_tags
-from django.conf import settings
 
 # Third party imports
-from celery import shared_task
-
-
+from django_rq import job
 from sentry_sdk import capture_exception
 
 # Module imports
 from plane.db.models import User
 
 
-@shared_task
+@job("default")
 def email_verification(first_name, email, token, current_site):
 
     try:
         realtivelink = "/request-email-verification/" + "?token=" + str(token)
         abs_url = "http://" + current_site + realtivelink
 
-        from_email_string = settings.EMAIL_FROM
+        from_email_string = f"Team Plane <team@mailer.plane.so>"
 
         subject = f"Verify your Email!"
 

apiserver/plane/bgtasks/forgot_password_task.py

@@ -2,24 +2,23 @@
 from django.core.mail import EmailMultiAlternatives
 from django.template.loader import render_to_string
 from django.utils.html import strip_tags
-from django.conf import settings
 
 # Third party imports
-from celery import shared_task
+from django_rq import job
 from sentry_sdk import capture_exception
 
 # Module imports
 from plane.db.models import User
 
 
-@shared_task
+@job("default")
 def forgot_password(first_name, email, uidb64, token, current_site):
 
     try:
         realtivelink = f"/email-verify/?uidb64={uidb64}&token={token}/"
         abs_url = "http://" + current_site + realtivelink
 
-        from_email_string = settings.EMAIL_FROM
+        from_email_string = f"Team Plane <team@mailer.plane.so>"
 
         subject = f"Verify your Email!"
 

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 celery import shared_task
+from django_rq import job
 from sentry_sdk import capture_exception
 
 # Module imports
@@ -29,7 +29,7 @@ from plane.db.models import (
 from .workspace_invitation_task import workspace_invitation
 
 
-@shared_task
+@job("default")
 def service_importer(service, importer_id):
     try:
         importer = Importer.objects.get(pk=importer_id)
@@ -38,55 +38,54 @@ def service_importer(service, importer_id):
 
         users = importer.data.get("users", [])
 
-        # 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,
-            )
+        # 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,
-            )
 
-            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,
-            )
+        # 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,
+        )
 
         # 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 celery import shared_task
+from django_rq import job
 from sentry_sdk import capture_exception
 
 # Module imports
@@ -136,7 +136,6 @@ 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
@@ -634,40 +633,6 @@ 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
 ):
@@ -685,14 +650,7 @@ 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:
@@ -706,29 +664,9 @@ 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,
@@ -748,11 +686,6 @@ 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(
@@ -772,6 +705,21 @@ 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
 ):
@@ -788,119 +736,28 @@ 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
-@shared_task
-def issue_activity(
-    type, requested_data, current_instance, issue_id, actor_id, project_id
-):
+@job("default")
+def issue_activity(event):
     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 = {
@@ -910,11 +767,6 @@ def issue_activity(
             "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)

apiserver/plane/bgtasks/magic_link_code_task.py

@@ -2,20 +2,20 @@
 from django.core.mail import EmailMultiAlternatives
 from django.template.loader import render_to_string
 from django.utils.html import strip_tags
-from django.conf import settings
 
 # Third party imports
-from celery import shared_task
+from django_rq import job
 from sentry_sdk import capture_exception
 
 
-@shared_task
+@job("default")
 def magic_link(email, key, token, current_site):
+
     try:
         realtivelink = f"/magic-sign-in/?password={token}&key={key}"
         abs_url = "http://" + current_site + realtivelink
 
-        from_email_string = settings.EMAIL_FROM
+        from_email_string = f"Team Plane <team@mailer.plane.so>"
 
         subject = f"Login for Plane"
 
@@ -30,5 +30,6 @@ def magic_link(email, key, token, current_site):
         msg.send()
         return
     except Exception as e:
+        print(e)
         capture_exception(e)
         return

apiserver/plane/bgtasks/project_invitation_task.py

@@ -2,19 +2,20 @@
 from django.core.mail import EmailMultiAlternatives
 from django.template.loader import render_to_string
 from django.utils.html import strip_tags
-from django.conf import settings
 
 # Third party imports
-from celery import shared_task
+from django_rq import job
 from sentry_sdk import capture_exception
 
 # Module imports
 from plane.db.models import Project, User, ProjectMemberInvite
 
 
-@shared_task
+@job("default")
 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
@@ -23,7 +24,7 @@ def project_invitation(email, project_id, token, current_site):
         relativelink = f"/project-member-invitation/{project_member_invite.id}"
         abs_url = "http://" + current_site + relativelink
 
-        from_email_string = settings.EMAIL_FROM
+        from_email_string = f"Team Plane <team@mailer.plane.so>"
 
         subject = f"{project.created_by.first_name or project.created_by.email} invited you to join {project.name} on Plane"
 
@@ -34,9 +35,7 @@ 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)
 
@@ -50,5 +49,6 @@ def project_invitation(email, project_id, token, current_site):
     except (Project.DoesNotExist, ProjectMemberInvite.DoesNotExist) as e:
         return
     except Exception as e:
+        print(e)
         capture_exception(e)
         return

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 celery import shared_task
+from django_rq import job
 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
 
 
-@shared_task
+@job("default")
 def workspace_invitation(email, workspace_id, token, current_site, invitor):
     try:
         workspace = Workspace.objects.get(pk=workspace_id)
@@ -27,7 +27,7 @@ def workspace_invitation(email, workspace_id, token, current_site, invitor):
         )
         abs_url = "http://" + current_site + realtivelink
 
-        from_email_string = settings.EMAIL_FROM
+        from_email_string = f"Team Plane <team@mailer.plane.so>"
 
         subject = f"{invitor or email} invited you to join {workspace.name} on Plane"
 

apiserver/plane/celery.py

@@ -1,17 +0,0 @@
-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

@@ -1,19 +0,0 @@
-# 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

@@ -1,97 +0,0 @@
-# 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

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

apiserver/plane/db/models/estimate.py

@@ -1,46 +0,0 @@
-# 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,6 +1,3 @@
-# Python import
-from uuid import uuid4
-
 # Django imports
 from django.contrib.postgres.fields import ArrayField
 from django.db import models
@@ -8,8 +5,6 @@ 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
@@ -38,9 +33,6 @@ 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>")
@@ -62,6 +54,7 @@ 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"
     )
@@ -201,38 +194,6 @@ 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": None,
+        "groupByProperty": True,
         "showEmptyGroups": True,
     }
 
@@ -69,9 +69,6 @@ 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"""
@@ -133,7 +130,7 @@ class ProjectMember(ProjectBaseModel):
     )
     comment = models.TextField(blank=True, null=True)
     role = models.PositiveSmallIntegerField(choices=ROLE_CHOICES, default=10)
-    view_props = models.JSONField(default=get_default_props)
+    view_props = models.JSONField(null=True)
     default_props = models.JSONField(default=get_default_props)
 
     class Meta:

apiserver/plane/db/models/user.py

@@ -72,7 +72,6 @@ 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"
 
@@ -109,7 +108,7 @@ def send_welcome_email(sender, instance, created, **kwargs):
         if created and not instance.is_bot:
             first_name = instance.first_name.capitalize()
             to_email = instance.email
-            from_email_string = settings.EMAIL_FROM
+            from_email_string = f"Team Plane <team@mailer.plane.so>"
 
             subject = f"Welcome to Plane ✈️!"
 

apiserver/plane/db/models/workspace.py

@@ -36,6 +36,7 @@ class Workspace(BaseModel):
         ordering = ("-created_at",)
 
 
+
 class WorkspaceMember(BaseModel):
     workspace = models.ForeignKey(
         "db.Workspace", on_delete=models.CASCADE, related_name="workspace_member"
@@ -110,6 +111,7 @@ class Team(BaseModel):
 
 
 class TeamMember(BaseModel):
+
     workspace = models.ForeignKey(
         Workspace, on_delete=models.CASCADE, related_name="team_member"
     )
@@ -127,24 +129,3 @@ 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,6 +35,7 @@ INSTALLED_APPS = [
     "rest_framework_simplejwt.token_blacklist",
     "corsheaders",
     "taggit",
+    "django_rq",
 ]
 
 MIDDLEWARE = [
@@ -174,12 +175,11 @@ EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
 # Host for sending e-mail.
 EMAIL_HOST = os.environ.get("EMAIL_HOST")
 # Port for sending e-mail.
-EMAIL_PORT = int(os.environ.get("EMAIL_PORT", 587))
+EMAIL_PORT = 587
 # Optional SMTP authentication information for EMAIL_HOST.
 EMAIL_HOST_USER = os.environ.get("EMAIL_HOST_USER")
 EMAIL_HOST_PASSWORD = os.environ.get("EMAIL_HOST_PASSWORD")
-EMAIL_USE_TLS = os.environ.get("EMAIL_USE_TLS", "1") == "1"
-EMAIL_FROM = os.environ.get("EMAIL_FROM", "Team Plane <team@mailer.plane.so>")
+EMAIL_USE_TLS = True
 
 
 SIMPLE_JWT = {
@@ -208,7 +208,3 @@ 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,8 +59,16 @@ if os.environ.get("SENTRY_DSN", False):
 
 REDIS_HOST = "localhost"
 REDIS_PORT = 6379
-REDIS_URL = os.environ.get("REDIS_URL")
+REDIS_URL = False
 
+RQ_QUEUES = {
+    "default": {
+        "HOST": "localhost",
+        "PORT": 6379,
+        "DB": 0,
+        "DEFAULT_TIMEOUT": 360,
+    },
+}
 
 MEDIA_URL = "/uploads/"
 MEDIA_ROOT = os.path.join(BASE_DIR, "uploads")
@@ -80,9 +88,3 @@ 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")
-
-
-GITHUB_ACCESS_TOKEN = os.environ.get("GITHUB_ACCESS_TOKEN", False)

apiserver/plane/settings/production.py

@@ -1,7 +1,5 @@
 """Production settings and globals."""
 from urllib.parse import urlparse
-import ssl
-import certifi
 
 import dj_database_url
 from urllib.parse import urlparse
@@ -105,7 +103,7 @@ if (
     AWS_S3_ADDRESSING_STYLE = "auto"
 
     # The full URL to the S3 endpoint. Leave blank to use the default region URL.
-    AWS_S3_ENDPOINT_URL = os.environ.get("AWS_S3_ENDPOINT_URL", "")
+    AWS_S3_ENDPOINT_URL = ""
 
     # A prefix to be applied to every stored file. This will be joined to every filename using the "/" separator.
     AWS_S3_KEY_PREFIX = ""
@@ -238,17 +236,3 @@ 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()}"
-)
-
-if DOCKERIZED:
-    CELERY_BROKER_URL = REDIS_URL
-    CELERY_RESULT_BACKEND = REDIS_URL
-else:
-    CELERY_RESULT_BACKEND = broker_url
-    CELERY_BROKER_URL = broker_url
-
-GITHUB_ACCESS_TOKEN = os.environ.get("GITHUB_ACCESS_TOKEN", False)

apiserver/plane/settings/redis.py

@@ -1,25 +1,23 @@
-import os
 import redis
 from django.conf import settings
 from urllib.parse import urlparse
 
-
 def redis_instance():
-    # 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)
+    # 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)
     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
+    # 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

apiserver/plane/settings/staging.py

@@ -1,7 +1,5 @@
 """Production settings and globals."""
 from urllib.parse import urlparse
-import ssl
-import certifi
 
 import dj_database_url
 from urllib.parse import urlparse
@@ -11,6 +9,7 @@ from sentry_sdk.integrations.django import DjangoIntegration
 from sentry_sdk.integrations.redis import RedisIntegration
 
 from .common import *  # noqa
+
 # Database
 DEBUG = True
 DATABASES = {
@@ -198,11 +197,3 @@ 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
-
-GITHUB_ACCESS_TOKEN = os.environ.get("GITHUB_ACCESS_TOKEN", False)

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_key, hostname):
+def jira_project_issue_summary(email, api_token, project_name, hostname):
     try:
         auth = HTTPBasicAuth(email, api_token)
         headers = {"Accept": "application/json"}
 
-        issue_url = f"https://{hostname}/rest/api/3/search?jql=project={project_key} AND issuetype=Story"
+        issue_url = f"https://{hostname}/rest/api/3/search?jql=project={project_name} 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_key} AND issuetype=Epic"
+        module_url = f"https://{hostname}/rest/api/3/search?jql=project={project_name} 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_key}"
+        status_url = f"https://{hostname}/rest/api/3/status/?jql=project={project_name}"
         status_response = requests.request(
             "GET", status_url, headers=headers, auth=auth
         ).json()
 
-        labels_url = f"https://{hostname}/rest/api/3/label/?jql=project={project_key}"
+        labels_url = f"https://{hostname}/rest/api/3/label/?jql=project={project_name}"
         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_key}"
+            f"https://{hostname}/rest/api/3/users/search?jql=project={project_name}"
         )
         users_response = requests.request(
             "GET", users_url, headers=headers, auth=auth

apiserver/plane/utils/integrations/github.py

@@ -5,7 +5,6 @@ from urllib.parse import urlparse, parse_qs
 from datetime import datetime, timedelta
 from cryptography.hazmat.primitives.serialization import load_pem_private_key
 from cryptography.hazmat.backends import default_backend
-from django.conf import settings
 
 
 def get_jwt_token():
@@ -129,24 +128,3 @@ def get_github_repo_details(access_tokens_url, owner, repo):
     ).json()
 
     return open_issues, total_labels, collaborators
-
-
-def get_release_notes():
-    token = settings.GITHUB_ACCESS_TOKEN
-
-    if token:
-        headers = {
-            "Authorization": "Bearer " + str(token),
-            "Accept": "application/vnd.github.v3+json",
-        }
-    else:
-        headers = {
-            "Accept": "application/vnd.github.v3+json",
-        }
-    url = "https://api.github.com/repos/makeplane/plane/releases?per_page=5&page=1"
-    response = requests.get(url, headers=headers)
-
-    if response.status_code != 200:
-        return {"error": "Unable to render information from Github Repository"}
-
-    return response.json()

apiserver/plane/utils/issue_search.py

@@ -1,23 +0,0 @@
-# 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
-celery==5.2.7
+slack-sdk==3.20.2

apiserver/runtime.txt

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

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/quick-start" target="_blank" style="color: #0092ff; text-decoration: underline;">Getting started with Plane</a></li>
+                                                                                    <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://plane.so/changelog" target="_blank" style="color: #0092ff; text-decoration: underline;">Plane Changelog</a></li>
                                                                                  </ul>
                                                                               </div>

app/Dockerfile.web

@@ -1,30 +0,0 @@
-FROM node:18-alpine AS builder
-RUN apk add --no-cache libc6-compat
-RUN apk update
-# Set working directory
-WORKDIR /app
-
-# Install dependencies
-RUN yarn install --frozen-lockfile
-COPY . .
-
-# build
-RUN yarn build
-
-FROM node:18-alpine AS runner
-WORKDIR /app
-
-# Don't run production as root
-RUN addgroup --system --gid 1001 plane
-RUN adduser --system --uid 1001 captain
-USER captain
-
-COPY --from=builder /app/next.config.js .
-COPY --from=builder /app/package.json .
-COPY --from=builder /app/node_modules ./node_modules
-COPY --from=builder /app/.next ./.next
-COPY --from=builder /app/public ./public
-
-ENV NEXT_TELEMETRY_DISABLED 1
-
-EXPOSE 3000

app/components/auth-screens/index.ts

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

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

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

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

@@ -1,68 +0,0 @@
-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(projectId.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>
-  );
-};

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

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

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

@@ -1,44 +0,0 @@
-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>
-  );
-};

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

@@ -1,45 +0,0 @@
-import React, { Dispatch, SetStateAction, useEffect, useState } from "react";
-
-// cmdk
-import { Command } from "cmdk";
-import { THEMES_OBJ } from "constants/themes";
-import { useTheme } from "next-themes";
-import { SettingIcon } from "components/icons";
-
-type Props = {
-  setIsPaletteOpen: Dispatch<SetStateAction<boolean>>;
-};
-
-export const ChangeInterfaceTheme: React.FC<Props> = ({ setIsPaletteOpen }) => {
-  const [mounted, setMounted] = useState(false);
-  const { setTheme } = useTheme();
-
-  // useEffect only runs on the client, so now we can safely show the UI
-  useEffect(() => {
-    setMounted(true);
-  }, []);
-
-  if (!mounted) {
-    return null;
-  }
-
-  return (
-    <>
-      {THEMES_OBJ.map((theme) => (
-        <Command.Item
-          key={theme.value}
-          onSelect={() => {
-            setTheme(theme.value);
-            setIsPaletteOpen(false);
-          }}
-          className="focus:outline-none"
-        >
-          <div className="flex items-center gap-2 text-brand-secondary">
-            <SettingIcon className="h-4 w-4 text-brand-secondary" />
-            {theme.label}
-          </div>
-        </Command.Item>
-      ))}
-    </>
-  );
-};

app/components/core/custom-theme-form.tsx

@@ -1,267 +0,0 @@
-import { useEffect, useState } from "react";
-
-// react-hook-form
-import { useForm } from "react-hook-form";
-// ui
-import { Input, PrimaryButton, SecondaryButton } from "components/ui";
-
-const defaultValues = {
-  palette: "",
-};
-
-export const ThemeForm: React.FC<any> = ({ handleFormSubmit, handleClose, status, data }) => {
-  const {
-    register,
-    formState: { errors, isSubmitting },
-    handleSubmit,
-    reset,
-  } = useForm<any>({
-    defaultValues,
-  });
-  const [darkPalette, setDarkPalette] = useState(false);
-
-  const handleUpdateTheme = async (formData: any) => {
-    await handleFormSubmit({ ...formData, darkPalette });
-
-    reset({
-      ...defaultValues,
-    });
-  };
-
-  useEffect(() => {
-    reset({
-      ...defaultValues,
-      ...data,
-    });
-  }, [data, reset]);
-
-  // --color-bg-base: 25, 27, 27;
-  //   --color-bg-surface-1: 31, 32, 35;
-  //   --color-bg-surface-2: 39, 42, 45;
-
-  //   --color-border: 46, 50, 52;
-  //   --color-bg-sidebar: 19, 20, 22;
-  //   --color-accent: 60, 133, 217;
-
-  //   --color-text-base: 255, 255, 255;
-  //   --color-text-secondary: 142, 148, 146;
-
-  return (
-    <form onSubmit={handleSubmit(handleUpdateTheme)}>
-      <div className="space-y-5">
-        <h3 className="text-lg font-medium leading-6 text-brand-base">Customize your theme</h3>
-        <div className="space-y-4">
-          <div className="mt-6 grid grid-cols-1 gap-x-6 gap-y-4 sm:grid-cols-6">
-            <div className="sm:col-span-2">
-              <Input
-                id="bgBase"
-                label="Background"
-                name="bgBase"
-                type="name"
-                placeholder="#FFFFFF"
-                autoComplete="off"
-                error={errors.bgBase}
-                register={register}
-                validations={{
-                  required: "Background color is required",
-                  pattern: {
-                    value: /^#(?:[0-9a-fA-F]{3}){1,2}$/g,
-                    message: "Background color should be hex format",
-                  },
-                }}
-              />
-            </div>
-            <div className="sm:col-span-2">
-              <Input
-                id="bgSurface1"
-                label="Background surface 1"
-                name="bgSurface1"
-                type="name"
-                placeholder="#FFFFFF"
-                autoComplete="off"
-                error={errors.bgSurface1}
-                register={register}
-                validations={{
-                  required: "Background surface 1 color is required",
-                  pattern: {
-                    value: /^#(?:[0-9a-fA-F]{3}){1,2}$/g,
-                    message: "Background surface 1 color should be hex format",
-                  },
-                }}
-              />
-            </div>
-            <div className="sm:col-span-2">
-              <Input
-                id="bgSurface2"
-                label="Background surface 2"
-                name="bgSurface1"
-                type="name"
-                placeholder="#FFFFFF"
-                autoComplete="off"
-                error={errors.bgSurface1}
-                register={register}
-                validations={{
-                  required: "Background surface 2 color is required",
-                  pattern: {
-                    value: /^#(?:[0-9a-fA-F]{3}){1,2}$/g,
-                    message: "Background surface 2 color should be hex format",
-                  },
-                }}
-              />
-            </div>
-
-            <div className="sm:col-span-2">
-              <Input
-                id="border"
-                label="Border"
-                name="border"
-                type="name"
-                placeholder="#FFFFFF"
-                autoComplete="off"
-                error={errors.border}
-                register={register}
-                validations={{
-                  required: "Border color is required",
-                  pattern: {
-                    value: /^#(?:[0-9a-fA-F]{3}){1,2}$/g,
-                    message: "Border color should be hex format",
-                  },
-                }}
-              />
-            </div>
-            <div className="sm:col-span-2">
-              <Input
-                id="sidebar"
-                label="Sidebar"
-                name="sidebar"
-                type="name"
-                placeholder="#FFFFFF"
-                autoComplete="off"
-                error={errors.sidebar}
-                register={register}
-                validations={{
-                  required: "Sidebar color is required",
-                  pattern: {
-                    value: /^#(?:[0-9a-fA-F]{3}){1,2}$/g,
-                    message: "Sidebar color should be hex format",
-                  },
-                }}
-              />
-            </div>
-            <div className="sm:col-span-2">
-              <Input
-                id="accent"
-                label="Accent"
-                name="accent"
-                type="name"
-                placeholder="#FFFFFF"
-                autoComplete="off"
-                error={errors.accent}
-                register={register}
-                validations={{
-                  required: "Accent color is required",
-                  pattern: {
-                    value: /^#(?:[0-9a-fA-F]{3}){1,2}$/g,
-                    message: "Accent color should be hex format",
-                  },
-                }}
-              />
-            </div>
-            <div className="sm:col-span-3">
-              <Input
-                id="textBase"
-                label="Text primary"
-                name="textBase"
-                type="name"
-                placeholder="#FFFFFF"
-                autoComplete="off"
-                error={errors.textBase}
-                register={register}
-                validations={{
-                  required: "Text primary color is required",
-                  pattern: {
-                    value: /^#(?:[0-9a-fA-F]{3}){1,2}$/g,
-                    message: "Text primary color should be hex format",
-                  },
-                }}
-              />
-            </div>
-            <div className="sm:col-span-3">
-              <Input
-                id="textSecondary"
-                label="Text secondary"
-                name="textSecondary"
-                type="name"
-                placeholder="#FFFFFF"
-                autoComplete="off"
-                error={errors.textSecondary}
-                register={register}
-                validations={{
-                  required: "Text secondary color is required",
-                  pattern: {
-                    value: /^#(?:[0-9a-fA-F]{3}){1,2}$/g,
-                    message: "Text secondary color should be hex format",
-                  },
-                }}
-              />
-            </div>
-          </div>
-
-          <div>
-            <Input
-              id="palette"
-              label="All colors"
-              name="palette"
-              type="name"
-              placeholder="Enter comma separated hex colors"
-              autoComplete="off"
-              error={errors.palette}
-              register={register}
-              validations={{
-                required: "Color values is required",
-                pattern: {
-                  value: /^(#(?:[0-9a-fA-F]{3}){1,2},){7}#(?:[0-9a-fA-F]{3}){1,2}$/g,
-                  message: "Color values should be hex format, separated by commas",
-                },
-              }}
-            />
-          </div>
-          <div
-            className="flex cursor-pointer items-center gap-1"
-            onClick={() => setDarkPalette((prevData) => !prevData)}
-          >
-            <span className="text-xs">Dark palette</span>
-            <button
-              type="button"
-              className={`pointer-events-none relative inline-flex h-4 w-7 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent ${
-                darkPalette ? "bg-brand-accent" : "bg-gray-300"
-              } transition-colors duration-300 ease-in-out focus:outline-none`}
-              role="switch"
-              aria-checked="false"
-            >
-              <span className="sr-only">Dark palette</span>
-              <span
-                aria-hidden="true"
-                className={`pointer-events-none inline-block h-3 w-3 ${
-                  darkPalette ? "translate-x-3" : "translate-x-0"
-                } transform rounded-full bg-brand-surface-2 shadow ring-0 transition duration-300 ease-in-out`}
-              />
-            </button>
-          </div>
-        </div>
-      </div>
-      <div className="mt-5 flex justify-end gap-2">
-        <SecondaryButton onClick={handleClose}>Cancel</SecondaryButton>
-        <PrimaryButton type="submit" loading={isSubmitting}>
-          {status
-            ? isSubmitting
-              ? "Updating Theme..."
-              : "Update Theme"
-            : isSubmitting
-            ? "Creating Theme..."
-            : "Set Theme"}
-        </PrimaryButton>
-      </div>
-    </form>
-  );
-};

app/components/core/custom-theme-modal.tsx

@@ -1,65 +0,0 @@
-import React from "react";
-
-// headless ui
-import { Dialog, Transition } from "@headlessui/react";
-// components
-import { ThemeForm } from "./custom-theme-form";
-// helpers
-import { applyTheme } from "helpers/theme.helper";
-// fetch-keys
-
-type Props = {
-  isOpen: boolean;
-  handleClose: () => void;
-};
-
-export const CustomThemeModal: React.FC<Props> = ({ isOpen, handleClose }) => {
-  const onClose = () => {
-    handleClose();
-  };
-
-  const handleFormSubmit = async (formData: any) => {
-    applyTheme(formData.palette, formData.darkPalette);
-    onClose();
-  };
-
-  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-[#131313] bg-opacity-50 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-brand-surface-1 px-5 py-8 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
-                <ThemeForm
-                  handleClose={handleClose}
-                  handleFormSubmit={handleFormSubmit}
-                  status={false}
-                />
-              </Dialog.Panel>
-            </Transition.Child>
-          </div>
-        </div>
-      </Dialog>
-    </Transition.Root>
-  );
-};

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

@@ -1,282 +0,0 @@
-import React from "react";
-
-import { useRouter } from "next/router";
-
-// hooks
-import useIssuesProperties from "hooks/use-issue-properties";
-import useIssuesView from "hooks/use-issues-view";
-// headless ui
-import { Popover, Transition } from "@headlessui/react";
-// components
-import { SelectFilters } from "components/views";
-// ui
-import { CustomMenu } from "components/ui";
-// icons
-import {
-  ChevronDownIcon,
-  ListBulletIcon,
-  Squares2X2Icon,
-  CalendarDaysIcon,
-} from "@heroicons/react/24/outline";
-// helpers
-import { replaceUnderscoreIfSnakeCase } from "helpers/string.helper";
-// types
-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();
-  const { workspaceSlug, projectId, viewId } = router.query;
-
-  const {
-    issueView,
-    setIssueView,
-    groupByProperty,
-    setGroupByProperty,
-    orderBy,
-    setOrderBy,
-    showEmptyGroups,
-    setShowEmptyGroups,
-    filters,
-    setFilters,
-    resetFilterToDefault,
-    setNewFilterDefaultView,
-  } = useIssuesView();
-
-  const [properties, setProperties] = useIssuesProperties(
-    workspaceSlug as string,
-    projectId as string
-  );
-
-  const { isEstimateActive } = useEstimateOption();
-
-  return (
-    <div className="flex items-center gap-2">
-      <div className="flex items-center gap-x-1">
-        <button
-          type="button"
-          className={`grid h-7 w-7 place-items-center rounded p-1 outline-none duration-300 hover:bg-brand-surface-2 ${
-            issueView === "list" ? "bg-brand-surface-2" : ""
-          }`}
-          onClick={() => setIssueView("list")}
-        >
-          <ListBulletIcon className="h-4 w-4 text-brand-secondary" />
-        </button>
-        <button
-          type="button"
-          className={`grid h-7 w-7 place-items-center rounded p-1 outline-none duration-300 hover:bg-brand-surface-2 ${
-            issueView === "kanban" ? "bg-brand-surface-2" : ""
-          }`}
-          onClick={() => setIssueView("kanban")}
-        >
-          <Squares2X2Icon className="h-4 w-4 text-brand-secondary" />
-        </button>
-        <button
-          type="button"
-          className={`grid h-7 w-7 place-items-center rounded p-1 outline-none duration-300 hover:bg-brand-surface-2 ${
-            issueView === "calendar" ? "bg-brand-surface-2" : ""
-          }`}
-          onClick={() => setIssueView("calendar")}
-        >
-          <CalendarDaysIcon className="h-4 w-4 text-brand-secondary" />
-        </button>
-      </div>
-      <SelectFilters
-        filters={filters}
-        onSelect={(option) => {
-          const key = option.key as keyof typeof filters;
-
-          const valueExists = filters[key]?.includes(option.value);
-
-          if (valueExists) {
-            setFilters(
-              {
-                ...(filters ?? {}),
-                [option.key]: ((filters[key] ?? []) as any[])?.filter(
-                  (val) => val !== option.value
-                ),
-              },
-              !Boolean(viewId)
-            );
-          } else {
-            setFilters(
-              {
-                ...(filters ?? {}),
-                [option.key]: [...((filters[key] ?? []) as any[]), option.value],
-              },
-              !Boolean(viewId)
-            );
-          }
-        }}
-        direction="left"
-        height="rg"
-      />
-      <Popover className="relative">
-        {({ open }) => (
-          <>
-            <Popover.Button
-              className={`group flex items-center gap-2 rounded-md border border-brand-base bg-transparent px-3 py-1.5 text-xs hover:bg-brand-surface-1 hover:text-brand-base focus:outline-none ${
-                open ? "bg-brand-surface-1 text-brand-base" : "text-brand-secondary"
-              }`}
-            >
-              View
-              <ChevronDownIcon className="h-3 w-3" aria-hidden="true" />
-            </Popover.Button>
-
-            <Transition
-              as={React.Fragment}
-              enter="transition ease-out duration-200"
-              enterFrom="opacity-0 translate-y-1"
-              enterTo="opacity-100 translate-y-0"
-              leave="transition ease-in duration-150"
-              leaveFrom="opacity-100 translate-y-0"
-              leaveTo="opacity-0 translate-y-1"
-            >
-              <Popover.Panel className="absolute right-0 z-20 mt-1 w-screen max-w-xs transform overflow-hidden rounded-lg border border-brand-base bg-brand-surface-1 p-3 shadow-lg">
-                <div className="relative divide-y-2 divide-brand-base">
-                  <div className="space-y-4 pb-3 text-xs">
-                    {issueView !== "calendar" && (
-                      <>
-                        <div className="flex items-center justify-between">
-                          <h4 className="text-brand-secondary">Group by</h4>
-                          <CustomMenu
-                            label={
-                              GROUP_BY_OPTIONS.find((option) => option.key === groupByProperty)
-                                ?.name ?? "Select"
-                            }
-                            width="lg"
-                          >
-                            {GROUP_BY_OPTIONS.map((option) =>
-                              issueView === "kanban" && option.key === null ? null : (
-                                <CustomMenu.MenuItem
-                                  key={option.key}
-                                  onClick={() => setGroupByProperty(option.key)}
-                                >
-                                  {option.name}
-                                </CustomMenu.MenuItem>
-                              )
-                            )}
-                          </CustomMenu>
-                        </div>
-                        <div className="flex items-center justify-between">
-                          <h4 className="text-brand-secondary">Order by</h4>
-                          <CustomMenu
-                            label={
-                              ORDER_BY_OPTIONS.find((option) => option.key === orderBy)?.name ??
-                              "Select"
-                            }
-                            width="lg"
-                          >
-                            {ORDER_BY_OPTIONS.map((option) =>
-                              groupByProperty === "priority" && option.key === "priority" ? null : (
-                                <CustomMenu.MenuItem
-                                  key={option.key}
-                                  onClick={() => {
-                                    setOrderBy(option.key);
-                                  }}
-                                >
-                                  {option.name}
-                                </CustomMenu.MenuItem>
-                              )
-                            )}
-                          </CustomMenu>
-                        </div>
-                      </>
-                    )}
-                    <div className="flex items-center justify-between">
-                      <h4 className="text-brand-secondary">Issue type</h4>
-                      <CustomMenu
-                        label={
-                          FILTER_ISSUE_OPTIONS.find((option) => option.key === filters.type)
-                            ?.name ?? "Select"
-                        }
-                        width="lg"
-                      >
-                        {FILTER_ISSUE_OPTIONS.map((option) => (
-                          <CustomMenu.MenuItem
-                            key={option.key}
-                            onClick={() =>
-                              setFilters({
-                                type: option.key,
-                              })
-                            }
-                          >
-                            {option.name}
-                          </CustomMenu.MenuItem>
-                        ))}
-                      </CustomMenu>
-                    </div>
-
-                    {issueView !== "calendar" && (
-                      <>
-                        <div className="flex items-center justify-between">
-                          <h4 className="text-brand-secondary">Show empty states</h4>
-                          <button
-                            type="button"
-                            className={`relative inline-flex h-3.5 w-6 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none ${
-                              showEmptyGroups ? "bg-green-500" : "bg-brand-surface-2"
-                            }`}
-                            role="switch"
-                            aria-checked={showEmptyGroups}
-                            onClick={() => setShowEmptyGroups(!showEmptyGroups)}
-                          >
-                            <span className="sr-only">Show empty groups</span>
-                            <span
-                              aria-hidden="true"
-                              className={`inline-block h-2.5 w-2.5 transform rounded-full bg-brand-surface-2 shadow ring-0 transition duration-200 ease-in-out ${
-                                showEmptyGroups ? "translate-x-2.5" : "translate-x-0"
-                              }`}
-                            />
-                          </button>
-                        </div>
-                        <div className="relative flex justify-end gap-x-3">
-                          <button type="button" onClick={() => resetFilterToDefault()}>
-                            Reset to default
-                          </button>
-                          <button
-                            type="button"
-                            className="font-medium text-brand-accent"
-                            onClick={() => setNewFilterDefaultView()}
-                          >
-                            Set as default
-                          </button>
-                        </div>
-                      </>
-                    )}
-                  </div>
-                  {issueView !== "calendar" && (
-                    <div className="space-y-2 py-3">
-                      <h4 className="text-sm text-brand-secondary">Display Properties</h4>
-                      <div className="flex flex-wrap items-center gap-2">
-                        {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-brand-accent bg-brand-accent text-brand-base"
-                                  : "border-brand-base"
-                              }`}
-                              onClick={() => setProperties(key as keyof Properties)}
-                            >
-                              {key === "key" ? "ID" : replaceUnderscoreIfSnakeCase(key)}
-                            </button>
-                          );
-                        })}
-                      </div>
-                    </div>
-                  )}
-                </div>
-              </Popover.Panel>
-            </Transition>
-          </>
-        )}
-      </Popover>
-    </div>
-  );
-};

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

@@ -1,365 +0,0 @@
-import React, { useCallback, useState } from "react";
-
-import Link from "next/link";
-import { useRouter } from "next/router";
-
-import { mutate } from "swr";
-
-// services
-import issuesService from "services/issues.service";
-// hooks
-import useToast from "hooks/use-toast";
-// components
-import {
-  ViewAssigneeSelect,
-  ViewDueDateSelect,
-  ViewEstimateSelect,
-  ViewPrioritySelect,
-  ViewStateSelect,
-} from "components/issues/view-select";
-// hooks
-import useIssueView from "hooks/use-issues-view";
-// ui
-import { Tooltip, CustomMenu, ContextMenu } from "components/ui";
-// icons
-import {
-  ClipboardDocumentCheckIcon,
-  LinkIcon,
-  PencilIcon,
-  TrashIcon,
-  XMarkIcon,
-  ArrowTopRightOnSquareIcon,
-  PaperClipIcon,
-} from "@heroicons/react/24/outline";
-// helpers
-import { copyTextToClipboard, truncateText } from "helpers/string.helper";
-import { handleIssuesMutation } from "constants/issue";
-// types
-import { IIssue, Properties, UserAuth } from "types";
-// fetch-keys
-import {
-  CYCLE_DETAILS,
-  CYCLE_ISSUES_WITH_PARAMS,
-  MODULE_DETAILS,
-  MODULE_ISSUES_WITH_PARAMS,
-  PROJECT_ISSUES_LIST_WITH_PARAMS,
-} from "constants/fetch-keys";
-
-type Props = {
-  type?: string;
-  issue: IIssue;
-  properties: Properties;
-  groupTitle?: string;
-  editIssue: () => void;
-  index: number;
-  makeIssueCopy: () => void;
-  removeIssue?: (() => void) | null;
-  handleDeleteIssue: (issue: IIssue) => void;
-  isCompleted?: boolean;
-  userAuth: UserAuth;
-};
-
-export const SingleListIssue: React.FC<Props> = ({
-  type,
-  issue,
-  properties,
-  editIssue,
-  index,
-  makeIssueCopy,
-  removeIssue,
-  groupTitle,
-  handleDeleteIssue,
-  isCompleted = false,
-  userAuth,
-}) => {
-  // context menu
-  const [contextMenu, setContextMenu] = useState(false);
-  const [contextMenuPosition, setContextMenuPosition] = useState({ x: 0, y: 0 });
-
-  const router = useRouter();
-  const { workspaceSlug, projectId, cycleId, moduleId } = router.query;
-
-  const { setToastAlert } = useToast();
-
-  const { groupByProperty: selectedGroup, orderBy, params } = useIssueView();
-
-  const partialUpdateIssue = useCallback(
-    (formData: Partial<IIssue>) => {
-      if (!workspaceSlug || !projectId) return;
-
-      if (cycleId)
-        mutate<
-          | {
-              [key: string]: IIssue[];
-            }
-          | IIssue[]
-        >(
-          CYCLE_ISSUES_WITH_PARAMS(cycleId as string, params),
-          (prevData) =>
-            handleIssuesMutation(
-              formData,
-              groupTitle ?? "",
-              selectedGroup,
-              index,
-              orderBy,
-              prevData
-            ),
-          false
-        );
-
-      if (moduleId)
-        mutate<
-          | {
-              [key: string]: IIssue[];
-            }
-          | IIssue[]
-        >(
-          MODULE_ISSUES_WITH_PARAMS(moduleId as string, params),
-          (prevData) =>
-            handleIssuesMutation(
-              formData,
-              groupTitle ?? "",
-              selectedGroup,
-              index,
-              orderBy,
-              prevData
-            ),
-          false
-        );
-
-      mutate<
-        | {
-            [key: string]: IIssue[];
-          }
-        | IIssue[]
-      >(
-        PROJECT_ISSUES_LIST_WITH_PARAMS(projectId as string, params),
-        (prevData) =>
-          handleIssuesMutation(formData, groupTitle ?? "", selectedGroup, index, orderBy, prevData),
-        false
-      );
-
-      issuesService
-        .patchIssue(workspaceSlug as string, projectId as string, issue.id, formData)
-        .then(() => {
-          if (cycleId) {
-            mutate(CYCLE_ISSUES_WITH_PARAMS(cycleId as string, params));
-            mutate(CYCLE_DETAILS(cycleId as string));
-          } else if (moduleId) {
-            mutate(MODULE_ISSUES_WITH_PARAMS(moduleId as string, params));
-            mutate(MODULE_DETAILS(moduleId as string));
-          } else mutate(PROJECT_ISSUES_LIST_WITH_PARAMS(projectId as string, params));
-        });
-    },
-    [
-      workspaceSlug,
-      projectId,
-      cycleId,
-      moduleId,
-      issue,
-      groupTitle,
-      index,
-      selectedGroup,
-      orderBy,
-      params,
-    ]
-  );
-
-  const handleCopyText = () => {
-    const originURL =
-      typeof window !== "undefined" && window.location.origin ? window.location.origin : "";
-    copyTextToClipboard(
-      `${originURL}/${workspaceSlug}/projects/${projectId}/issues/${issue.id}`
-    ).then(() => {
-      setToastAlert({
-        type: "success",
-        title: "Link Copied!",
-        message: "Issue link copied to clipboard.",
-      });
-    });
-  };
-
-  const isNotAllowed = userAuth.isGuest || userAuth.isViewer || isCompleted;
-
-  return (
-    <>
-      <ContextMenu
-        position={contextMenuPosition}
-        title="Quick actions"
-        isOpen={contextMenu}
-        setIsOpen={setContextMenu}
-      >
-        {!isNotAllowed && (
-          <>
-            <ContextMenu.Item Icon={PencilIcon} onClick={editIssue}>
-              Edit issue
-            </ContextMenu.Item>
-            <ContextMenu.Item Icon={ClipboardDocumentCheckIcon} onClick={makeIssueCopy}>
-              Make a copy...
-            </ContextMenu.Item>
-            <ContextMenu.Item Icon={TrashIcon} onClick={() => handleDeleteIssue(issue)}>
-              Delete issue
-            </ContextMenu.Item>
-          </>
-        )}
-        <ContextMenu.Item Icon={LinkIcon} onClick={handleCopyText}>
-          Copy issue link
-        </ContextMenu.Item>
-        <a
-          href={`/${workspaceSlug}/projects/${projectId}/issues/${issue.id}`}
-          target="_blank"
-          rel="noreferrer noopener"
-        >
-          <ContextMenu.Item Icon={ArrowTopRightOnSquareIcon}>
-            Open issue in new tab
-          </ContextMenu.Item>
-        </a>
-      </ContextMenu>
-      <div
-        className="flex items-center justify-between gap-2 border-b border-brand-base bg-brand-base px-4 py-2.5 last:border-b-0"
-        onContextMenu={(e) => {
-          e.preventDefault();
-          setContextMenu(true);
-          setContextMenuPosition({ x: e.pageX, y: e.pageY });
-        }}
-      >
-        <Link href={`/${workspaceSlug}/projects/${issue?.project_detail?.id}/issues/${issue.id}`}>
-          <a className="group relative flex items-center gap-2">
-            {properties.key && (
-              <Tooltip
-                tooltipHeading="Issue ID"
-                tooltipContent={`${issue.project_detail?.identifier}-${issue.sequence_id}`}
-              >
-                <span className="flex-shrink-0 text-xs text-brand-secondary">
-                  {issue.project_detail?.identifier}-{issue.sequence_id}
-                </span>
-              </Tooltip>
-            )}
-            <Tooltip position="top-left" tooltipHeading="Title" tooltipContent={issue.name}>
-              <span className="text-[0.825rem] text-brand-base">
-                {truncateText(issue.name, 50)}
-              </span>
-            </Tooltip>
-          </a>
-        </Link>
-
-        <div className="flex flex-wrap items-center gap-2 text-xs">
-          {properties.priority && (
-            <ViewPrioritySelect
-              issue={issue}
-              partialUpdateIssue={partialUpdateIssue}
-              position="right"
-              isNotAllowed={isNotAllowed}
-            />
-          )}
-          {properties.state && (
-            <ViewStateSelect
-              issue={issue}
-              partialUpdateIssue={partialUpdateIssue}
-              position="right"
-              isNotAllowed={isNotAllowed}
-            />
-          )}
-          {properties.due_date && (
-            <ViewDueDateSelect
-              issue={issue}
-              partialUpdateIssue={partialUpdateIssue}
-              isNotAllowed={isNotAllowed}
-            />
-          )}
-          {properties.sub_issue_count && (
-            <div className="flex items-center gap-1 rounded-md border border-brand-base px-3 py-1 text-xs text-brand-secondary shadow-sm">
-              {issue.sub_issues_count} {issue.sub_issues_count === 1 ? "sub-issue" : "sub-issues"}
-            </div>
-          )}
-          {properties.labels && issue.label_details.length > 0 ? (
-            <div className="flex flex-wrap gap-1">
-              {issue.label_details.map((label) => (
-                <span
-                  key={label.id}
-                  className="group flex items-center gap-1 rounded-2xl border border-brand-base px-2 py-0.5 text-xs text-brand-secondary"
-                >
-                  <span
-                    className="h-1.5 w-1.5  rounded-full"
-                    style={{
-                      backgroundColor: label?.color && label.color !== "" ? label.color : "#000",
-                    }}
-                  />
-                  {label.name}
-                </span>
-              ))}
-            </div>
-          ) : (
-            ""
-          )}
-          {properties.assignee && (
-            <ViewAssigneeSelect
-              issue={issue}
-              partialUpdateIssue={partialUpdateIssue}
-              position="right"
-              isNotAllowed={isNotAllowed}
-            />
-          )}
-          {properties.estimate && (
-            <ViewEstimateSelect
-              issue={issue}
-              partialUpdateIssue={partialUpdateIssue}
-              position="right"
-              isNotAllowed={isNotAllowed}
-            />
-          )}
-          {properties.link && (
-            <div className="flex cursor-default items-center rounded-md border border-brand-base px-2.5 py-1 text-xs shadow-sm">
-              <Tooltip tooltipHeading="Links" 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 cursor-default items-center rounded-md border border-brand-base px-2.5 py-1 text-xs shadow-sm">
-              <Tooltip tooltipHeading="Attachments" tooltipContent={`${issue.attachment_count}`}>
-                <div className="flex items-center gap-1 text-gray-500">
-                  <PaperClipIcon className="h-3.5 w-3.5 -rotate-45 text-gray-500" />
-                  {issue.attachment_count}
-                </div>
-              </Tooltip>
-            </div>
-          )}
-          {type && !isNotAllowed && (
-            <CustomMenu width="auto" ellipsis>
-              <CustomMenu.MenuItem onClick={editIssue}>
-                <div className="flex items-center justify-start gap-2">
-                  <PencilIcon className="h-4 w-4" />
-                  <span>Edit issue</span>
-                </div>
-              </CustomMenu.MenuItem>
-              {type !== "issue" && removeIssue && (
-                <CustomMenu.MenuItem onClick={removeIssue}>
-                  <div className="flex items-center justify-start gap-2">
-                    <XMarkIcon className="h-4 w-4" />
-                    <span>Remove from {type}</span>
-                  </div>
-                </CustomMenu.MenuItem>
-              )}
-              <CustomMenu.MenuItem onClick={() => handleDeleteIssue(issue)}>
-                <div className="flex items-center justify-start gap-2">
-                  <TrashIcon className="h-4 w-4" />
-                  <span>Delete issue</span>
-                </div>
-              </CustomMenu.MenuItem>
-              <CustomMenu.MenuItem onClick={handleCopyText}>
-                <div className="flex items-center justify-start gap-2">
-                  <LinkIcon className="h-4 w-4" />
-                  <span>Copy issue link</span>
-                </div>
-              </CustomMenu.MenuItem>
-            </CustomMenu>
-          )}
-        </div>
-      </div>
-    </>
-  );
-};

app/components/core/theme-switch.tsx

@@ -1,60 +0,0 @@
-import { useState, useEffect, ChangeEvent } from "react";
-import { useTheme } from "next-themes";
-import { THEMES_OBJ } from "constants/themes";
-import { CustomSelect } from "components/ui";
-import { CustomThemeModal } from "./custom-theme-modal";
-
-export const ThemeSwitch = () => {
-  const [mounted, setMounted] = useState(false);
-  const [customThemeModal, setCustomThemeModal] = useState(false);
-  const { theme, setTheme } = useTheme();
-
-  // useEffect only runs on the client, so now we can safely show the UI
-  useEffect(() => {
-    setMounted(true);
-  }, []);
-
-  if (!mounted) {
-    return null;
-  }
-
-  return (
-    <>
-      <CustomSelect
-        value={theme}
-        label={theme ? THEMES_OBJ.find((t) => t.value === theme)?.label : "Select your theme"}
-        onChange={({ value, type }: { value: string; type: string }) => {
-          if (value === "custom") {
-            if (!customThemeModal) setCustomThemeModal(true);
-          } else {
-            const cssVars = [
-              "--color-bg-base",
-              "--color-bg-surface-1",
-              "--color-bg-surface-2",
-
-              "--color-border",
-              "--color-bg-sidebar",
-              "--color-accent",
-
-              "--color-text-base",
-              "--color-text-secondary",
-            ];
-            cssVars.forEach((cssVar) => document.documentElement.style.removeProperty(cssVar));
-          }
-          document.documentElement.style.setProperty("color-scheme", type);
-          setTheme(value);
-        }}
-        input
-        width="w-full"
-        position="right"
-      >
-        {THEMES_OBJ.map(({ value, label, type }) => (
-          <CustomSelect.Option key={value} value={{ value, type }}>
-            {label}
-          </CustomSelect.Option>
-        ))}
-      </CustomSelect>
-      {/* <CustomThemeModal isOpen={customThemeModal} handleClose={() => setCustomThemeModal(false)} /> */}
-    </>
-  );
-};

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

@@ -1,407 +0,0 @@
-import React, { useEffect } from "react";
-
-import { useRouter } from "next/router";
-
-import { mutate } from "swr";
-
-// react-hook-form
-import { useForm } from "react-hook-form";
-// headless ui
-import { Dialog, Transition } from "@headlessui/react";
-// services
-import estimatesService from "services/estimates.service";
-// hooks
-import useToast from "hooks/use-toast";
-// ui
-import { Input, PrimaryButton, SecondaryButton, TextArea } from "components/ui";
-// helpers
-import { checkDuplicates } from "helpers/array.helper";
-// types
-import { IEstimate, IEstimateFormData } from "types";
-// fetch-keys
-import { ESTIMATES_LIST, ESTIMATE_DETAILS } from "constants/fetch-keys";
-
-type Props = {
-  isOpen: boolean;
-  handleClose: () => void;
-  data?: IEstimate;
-};
-
-type FormValues = {
-  name: string;
-  description: string;
-  value1: string;
-  value2: string;
-  value3: string;
-  value4: string;
-  value5: string;
-  value6: string;
-};
-
-const defaultValues: Partial<FormValues> = {
-  name: "",
-  description: "",
-  value1: "",
-  value2: "",
-  value3: "",
-  value4: "",
-  value5: "",
-  value6: "",
-};
-
-export const CreateUpdateEstimateModal: React.FC<Props> = ({ handleClose, data, isOpen }) => {
-  const {
-    register,
-    formState: { isSubmitting },
-    handleSubmit,
-    reset,
-  } = useForm<FormValues>({
-    defaultValues,
-  });
-
-  const onClose = () => {
-    handleClose();
-    reset();
-  };
-
-  const router = useRouter();
-  const { workspaceSlug, projectId } = router.query;
-
-  const { setToastAlert } = useToast();
-
-  const createEstimate = async (payload: IEstimateFormData) => {
-    if (!workspaceSlug || !projectId) return;
-
-    await estimatesService
-      .createEstimate(workspaceSlug as string, projectId as string, payload)
-      .then(() => {
-        mutate(ESTIMATES_LIST(projectId as string));
-        onClose();
-      })
-      .catch((err) => {
-        if (err.status === 400)
-          setToastAlert({
-            type: "error",
-            title: "Error!",
-            message: "Estimate with that name already exists. Please try again with another name.",
-          });
-        else
-          setToastAlert({
-            type: "error",
-            title: "Error!",
-            message: "Estimate could not be created. Please try again.",
-          });
-      });
-  };
-
-  const updateEstimate = async (payload: IEstimateFormData) => {
-    if (!workspaceSlug || !projectId || !data) return;
-
-    mutate<IEstimate[]>(
-      ESTIMATES_LIST(projectId.toString()),
-      (prevData) =>
-        prevData?.map((p) => {
-          if (p.id === data.id)
-            return {
-              ...p,
-              name: payload.estimate.name,
-              description: payload.estimate.description,
-              points: p.points.map((point, index) => ({
-                ...point,
-                value: payload.estimate_points[index].value,
-              })),
-            };
-
-          return p;
-        }),
-      false
-    );
-
-    await estimatesService
-      .patchEstimate(workspaceSlug as string, projectId as string, data?.id as string, payload)
-      .then(() => {
-        mutate(ESTIMATES_LIST(projectId.toString()));
-        mutate(ESTIMATE_DETAILS(data.id));
-        handleClose();
-      })
-      .catch(() => {
-        setToastAlert({
-          type: "error",
-          title: "Error!",
-          message: "Estimate could not be updated. Please try again.",
-        });
-      });
-
-    onClose();
-  };
-
-  const onSubmit = async (formData: FormValues) => {
-    if (!formData.name || formData.name === "") {
-      setToastAlert({
-        type: "error",
-        title: "Error!",
-        message: "Estimate title cannot be empty.",
-      });
-      return;
-    }
-
-    if (
-      formData.value1 === "" ||
-      formData.value2 === "" ||
-      formData.value3 === "" ||
-      formData.value4 === "" ||
-      formData.value5 === "" ||
-      formData.value6 === ""
-    ) {
-      setToastAlert({
-        type: "error",
-        title: "Error!",
-        message: "Estimate point cannot be empty.",
-      });
-      return;
-    }
-
-    if (
-      checkDuplicates([
-        formData.value1,
-        formData.value2,
-        formData.value3,
-        formData.value4,
-        formData.value5,
-        formData.value6,
-      ])
-    ) {
-      setToastAlert({
-        type: "error",
-        title: "Error!",
-        message: "Estimate points cannot have duplicate values.",
-      });
-      return;
-    }
-
-    const payload: IEstimateFormData = {
-      estimate: {
-        name: formData.name,
-        description: formData.description,
-      },
-      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,
-        },
-      ],
-    };
-
-    if (data) await updateEstimate(payload);
-    else await createEstimate(payload);
-  };
-
-  useEffect(() => {
-    if (data)
-      reset({
-        ...defaultValues,
-        ...data,
-        value1: data.points[0]?.value,
-        value2: data.points[1]?.value,
-        value3: data.points[2]?.value,
-        value4: data.points[3]?.value,
-        value5: data.points[4]?.value,
-        value6: data.points[5]?.value,
-      });
-    else reset({ ...defaultValues });
-  }, [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-brand-base 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="text-lg font-medium leading-6">
-                        {data ? "Update" : "Create"} Estimate
-                      </div>
-                      <div>
-                        <Input
-                          id="name"
-                          name="name"
-                          type="name"
-                          placeholder="Title"
-                          autoComplete="off"
-                          className="resize-none text-xl"
-                          register={register}
-                        />
-                      </div>
-                      <div>
-                        <TextArea
-                          id="description"
-                          name="description"
-                          placeholder="Description"
-                          className="h-32 resize-none text-sm"
-                          register={register}
-                        />
-                      </div>
-                      <div className="grid grid-cols-3 gap-3">
-                        <div className="flex items-center">
-                          <span className="flex h-full items-center rounded-lg bg-brand-surface-2">
-                            <span className="rounded-lg px-2 text-sm text-brand-secondary">1</span>
-                            <span className="rounded-r-lg bg-brand-base">
-                              <Input
-                                id="name"
-                                name="value1"
-                                type="name"
-                                className="rounded-l-none"
-                                placeholder="Point 1"
-                                autoComplete="off"
-                                register={register}
-                              />
-                            </span>
-                          </span>
-                        </div>
-                        <div className="flex items-center">
-                          <span className="flex h-full items-center rounded-lg bg-brand-surface-2">
-                            <span className="rounded-lg px-2 text-sm text-brand-secondary">2</span>
-                            <span className="rounded-r-lg bg-brand-base">
-                              <Input
-                                id="name"
-                                name="value2"
-                                type="name"
-                                className="rounded-l-none"
-                                placeholder="Point 2"
-                                autoComplete="off"
-                                register={register}
-                              />
-                            </span>
-                          </span>
-                        </div>
-                        <div className="flex items-center">
-                          <span className="flex h-full items-center rounded-lg bg-brand-surface-2">
-                            <span className="rounded-lg px-2 text-sm text-brand-secondary">3</span>
-                            <span className="rounded-r-lg bg-brand-base">
-                              <Input
-                                id="name"
-                                name="value3"
-                                type="name"
-                                className="rounded-l-none"
-                                placeholder="Point 3"
-                                autoComplete="off"
-                                register={register}
-                              />
-                            </span>
-                          </span>
-                        </div>
-                        <div className="flex items-center">
-                          <span className="flex h-full items-center rounded-lg bg-brand-surface-2">
-                            <span className="rounded-lg px-2 text-sm text-brand-secondary">4</span>
-                            <span className="rounded-r-lg bg-brand-base">
-                              <Input
-                                id="name"
-                                name="value4"
-                                type="name"
-                                className="rounded-l-none"
-                                placeholder="Point 4"
-                                autoComplete="off"
-                                register={register}
-                              />
-                            </span>
-                          </span>
-                        </div>
-                        <div className="flex items-center">
-                          <span className="flex h-full items-center rounded-lg bg-brand-surface-2">
-                            <span className="rounded-lg px-2 text-sm text-brand-secondary">5</span>
-                            <span className="rounded-r-lg bg-brand-base">
-                              <Input
-                                id="name"
-                                name="value5"
-                                type="name"
-                                className="rounded-l-none"
-                                placeholder="Point 5"
-                                autoComplete="off"
-                                register={register}
-                              />
-                            </span>
-                          </span>
-                        </div>
-                        <div className="flex items-center">
-                          <span className="flex h-full items-center rounded-lg bg-brand-surface-2">
-                            <span className="rounded-lg px-2 text-sm text-brand-secondary">6</span>
-                            <span className="rounded-r-lg bg-brand-base">
-                              <Input
-                                id="name"
-                                name="value6"
-                                type="name"
-                                className="rounded-l-none"
-                                placeholder="Point 6"
-                                autoComplete="off"
-                                register={register}
-                              />
-                            </span>
-                          </span>
-                        </div>
-                      </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>
-    </>
-  );
-};

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

@@ -1,104 +0,0 @@
-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>
-  );
-};

app/components/estimates/index.tsx

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

app/components/estimates/single-estimate.tsx

@@ -1,145 +0,0 @@
-import React, { useState } from "react";
-
-import { useRouter } from "next/router";
-
-// services
-import projectService from "services/project.service";
-// hooks
-import useToast from "hooks/use-toast";
-import useProjectDetails from "hooks/use-project-details";
-// components
-import { DeleteEstimateModal } from "components/estimates";
-// ui
-import { CustomMenu, SecondaryButton } from "components/ui";
-//icons
-import { PencilIcon, TrashIcon } from "@heroicons/react/24/outline";
-// helpers
-import { orderArrayBy } from "helpers/array.helper";
-// types
-import { IEstimate } from "types";
-
-type Props = {
-  estimate: IEstimate;
-  editEstimate: (estimate: IEstimate) => void;
-  handleEstimateDelete: (estimateId: string) => void;
-};
-
-export const SingleEstimate: React.FC<Props> = ({
-  estimate,
-  editEstimate,
-  handleEstimateDelete,
-}) => {
-  const [isDeleteEstimateModalOpen, setIsDeleteEstimateModalOpen] = useState(false);
-
-  const router = useRouter();
-  const { workspaceSlug, projectId } = router.query;
-
-  const { setToastAlert } = useToast();
-
-  const { projectDetails, mutateProjectDetails } = useProjectDetails();
-
-  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 (
-    <>
-      <div className="gap-2 py-3">
-        <div className="flex items-center justify-between">
-          <div>
-            <h6 className="flex w-[40vw] items-center gap-2 truncate text-sm font-medium">
-              {estimate.name}
-              {projectDetails?.estimate && projectDetails?.estimate === estimate.id && (
-                <span className="rounded bg-green-500/20 px-2 py-0.5 text-xs capitalize text-green-500">
-                  In use
-                </span>
-              )}
-            </h6>
-            <p className="font-sm w-[40vw] truncate text-[14px] font-normal text-brand-secondary">
-              {estimate.description}
-            </p>
-          </div>
-          <div className="flex items-center gap-2">
-            {projectDetails?.estimate !== estimate.id && estimate.points.length > 0 && (
-              <SecondaryButton onClick={handleUseEstimate} className="py-1">
-                Use
-              </SecondaryButton>
-            )}
-            <CustomMenu ellipsis>
-              <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>
-        </div>
-        {estimate.points.length > 0 ? (
-          <div className="flex text-xs text-brand-secondary">
-            Estimate points (
-            <span className="flex gap-1">
-              {orderArrayBy(estimate.points, "key").map((point, index) => (
-                <h6 key={point.id} className="text-brand-secondary">
-                  {point.value}
-                  {index !== estimate.points.length - 1 && ","}{" "}
-                </h6>
-              ))}
-            </span>
-            )
-          </div>
-        ) : (
-          <div>
-            <p className="text-xs text-brand-secondary">No estimate points</p>
-          </div>
-        )}
-      </div>
-
-      <DeleteEstimateModal
-        isOpen={isDeleteEstimateModalOpen}
-        handleClose={() => setIsDeleteEstimateModalOpen(false)}
-        data={estimate}
-        handleDelete={() => {
-          handleEstimateDelete(estimate.id);
-          setIsDeleteEstimateModalOpen(false);
-        }}
-      />
-    </>
-  );
-};

app/components/icons/attachment-icon.tsx

@@ -1,59 +0,0 @@
-import {
-  AudioIcon,
-  CssIcon,
-  CsvIcon,
-  DefaultIcon,
-  DocIcon,
-  FigmaIcon,
-  HtmlIcon,
-  JavaScriptIcon,
-  JpgIcon,
-  PdfIcon,
-  PngIcon,
-  SheetIcon,
-  SvgIcon,
-  TxtIcon,
-  VideoIcon,
-} from "components/icons";
-
-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} />;
-
-    default:
-      return <DefaultIcon height={28} width={28} />;
-  }
-};

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

@@ -1,9 +0,0 @@
-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" />
-);

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

@@ -1,9 +0,0 @@
-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" />
-);

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

@@ -1,9 +0,0 @@
-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" />
-);

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

@@ -1,9 +0,0 @@
-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" />
-);

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

@@ -1,9 +0,0 @@
-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" />
-);

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

@@ -1,9 +0,0 @@
-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" />
-);

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

@@ -1,9 +0,0 @@
-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" />
-);

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

@@ -1,9 +0,0 @@
-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" />
-);

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

@@ -1,9 +0,0 @@
-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" />
-);

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

@@ -1,9 +0,0 @@
-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" />
-);

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

@@ -1,9 +0,0 @@
-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" />
-);

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

@@ -1,9 +0,0 @@
-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" />
-);

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

@@ -1,9 +0,0 @@
-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" />
-);

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

@@ -1,9 +0,0 @@
-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" />
-);

app/components/icons/txt-file-icon.tsx

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

app/components/icons/video-file-icon.tsx

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

app/components/integration/delete-import-modal.tsx

@@ -1,144 +0,0 @@
-import React, { useState } from "react";
-
-import { useRouter } from "next/router";
-
-import { mutate } from "swr";
-
-// headless ui
-import { Dialog, Transition } from "@headlessui/react";
-// services
-import IntegrationService from "services/integration";
-// hooks
-import useToast from "hooks/use-toast";
-// ui
-import { DangerButton, Input, SecondaryButton } from "components/ui";
-// icons
-import { ExclamationTriangleIcon } from "@heroicons/react/24/outline";
-// types
-import { IImporterService } from "types";
-// fetch-keys
-import { IMPORTER_SERVICES_LIST } from "constants/fetch-keys";
-
-type Props = {
-  isOpen: boolean;
-  handleClose: () => void;
-  data: IImporterService | null;
-};
-
-export const DeleteImportModal: React.FC<Props> = ({ isOpen, handleClose, data }) => {
-  const [deleteLoading, setDeleteLoading] = useState(false);
-  const [confirmDeleteImport, setConfirmDeleteImport] = useState(false);
-
-  const router = useRouter();
-  const { workspaceSlug } = router.query;
-
-  const { setToastAlert } = useToast();
-
-  const handleDeletion = () => {
-    if (!workspaceSlug || !data) return;
-
-    setDeleteLoading(true);
-
-    mutate<IImporterService[]>(
-      IMPORTER_SERVICES_LIST(workspaceSlug as string),
-      (prevData) => (prevData ?? []).filter((i) => i.id !== data.id),
-      false
-    );
-
-    IntegrationService.deleteImporterService(workspaceSlug as string, data.service, data.id)
-      .catch(() =>
-        setToastAlert({
-          type: "error",
-          title: "Error!",
-          message: "Something went wrong. Please try again.",
-        })
-      )
-      .finally(() => {
-        setDeleteLoading(false);
-        handleClose();
-      });
-  };
-
-  if (!data) return <></>;
-
-  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-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 Project</h3>
-                    </span>
-                  </div>
-                  <span>
-                    <p className="text-sm leading-7 text-gray-500">
-                      Are you sure you want to delete project{" "}
-                      <span className="break-all font-semibold">{data?.service}</span>? All of the
-                      data related to the project will be permanently removed. This action cannot be
-                      undone
-                    </p>
-                  </span>
-                  <div className="text-gray-600">
-                    <p className="text-sm">
-                      To confirm, type <span className="font-medium">delete import</span> below:
-                    </p>
-                    <Input
-                      type="text"
-                      name="typeDelete"
-                      className="mt-2"
-                      onChange={(e) => {
-                        if (e.target.value === "delete import") setConfirmDeleteImport(true);
-                        else setConfirmDeleteImport(false);
-                      }}
-                      placeholder="Enter 'delete import'"
-                    />
-                  </div>
-                  <div className="flex justify-end gap-2">
-                    <SecondaryButton onClick={handleClose}>Cancel</SecondaryButton>
-                    <DangerButton
-                      onClick={handleDeletion}
-                      disabled={!confirmDeleteImport}
-                      loading={deleteLoading}
-                    >
-                      {deleteLoading ? "Deleting..." : "Delete Project"}
-                    </DangerButton>
-                  </div>
-                </div>
-              </Dialog.Panel>
-            </Transition.Child>
-          </div>
-        </div>
-      </Dialog>
-    </Transition.Root>
-  );
-};

app/components/integration/github/auth.tsx

@@ -1,27 +0,0 @@
-// hooks
-import useIntegrationPopup from "hooks/use-integration-popup";
-// ui
-import { PrimaryButton } from "components/ui";
-// types
-import { IWorkspaceIntegration } from "types";
-
-type Props = {
-  workspaceIntegration: false | IWorkspaceIntegration | undefined;
-  provider: string | undefined;
-};
-
-export const GithubAuth: React.FC<Props> = ({ workspaceIntegration, provider }) => {
-  const { startAuth, isConnecting } = useIntegrationPopup(provider);
-
-  return (
-    <div>
-      {workspaceIntegration && workspaceIntegration?.id ? (
-        <PrimaryButton disabled>Successfully Connected</PrimaryButton>
-      ) : (
-        <PrimaryButton onClick={startAuth} loading={isConnecting}>
-          {isConnecting ? "Connecting..." : "Connect"}
-        </PrimaryButton>
-      )}
-    </div>
-  );
-};

app/components/integration/github/import-configure.tsx

@@ -1,56 +0,0 @@
-// components
-import { GithubAuth, TIntegrationSteps } from "components/integration";
-// ui
-import { PrimaryButton } from "components/ui";
-// types
-import { IAppIntegration, IWorkspaceIntegration } from "types";
-
-type Props = {
-  provider: string | undefined;
-  handleStepChange: (value: TIntegrationSteps) => void;
-  appIntegrations: IAppIntegration[] | undefined;
-  workspaceIntegrations: IWorkspaceIntegration[] | undefined;
-};
-
-export const GithubImportConfigure: React.FC<Props> = ({
-  handleStepChange,
-  provider,
-  appIntegrations,
-  workspaceIntegrations,
-}) => {
-  // current integration from all the integrations available
-  const integration =
-    appIntegrations &&
-    appIntegrations.length > 0 &&
-    appIntegrations.find((i) => i.provider === provider);
-
-  // current integration from workspace integrations
-  const workspaceIntegration =
-    integration &&
-    workspaceIntegrations &&
-    workspaceIntegrations.length > 0 &&
-    workspaceIntegrations.find((i: any) => i.integration_detail.id === integration.id);
-
-  return (
-    <div className="space-y-6">
-      <div className="flex items-center gap-2 py-5">
-        <div className="w-full">
-          <div className="font-medium">Configure</div>
-          <div className="text-sm text-gray-600">Set up your GitHub import.</div>
-        </div>
-        <div className="flex-shrink-0">
-          <GithubAuth workspaceIntegration={workspaceIntegration} provider={provider} />
-        </div>
-      </div>
-
-      <div className="flex items-center justify-end">
-        <PrimaryButton
-          onClick={() => handleStepChange("import-data")}
-          disabled={workspaceIntegration && workspaceIntegration?.id ? false : true}
-        >
-          Next
-        </PrimaryButton>
-      </div>
-    </div>
-  );
-};

app/components/integration/github/import-confirm.tsx

@@ -1,27 +0,0 @@
-import { FC } from "react";
-
-// react-hook-form
-import { UseFormWatch } from "react-hook-form";
-// ui
-import { PrimaryButton, SecondaryButton } from "components/ui";
-// types
-import { TFormValues, TIntegrationSteps } from "components/integration";
-
-type Props = {
-  handleStepChange: (value: TIntegrationSteps) => void;
-  watch: UseFormWatch<TFormValues>;
-};
-
-export const GithubImportConfirm: FC<Props> = ({ handleStepChange, watch }) => (
-  <div className="mt-6">
-    <h4 className="font-medium">
-      You are about to import issues from {watch("github").full_name}. Click on {'"'}Confirm &
-      Import{'" '}
-      to complete the process.
-    </h4>
-    <div className="mt-6 flex items-center justify-between">
-      <SecondaryButton onClick={() => handleStepChange("import-users")}>Back</SecondaryButton>
-      <PrimaryButton type="submit">Confirm & Import</PrimaryButton>
-    </div>
-  </div>
-);

app/components/integration/github/import-data.tsx

@@ -1,127 +0,0 @@
-import { FC, useState } from "react";
-
-// react-hook-form
-import { Control, Controller, UseFormWatch } from "react-hook-form";
-// hooks
-import useProjects from "hooks/use-projects";
-// components
-import { SelectRepository, TFormValues, TIntegrationSteps } from "components/integration";
-// ui
-import { CustomSearchSelect, PrimaryButton, SecondaryButton } from "components/ui";
-// helpers
-import { truncateText } from "helpers/string.helper";
-// types
-import { IWorkspaceIntegration } from "types";
-
-type Props = {
-  handleStepChange: (value: TIntegrationSteps) => void;
-  integration: IWorkspaceIntegration | false | undefined;
-  control: Control<TFormValues, any>;
-  watch: UseFormWatch<TFormValues>;
-};
-
-export const GithubImportData: FC<Props> = ({ handleStepChange, integration, control, watch }) => {
-  const { projects } = useProjects();
-
-  const options =
-    projects.map((project) => ({
-      value: project.id,
-      query: project.name,
-      content: <p>{truncateText(project.name, 25)}</p>,
-    })) ?? [];
-
-  return (
-    <div className="mt-6">
-      <div className="space-y-8">
-        <div className="grid grid-cols-12 gap-4 sm:gap-16">
-          <div className="col-span-12 sm:col-span-8">
-            <h4 className="font-semibold">Select Repository</h4>
-            <p className="text-gray-500 text-xs">
-              Select the repository that you want the issues to be imported from.
-            </p>
-          </div>
-          <div className="col-span-12 sm:col-span-4">
-            {integration && (
-              <Controller
-                control={control}
-                name="github"
-                render={({ field: { value, onChange } }) => (
-                  <SelectRepository
-                    integration={integration}
-                    value={value ? value.id : null}
-                    label={value ? `${value.full_name}` : "Select Repository"}
-                    onChange={onChange}
-                    characterLimit={50}
-                  />
-                )}
-              />
-            )}
-          </div>
-        </div>
-        <div className="grid grid-cols-12 gap-4 sm:gap-16">
-          <div className="col-span-12 sm:col-span-8">
-            <h4 className="font-semibold">Select Project</h4>
-            <p className="text-gray-500 text-xs">Select the project to import the issues to.</p>
-          </div>
-          <div className="col-span-12 sm:col-span-4">
-            {projects && (
-              <Controller
-                control={control}
-                name="project"
-                render={({ field: { value, onChange } }) => (
-                  <CustomSearchSelect
-                    value={value}
-                    label={value ? projects.find((p) => p.id === value)?.name : "Select Project"}
-                    onChange={onChange}
-                    options={options}
-                    optionsClassName="w-full"
-                  />
-                )}
-              />
-            )}
-          </div>
-        </div>
-        <div className="grid grid-cols-12 gap-4 sm:gap-16">
-          <div className="col-span-12 sm:col-span-8">
-            <h4 className="font-semibold">Sync Issues</h4>
-            <p className="text-gray-500 text-xs">Set whether you want to sync the issues or not.</p>
-          </div>
-          <div className="col-span-12 sm:col-span-4">
-            <Controller
-              control={control}
-              name="sync"
-              render={({ field: { value, onChange } }) => (
-                <button
-                  type="button"
-                  className={`relative inline-flex h-3.5 w-6 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none ${
-                    value ? "bg-green-500" : "bg-gray-200"
-                  }`}
-                  role="switch"
-                  aria-checked={value ? true : false}
-                  onClick={() => onChange(!value)}
-                >
-                  <span className="sr-only">Show empty groups</span>
-                  <span
-                    aria-hidden="true"
-                    className={`inline-block h-2.5 w-2.5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out ${
-                      value ? "translate-x-2.5" : "translate-x-0"
-                    }`}
-                  />
-                </button>
-              )}
-            />
-          </div>
-        </div>
-      </div>
-      <div className="mt-6 flex items-center justify-end gap-2">
-        <SecondaryButton onClick={() => handleStepChange("import-configure")}>Back</SecondaryButton>
-        <PrimaryButton
-          onClick={() => handleStepChange("repo-details")}
-          disabled={!watch("github") || !watch("project")}
-        >
-          Next
-        </PrimaryButton>
-      </div>
-    </div>
-  );
-};

app/components/integration/github/import-users.tsx

@@ -1,55 +0,0 @@
-import { FC } from "react";
-
-// react-hook-form
-import { UseFormWatch } from "react-hook-form";
-// ui
-import { PrimaryButton, SecondaryButton } from "components/ui";
-// types
-import {
-  IUserDetails,
-  SingleUserSelect,
-  TFormValues,
-  TIntegrationSteps,
-} from "components/integration";
-
-type Props = {
-  handleStepChange: (value: TIntegrationSteps) => void;
-  users: IUserDetails[];
-  setUsers: React.Dispatch<React.SetStateAction<IUserDetails[]>>;
-  watch: UseFormWatch<TFormValues>;
-};
-
-export const GithubImportUsers: FC<Props> = ({ handleStepChange, users, setUsers, watch }) => {
-  const isInvalid = users.filter((u) => u.import !== false && u.email === "").length > 0;
-
-  return (
-    <div className="mt-6">
-      <div>
-        <div className="grid grid-cols-3 gap-2 text-sm mb-2 font-medium">
-          <div>Name</div>
-          <div>Import as...</div>
-          <div className="text-right">
-            {users.filter((u) => u.import !== false).length} users selected
-          </div>
-        </div>
-        <div className="space-y-2">
-          {watch("collaborators").map((collaborator, index) => (
-            <SingleUserSelect
-              key={collaborator.id}
-              collaborator={collaborator}
-              index={index}
-              users={users}
-              setUsers={setUsers}
-            />
-          ))}
-        </div>
-      </div>
-      <div className="mt-6 flex items-center justify-end gap-2">
-        <SecondaryButton onClick={() => handleStepChange("repo-details")}>Back</SecondaryButton>
-        <PrimaryButton onClick={() => handleStepChange("import-confirm")} disabled={isInvalid}>
-          Next
-        </PrimaryButton>
-      </div>
-    </div>
-  );
-};

app/components/integration/github/index.ts

@@ -1,9 +0,0 @@
-export * from "./auth";
-export * from "./import-configure";
-export * from "./import-confirm";
-export * from "./import-data";
-export * from "./import-users";
-export * from "./repo-details";
-export * from "./root";
-export * from "./select-repository";
-export * from "./single-user-select";

app/components/integration/github/repo-details.tsx

@@ -1,105 +0,0 @@
-import { FC, useEffect } from "react";
-
-import { useRouter } from "next/router";
-
-import useSWR from "swr";
-
-// react-hook-form
-import { UseFormSetValue } from "react-hook-form";
-// services
-import GithubIntegrationService from "services/integration/github.service";
-// ui
-import { Loader, PrimaryButton, SecondaryButton } from "components/ui";
-// types
-import { IUserDetails, TFormValues, TIntegrationSteps } from "components/integration";
-// fetch-keys
-import { GITHUB_REPOSITORY_INFO } from "constants/fetch-keys";
-
-type Props = {
-  selectedRepo: any;
-  handleStepChange: (value: TIntegrationSteps) => void;
-  setUsers: React.Dispatch<React.SetStateAction<IUserDetails[]>>;
-  setValue: UseFormSetValue<TFormValues>;
-};
-
-export const GithubRepoDetails: FC<Props> = ({
-  selectedRepo,
-  handleStepChange,
-  setUsers,
-  setValue,
-}) => {
-  const router = useRouter();
-  const { workspaceSlug } = router.query;
-
-  const { data: repoInfo } = useSWR(
-    workspaceSlug && selectedRepo
-      ? GITHUB_REPOSITORY_INFO(workspaceSlug as string, selectedRepo.name)
-      : null,
-    workspaceSlug && selectedRepo
-      ? () =>
-          GithubIntegrationService.getGithubRepoInfo(workspaceSlug as string, {
-            owner: selectedRepo.owner.login,
-            repo: selectedRepo.name,
-          })
-      : null
-  );
-
-  useEffect(() => {
-    if (!repoInfo) return;
-
-    setValue("collaborators", repoInfo.collaborators);
-
-    const fetchedUsers = repoInfo.collaborators.map((collaborator) => ({
-      username: collaborator.login,
-      import: "map",
-      email: "",
-    }));
-    setUsers(fetchedUsers);
-  }, [repoInfo, setUsers, setValue]);
-
-  return (
-    <div className="mt-6">
-      {repoInfo ? (
-        repoInfo.issue_count > 0 ? (
-          <div className="flex items-center justify-between gap-4">
-            <div>
-              <div className="font-medium">Repository Details</div>
-              <div className="text-sm text-gray-600">Import completed. We have found:</div>
-            </div>
-            <div className="flex gap-16 mt-4">
-              <div className="text-center flex-shrink-0">
-                <p className="text-3xl font-bold">{repoInfo.issue_count}</p>
-                <h6 className="text-sm text-gray-500">Issues</h6>
-              </div>
-              <div className="text-center flex-shrink-0">
-                <p className="text-3xl font-bold">{repoInfo.labels}</p>
-                <h6 className="text-sm text-gray-500">Labels</h6>
-              </div>
-              <div className="text-center flex-shrink-0">
-                <p className="text-3xl font-bold">{repoInfo.collaborators.length}</p>
-                <h6 className="text-sm text-gray-500">Users</h6>
-              </div>
-            </div>
-          </div>
-        ) : (
-          <div>
-            <h5>We didn{"'"}t find any issue in this repository.</h5>
-          </div>
-        )
-      ) : (
-        <Loader>
-          <Loader.Item height="70px" />
-        </Loader>
-      )}
-      <div className="mt-6 flex items-center justify-end gap-2">
-        <SecondaryButton onClick={() => handleStepChange("import-data")}>Back</SecondaryButton>
-        <PrimaryButton
-          onClick={() => handleStepChange("import-users")}
-          disabled={!repoInfo || repoInfo.issue_count === 0}
-        >
-          Next
-        </PrimaryButton>
-      </div>
-    </div>
-  );
-};

app/components/integration/github/root.tsx

@@ -1,271 +0,0 @@
-import React, { useState } from "react";
-
-import Link from "next/link";
-import Image from "next/image";
-import { useRouter } from "next/router";
-
-import useSWR, { mutate } from "swr";
-
-// react-hook-form
-import { useForm } from "react-hook-form";
-// services
-import IntegrationService from "services/integration";
-import GithubIntegrationService from "services/integration/github.service";
-// hooks
-import useToast from "hooks/use-toast";
-// components
-import {
-  GithubImportConfigure,
-  GithubImportData,
-  GithubRepoDetails,
-  GithubImportUsers,
-  GithubImportConfirm,
-} from "components/integration";
-// icons
-import { CogIcon, CloudUploadIcon, UsersIcon, CheckIcon } from "components/icons";
-import { ArrowLeftIcon, ListBulletIcon } from "@heroicons/react/24/outline";
-// images
-import GithubLogo from "public/services/github.png";
-// types
-import { IGithubRepoCollaborator, IGithubServiceImportFormData } from "types";
-// fetch-keys
-import {
-  APP_INTEGRATIONS,
-  IMPORTER_SERVICES_LIST,
-  WORKSPACE_INTEGRATIONS,
-} from "constants/fetch-keys";
-
-export type TIntegrationSteps =
-  | "import-configure"
-  | "import-data"
-  | "repo-details"
-  | "import-users"
-  | "import-confirm";
-export interface IIntegrationData {
-  state: TIntegrationSteps;
-}
-
-export interface IUserDetails {
-  username: string;
-  import: any;
-  email: string;
-}
-
-export type TFormValues = {
-  github: any;
-  project: string | null;
-  sync: boolean;
-  collaborators: IGithubRepoCollaborator[];
-  users: IUserDetails[];
-};
-
-const defaultFormValues = {
-  github: null,
-  project: null,
-  sync: false,
-};
-
-const integrationWorkflowData = [
-  {
-    title: "Configure",
-    key: "import-configure",
-    icon: CogIcon,
-  },
-  {
-    title: "Import Data",
-    key: "import-data",
-    icon: CloudUploadIcon,
-  },
-  { title: "Issues", key: "repo-details", icon: ListBulletIcon },
-  {
-    title: "Users",
-    key: "import-users",
-    icon: UsersIcon,
-  },
-  {
-    title: "Confirm",
-    key: "import-confirm",
-    icon: CheckIcon,
-  },
-];
-
-export const GithubImporterRoot = () => {
-  const [currentStep, setCurrentStep] = useState<IIntegrationData>({
-    state: "import-configure",
-  });
-  const [users, setUsers] = useState<IUserDetails[]>([]);
-
-  const router = useRouter();
-  const { workspaceSlug, provider } = router.query;
-
-  const { setToastAlert } = useToast();
-
-  const { handleSubmit, control, setValue, watch } = useForm<TFormValues>({
-    defaultValues: defaultFormValues,
-  });
-
-  const { data: appIntegrations } = useSWR(APP_INTEGRATIONS, () =>
-    IntegrationService.getAppIntegrationsList()
-  );
-
-  const { data: workspaceIntegrations } = useSWR(
-    workspaceSlug ? WORKSPACE_INTEGRATIONS(workspaceSlug as string) : null,
-    workspaceSlug
-      ? () => IntegrationService.getWorkspaceIntegrationsList(workspaceSlug as string)
-      : null
-  );
-
-  const activeIntegrationState = () => {
-    const currentElementIndex = integrationWorkflowData.findIndex(
-      (i) => i?.key === currentStep?.state
-    );
-
-    return currentElementIndex;
-  };
-
-  const handleStepChange = (value: TIntegrationSteps) => {
-    setCurrentStep((prevData) => ({ ...prevData, state: value }));
-  };
-
-  // current integration from all the integrations available
-  const integration =
-    appIntegrations &&
-    appIntegrations.length > 0 &&
-    appIntegrations.find((i) => i.provider === provider);
-
-  // current integration from workspace integrations
-  const workspaceIntegration =
-    integration &&
-    workspaceIntegrations?.find((i: any) => i.integration_detail.id === integration.id);
-
-  const createGithubImporterService = async (formData: TFormValues) => {
-    if (!formData.github || !formData.project) return;
-
-    const payload: IGithubServiceImportFormData = {
-      metadata: {
-        owner: formData.github.owner.login,
-        name: formData.github.name,
-        repository_id: formData.github.id,
-        url: formData.github.html_url,
-      },
-      data: {
-        users: users,
-      },
-      config: {
-        sync: formData.sync,
-      },
-      project_id: formData.project,
-    };
-
-    await GithubIntegrationService.createGithubServiceImport(workspaceSlug as string, payload)
-      .then(() => {
-        router.push(`/${workspaceSlug}/settings/import-export`);
-        mutate(IMPORTER_SERVICES_LIST(workspaceSlug as string));
-      })
-      .catch(() =>
-        setToastAlert({
-          type: "error",
-          title: "Error!",
-          message: "Import was unsuccessful. Please try again.",
-        })
-      );
-  };
-
-  return (
-    <form onSubmit={handleSubmit(createGithubImporterService)}>
-      <div className="space-y-2">
-        <Link href={`/${workspaceSlug}/settings/import-export`}>
-          <div className="inline-flex cursor-pointer items-center gap-2 text-sm font-medium text-gray-600 hover:text-gray-900">
-            <div>
-              <ArrowLeftIcon className="h-3 w-3" />
-            </div>
-            <div>Cancel import & go back</div>
-          </div>
-        </Link>
-
-        <div className="space-y-4 rounded-[10px] border border-gray-200 bg-white p-4">
-          <div className="flex items-center gap-2">
-            <div className="h-10 w-10 flex-shrink-0">
-              <Image src={GithubLogo} alt="GithubLogo" />
-            </div>
-            <div className="flex h-full w-full items-center justify-center">
-              {integrationWorkflowData.map((integration, index) => (
-                <React.Fragment key={integration.key}>
-                  <div
-                    className={`flex h-10 w-10 flex-shrink-0 items-center justify-center rounded-full border ${
-                      index <= activeIntegrationState()
-                        ? `border-[#3F76FF] bg-[#3F76FF] text-white ${
-                            index === activeIntegrationState()
-                              ? "border-opacity-100 bg-opacity-100"
-                              : "border-opacity-80 bg-opacity-80"
-                          }`
-                        : "border-gray-300"
-                    }`}
-                  >
-                    <integration.icon
-                      width="18px"
-                      height="18px"
-                      color={index <= activeIntegrationState() ? "#ffffff" : "#d1d5db"}
-                    />
-                  </div>
-                  {index < integrationWorkflowData.length - 1 && (
-                    <div
-                      key={index}
-                      className={`border-b px-7 ${
-                        index <= activeIntegrationState() - 1
-                          ? `border-[#3F76FF]`
-                          : `border-gray-300`
-                      }`}
-                    >
-                      {" "}
-                    </div>
-                  )}
-                </React.Fragment>
-              ))}
-            </div>
-          </div>
-
-          <div className="relative w-full space-y-4">
-            <div className="w-full">
-              {currentStep?.state === "import-configure" && (
-                <GithubImportConfigure
-                  handleStepChange={handleStepChange}
-                  provider={provider as string}
-                  appIntegrations={appIntegrations}
-                  workspaceIntegrations={workspaceIntegrations}
-                />
-              )}
-              {currentStep?.state === "import-data" && (
-                <GithubImportData
-                  handleStepChange={handleStepChange}
-                  integration={workspaceIntegration}
-                  control={control}
-                  watch={watch}
-                />
-              )}
-              {currentStep?.state === "repo-details" && (
-                <GithubRepoDetails
-                  selectedRepo={watch("github")}
-                  handleStepChange={handleStepChange}
-                  setUsers={setUsers}
-                  setValue={setValue}
-                />
-              )}
-              {currentStep?.state === "import-users" && (
-                <GithubImportUsers
-                  handleStepChange={handleStepChange}
-                  users={users}
-                  setUsers={setUsers}
-                  watch={watch}
-                />
-              )}
-              {currentStep?.state === "import-confirm" && (
-                <GithubImportConfirm handleStepChange={handleStepChange} watch={watch} />
-              )}
-            </div>
-          </div>
-        </div>
-      </div>
-    </form>
-  );
-};