fix: label import on back migration script

.env.example

@@ -1,20 +0,0 @@
-# Replace with your instance Public IP
-NEXT_PUBLIC_EXTRA_IMAGE_DOMAINS=
-NEXT_PUBLIC_GOOGLE_CLIENTID=""
-NEXT_PUBLIC_GITHUB_APP_NAME=""
-NEXT_PUBLIC_GITHUB_ID=""
-NEXT_PUBLIC_SENTRY_DSN=""
-NEXT_PUBLIC_ENABLE_OAUTH=0
-NEXT_PUBLIC_ENABLE_SENTRY=0
-NEXT_PUBLIC_ENABLE_SESSION_RECORDER=0
-NEXT_PUBLIC_TRACK_EVENTS=0
-NEXT_PUBLIC_SLACK_CLIENT_ID=""
-EMAIL_HOST=""
-EMAIL_HOST_USER=""
-EMAIL_HOST_PASSWORD=""
-AWS_REGION=""
-AWS_ACCESS_KEY_ID=""
-AWS_SECRET_ACCESS_KEY=""
-AWS_S3_BUCKET_NAME=""
-OPENAI_API_KEY=""
-GPT_ENGINE=""

.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:

.github/workflows/push-image-backend.yml

@@ -1,4 +1,4 @@
-name: Build and Push Backend Docker Image
+name: Build Api Server Docker Image
 
 on:
   push:
@@ -10,8 +10,11 @@ on:
 
 jobs:
   build_push_backend:
-    name: Build and Push Api Server Docker Image
+    name: Build Api Server Docker Image
     runs-on: ubuntu-20.04
+    permissions:
+      contents: read
+      packages: write
 
     steps:
       - name: Check out the repo
@@ -25,33 +28,20 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2.5.0
 
-      - name: Login to GitHub Container Registry
+      - name: Login to Github Container Registry
         uses: docker/login-action@v2.1.0
         with:
           registry: "ghcr.io"
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2.1.0
-        with:
-          registry: "registry.hub.docker.com"
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Extract metadata (tags, labels) for Docker (Docker Hub)
-        id: ghmeta
-        uses: docker/metadata-action@v4.3.0
-        with:
-          images: makeplane/plane-backend
-
-      - name: Extract metadata (tags, labels) for Docker (Github)
-        id: dkrmeta
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
         uses: docker/metadata-action@v4.3.0
         with:
           images: ghcr.io/${{ github.repository }}-backend
 
-      - name: Build and Push to GitHub Container Registry
+      - name: Build Api Server
         uses: docker/build-push-action@v4.0.0
         with:
           context: ./apiserver
@@ -60,18 +50,5 @@ jobs:
           push: true
           cache-from: type=gha
           cache-to: type=gha
-          tags: ${{ steps.ghmeta.outputs.tags }}
-          labels: ${{ steps.ghmeta.outputs.labels }}
-
-      - name: Build and Push to Docker Hub
-        uses: docker/build-push-action@v4.0.0
-        with:
-          context: ./apiserver
-          file: ./apiserver/Dockerfile.api
-          platforms: linux/arm64,linux/amd64
-          push: true
-          cache-from: type=gha
-          cache-to: type=gha
-          tags: ${{ steps.dkrmeta.outputs.tags }}
-          labels: ${{ steps.dkrmeta.outputs.labels }}
-
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/push-image-frontend.yml

@@ -1,4 +1,4 @@
-name: Build and Push Frontend Docker Image
+name: Build Frontend Docker Image
 
 on:
   push:
@@ -12,6 +12,9 @@ jobs:
   build_push_frontend:
     name: Build Frontend Docker Image
     runs-on: ubuntu-20.04
+    permissions:
+      contents: read
+      packages: write
 
     steps:
       - name: Check out the repo
@@ -32,26 +35,13 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2.1.0
-        with:
-          registry: "registry.hub.docker.com"
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-      
-      - name: Extract metadata (tags, labels) for Docker (Docker Hub)
-        id: ghmeta
-        uses: docker/metadata-action@v4.3.0
-        with:
-          images: makeplane/plane-frontend
-
-      - name: Extract metadata (tags, labels) for Docker (Github)
+      - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v4.3.0
         with:
           images: ghcr.io/${{ github.repository }}-frontend
 
-      - name: Build and Push to GitHub Container Registry
+      - name: Build Frontend Server
         uses: docker/build-push-action@v4.0.0
         with:
           context: .
@@ -60,18 +50,5 @@ jobs:
           push: true
           cache-from: type=gha
           cache-to: type=gha
-          tags: ${{ steps.ghmeta.outputs.tags }}
-          labels: ${{ steps.ghmeta.outputs.labels }}
-      
-      - name: Build and Push to Docker Container Registry
-        uses: docker/build-push-action@v4.0.0
-        with:
-          context: .
-          file: ./apps/app/Dockerfile.web
-          platforms: linux/arm64,linux/amd64
-          push: true
-          cache-from: type=gha
-          cache-to: type=gha
-          tags: ${{ steps.dkrmeta.outputs.tags }}
-          labels: ${{ steps.dkrmeta.outputs.labels }}
-
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -3,7 +3,6 @@ RUN apk add --no-cache libc6-compat
 RUN apk update
 # Set working directory
 WORKDIR /app
-ENV NEXT_PUBLIC_API_BASE_URL=http://NEXT_PUBLIC_API_BASE_URL_PLACEHOLDER
 
 RUN yarn global add turbo
 COPY . .
@@ -17,7 +16,7 @@ FROM node:18-alpine AS installer
 RUN apk add --no-cache libc6-compat
 RUN apk update
 WORKDIR /app
-ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
+
 # First install the dependencies (as they change less often)
 COPY .gitignore .gitignore
 COPY --from=builder /app/out/json/ .
@@ -27,16 +26,9 @@ RUN yarn install
 # Build the project
 COPY --from=builder /app/out/full/ .
 COPY turbo.json turbo.json
-COPY replace-env-vars.sh /usr/local/bin/
-USER root
-RUN chmod +x /usr/local/bin/replace-env-vars.sh
 
 RUN yarn turbo run build --filter=app
 
-ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
-    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
-
-RUN /usr/local/bin/replace-env-vars.sh http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER ${NEXT_PUBLIC_API_BASE_URL}
 
 FROM python:3.11.1-alpine3.17 AS backend
 
@@ -116,16 +108,6 @@ COPY nginx/nginx-single-docker-image.conf /etc/nginx/http.d/default.conf
 
 COPY nginx/supervisor.conf /code/supervisor.conf
 
-ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
-ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
-    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
-
-USER root
-COPY replace-env-vars.sh /usr/local/bin/
-COPY start.sh /usr/local/bin/
-RUN chmod +x /usr/local/bin/replace-env-vars.sh
-RUN chmod +x /usr/local/bin/start.sh
-
 
 CMD ["supervisord","-c","/code/supervisor.conf"]
 

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).
 
@@ -58,21 +58,13 @@ cd plane
 
 > If running in a cloud env replace localhost with public facing IP address of the VM
 
-- Export Environment Variables
-
-```bash
-set -a
-source .env
-set +a
-```
 
 - Run Docker compose up
 
 ```bash
-docker-compose -f docker-compose-hub.yml up
+docker-compose up
 ```
 
-<strong>You can use the default email and password for your first login `captain@plane.so` and `password123`.</strong> 
 
 ## 🚀 Features
 
@@ -131,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

@@ -0,0 +1,24 @@
+DJANGO_SETTINGS_MODULE="plane.settings.production"
+# Database
+DATABASE_URL=postgres://plane:xyzzyspoon@db:5432/plane
+# Cache
+REDIS_URL=redis://redis:6379/
+# SMPT
+EMAIL_HOST=""
+EMAIL_HOST_USER=""
+EMAIL_HOST_PASSWORD=""
+# AWS 
+AWS_REGION=""
+AWS_ACCESS_KEY_ID=""
+AWS_SECRET_ACCESS_KEY=""
+AWS_S3_BUCKET_NAME=""
+# FE
+WEB_URL="localhost/"
+# OAUTH
+GITHUB_CLIENT_SECRET=""
+# Flags
+DISABLE_COLLECTSTATIC=1
+DOCKERIZED=1
+# GPT Envs
+OPENAI_API_KEY=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,15 +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,
-    Integration,
-)
+from plane.db.models import Issue, IssueComment, User, Project, ProjectMember, Label
+
 
 
 # Update description and description html values for old descriptions
@@ -155,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)
@@ -168,7 +161,6 @@ def update_user_view_property():
         print(e)
         print("Failed")
 
-
 def update_label_color():
     try:
         labels = Label.objects.filter(color="")
@@ -182,29 +174,3 @@ def update_label_color():
     except Exception as e:
         print(e)
         print("Failed")
-
-
-def create_slack_integration():
-    try:
-        _ = Integration.objects.create(provider="slack", network=2, title="Slack")
-        print("Success")
-    except Exception as e:
-        print(e)
-        print("Failed")
-
-
-def update_integration_verified():
-    try:
-        integrations = Integration.objects.all()
-        updated_integrations = []
-        for integration in integrations:
-            integration.verified = True
-            updated_integrations.append(integration)
-
-        Integration.objects.bulk_update(
-            updated_integrations, ["verified"], batch_size=10
-        )
-        print("Sucess")
-    except Exception as e:
-        print(e)
-        print("Failed")

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 (
@@ -62,11 +60,8 @@ from .integration import (
     GithubRepositorySerializer,
     GithubRepositorySyncSerializer,
     GithubCommentSyncSerializer,
-    SlackProjectSyncSerializer,
 )
 
 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/integration/__init__.py

@@ -5,4 +5,3 @@ from .github import (
     GithubIssueSyncSerializer,
     GithubCommentSyncSerializer,
 )
-from .slack import SlackProjectSyncSerializer

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

@@ -1,14 +0,0 @@
-# Module imports
-from plane.api.serializers import BaseSerializer
-from plane.db.models import SlackProjectSync
-
-
-class SlackProjectSyncSerializer(BaseSerializer):
-    class Meta:
-        model = SlackProjectSync
-        fields = "__all__"
-        read_only_fields = [
-            "project",
-            "workspace",
-            "workspace_integration",
-        ]

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,15 +74,10 @@ from plane.api.views import (
     SubIssuesEndpoint,
     IssueLinkViewSet,
     BulkCreateIssueLabelsEndpoint,
-    IssueAttachmentEndpoint,
     ## End Issues
     # States
     StateViewSet,
     ## End States
-    # Estimates
-    ProjectEstimatePointEndpoint,
-    BulkEstimatePointEndpoint,
-    ## End Estimates
     # Shortcuts
     ShortCutViewSet,
     ## End Shortcuts
@@ -131,7 +125,6 @@ from plane.api.views import (
     GithubIssueSyncViewSet,
     GithubCommentSyncViewSet,
     BulkCreateGithubIssueSyncEndpoint,
-    SlackProjectSyncViewSet,
     ## End Integrations
     # Importer
     ServiceIssueImportSummaryEndpoint,
@@ -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(
@@ -509,34 +477,6 @@ urlpatterns = [
         name="project-state",
     ),
     # 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/",
@@ -801,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(
@@ -1211,26 +1141,6 @@ urlpatterns = [
         ),
     ),
     ## End Github Integrations
-    # Slack Integration
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/workspace-integrations/<uuid:workspace_integration_id>/project-slack-sync/",
-        SlackProjectSyncViewSet.as_view(
-            {
-                "post": "create",
-                "get": "list",
-            }
-        ),
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/workspace-integrations/<uuid:workspace_integration_id>/project-slack-sync/<uuid:pk>/",
-        SlackProjectSyncViewSet.as_view(
-            {
-                "delete": "destroy",
-                "get": "retrieve",
-            }
-        ),
-    ),
-    ## End Slack Integration
     ## End Integrations
     # Importer
     path(
@@ -1248,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(),
@@ -1265,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(
@@ -1278,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,7 +40,6 @@ from .workspace import (
     UserActivityGraphEndpoint,
     UserIssueCompletedGraphEndpoint,
     UserWorkspaceDashboardEndpoint,
-    WorkspaceThemeViewSet,
 )
 from .state import StateViewSet
 from .shortcut import ShortCutViewSet
@@ -70,7 +69,6 @@ from .issue import (
     SubIssuesEndpoint,
     IssueLinkViewSet,
     BulkCreateIssueLabelsEndpoint,
-    IssueAttachmentEndpoint,
 )
 
 from .auth_extended import (
@@ -106,7 +104,6 @@ from .integration import (
     GithubCommentSyncViewSet,
     GithubRepositoriesEndpoint,
     BulkCreateGithubIssueSyncEndpoint,
-    SlackProjectSyncViewSet,
 )
 
 from .importer import (
@@ -128,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
@@ -48,28 +46,6 @@ class CycleViewSet(BaseViewSet):
             project_id=self.kwargs.get("project_id"), owned_by=self.request.user
         )
 
-    def perform_destroy(self, instance):
-        cycle_issues = list(
-            CycleIssue.objects.filter(cycle_id=self.kwargs.get("pk")).values_list(
-                "issue", flat=True
-            )
-        )
-        issue_activity.delay(
-            type="cycle.activity.deleted",
-            requested_data=json.dumps(
-                {
-                    "cycle_id": str(self.kwargs.get("pk")),
-                    "issues": [str(issue_id) for issue_id in cycle_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=None,
-        )
-
-        return super().perform_destroy(instance)
-
     def get_queryset(self):
         subquery = CycleFavorite.objects.filter(
             user=self.request.user,
@@ -203,22 +179,6 @@ class CycleIssueViewSet(BaseViewSet):
             cycle_id=self.kwargs.get("cycle_id"),
         )
 
-    def perform_destroy(self, instance):
-        issue_activity.delay(
-            type="cycle.activity.deleted",
-            requested_data=json.dumps(
-                {
-                    "cycle_id": str(self.kwargs.get("cycle_id")),
-                    "issues": [str(instance.issue_id)],
-                }
-            ),
-            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=None,
-        )
-        return super().perform_destroy(instance)
-
     def get_queryset(self):
         return self.filter_queryset(
             super()
@@ -266,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
@@ -324,9 +270,9 @@ class CycleIssueViewSet(BaseViewSet):
 
             # Get all CycleIssues already created
             cycle_issues = list(CycleIssue.objects.filter(issue_id__in=issues))
+            records_to_update = []
             update_cycle_issue_activity = []
             record_to_create = []
-            records_to_update = []
 
             for issue in issues:
                 cycle_issue = [
@@ -371,19 +317,21 @@ class CycleIssueViewSet(BaseViewSet):
 
             # Capture Issue Activity
             issue_activity.delay(
-                type="cycle.activity.created",
-                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
@@ -422,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

@@ -28,7 +28,6 @@ from plane.db.models import (
     Module,
     ModuleLink,
     ModuleIssue,
-    Label,
 )
 from plane.api.serializers import (
     ImporterSerializer,
@@ -66,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,
@@ -105,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,
@@ -220,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)
@@ -234,52 +225,6 @@ class ImportServiceEndpoint(BaseAPIView):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-    def delete(self, request, slug, service, pk):
-        try:
-            importer = Importer.objects.get(
-                pk=pk, service=service, workspace__slug=slug
-            )
-            # Delete all imported Issues
-            imported_issues = importer.imported_data.get("issues", [])
-            Issue.objects.filter(id__in=imported_issues).delete()
-
-            # Delete all imported Labels
-            imported_labels = importer.imported_data.get("labels", [])
-            Label.objects.filter(id__in=imported_labels).delete()
-
-            if importer.service == "jira":
-                imported_modules = importer.imported_data.get("modules", [])
-                Module.objects.filter(id__in=imported_modules).delete()
-            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,
-            )
-
-    def patch(self, request, slug, service, pk):
-        try:
-            importer = Importer.objects.get(
-                pk=pk, service=service, workspace__slug=slug
-            )
-            serializer = ImporterSerializer(importer, data=request.data, partial=True)
-            if serializer.is_valid():
-                serializer.save()
-                return Response(serializer.data, status=status.HTTP_200_OK)
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-        except Importer.DoesNotExist:
-            return Response(
-                {"error": "Importer Does not exists"}, status=status.HTTP_404_NOT_FOUND
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
 
 class UpdateServiceImportStatusEndpoint(BaseAPIView):
     def post(self, request, slug, project_id, service, importer_id):
@@ -520,59 +465,48 @@ class BulkImportModulesEndpoint(BaseAPIView):
                 ignore_conflicts=True,
             )
 
-            modules = Module.objects.filter(id__in=[module.id for module in modules])
+            _ = ModuleLink.objects.bulk_create(
+                [
+                    ModuleLink(
+                        module=module,
+                        url=module_data.get("link", {}).get("url", "https://plane.so"),
+                        title=module_data.get("link", {}).get(
+                            "title", "Original Issue"
+                        ),
+                        project_id=project_id,
+                        workspace_id=project.workspace_id,
+                        created_by=request.user,
+                        updated_by=request.user,
+                    )
+                    for module, module_data in zip(modules, modules_data)
+                ],
+                batch_size=100,
+                ignore_conflicts=True,
+            )
 
-            if len(modules) == len(modules_data):
-                _ = ModuleLink.objects.bulk_create(
-                    [
-                        ModuleLink(
-                            module=module,
-                            url=module_data.get("link", {}).get(
-                                "url", "https://plane.so"
-                            ),
-                            title=module_data.get("link", {}).get(
-                                "title", "Original Issue"
-                            ),
-                            project_id=project_id,
-                            workspace_id=project.workspace_id,
-                            created_by=request.user,
-                            updated_by=request.user,
-                        )
-                        for module, module_data in zip(modules, modules_data)
-                    ],
-                    batch_size=100,
-                    ignore_conflicts=True,
-                )
+            bulk_module_issues = []
+            for module, module_data in zip(modules, modules_data):
+                module_issues_list = module_data.get("module_issues_list", [])
+                bulk_module_issues = bulk_module_issues + [
+                    ModuleIssue(
+                        issue_id=issue,
+                        module=module,
+                        project_id=project_id,
+                        workspace_id=project.workspace_id,
+                        created_by=request.user,
+                        updated_by=request.user,
+                    )
+                    for issue in module_issues_list
+                ]
 
-                bulk_module_issues = []
-                for module, module_data in zip(modules, modules_data):
-                    module_issues_list = module_data.get("module_issues_list", [])
-                    bulk_module_issues = bulk_module_issues + [
-                        ModuleIssue(
-                            issue_id=issue,
-                            module=module,
-                            project_id=project_id,
-                            workspace_id=project.workspace_id,
-                            created_by=request.user,
-                            updated_by=request.user,
-                        )
-                        for issue in module_issues_list
-                    ]
+            _ = ModuleIssue.objects.bulk_create(
+                bulk_module_issues, batch_size=100, ignore_conflicts=True
+            )
 
-                _ = ModuleIssue.objects.bulk_create(
-                    bulk_module_issues, batch_size=100, ignore_conflicts=True
-                )
-
-                serializer = ModuleSerializer(modules, many=True)
-                return Response(
-                    {"modules": serializer.data}, status=status.HTTP_201_CREATED
-                )
-
-            else:
-                return Response(
-                    {"message": "Modules created but issues could not be imported"},
-                    status=status.HTTP_200_OK,
-                )
+            serializer = ModuleSerializer(modules, many=True)
+            return Response(
+                {"modules": serializer.data}, status=status.HTTP_201_CREATED
+            )
         except Project.DoesNotExist:
             return Response(
                 {"error": "Project does not exist"}, status=status.HTTP_404_NOT_FOUND

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

@@ -6,4 +6,3 @@ from .github import (
     GithubCommentSyncViewSet,
     GithubRepositoriesEndpoint,
 )
-from .slack import SlackProjectSyncViewSet

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

@@ -27,7 +27,6 @@ from plane.utils.integrations.github import (
 )
 from plane.api.permissions import WorkSpaceAdminPermission
 
-
 class IntegrationViewSet(BaseViewSet):
     serializer_class = IntegrationSerializer
     model = Integration
@@ -102,6 +101,7 @@ class WorkspaceIntegrationViewSet(BaseViewSet):
         WorkSpaceAdminPermission,
     ]
 
+
     def get_queryset(self):
         return (
             super()
@@ -112,30 +112,21 @@ class WorkspaceIntegrationViewSet(BaseViewSet):
 
     def create(self, request, slug, provider):
         try:
+            installation_id = request.data.get("installation_id", None)
+
+            if not installation_id:
+                return Response(
+                    {"error": "Installation ID is required"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
             workspace = Workspace.objects.get(slug=slug)
             integration = Integration.objects.get(provider=provider)
             config = {}
             if provider == "github":
-                installation_id = request.data.get("installation_id", None)
-                if not installation_id:
-                    return Response(
-                        {"error": "Installation ID is required"},
-                        status=status.HTTP_400_BAD_REQUEST,
-                    )
                 metadata = get_github_metadata(installation_id)
                 config = {"installation_id": installation_id}
 
-            if provider == "slack":
-                metadata = request.data.get("metadata", {})
-                access_token = metadata.get("access_token", False)
-                team_id = metadata.get("team", {}).get("id", False)
-                if not metadata or not access_token or not team_id:
-                    return Response(
-                        {"error": "Access token and team id is required"},
-                        status=status.HTTP_400_BAD_REQUEST,
-                    )
-                config = {"team_id": team_id, "access_token": access_token}
-
             # Create a bot user
             bot_user = User.objects.create(
                 email=f"{uuid.uuid4().hex}@plane.so",

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

@@ -1,59 +0,0 @@
-# Django import
-from django.db import IntegrityError
-
-# Third party imports
-from rest_framework import status
-from rest_framework.response import Response
-from sentry_sdk import capture_exception
-
-# Module imports
-from plane.api.views import BaseViewSet, BaseAPIView
-from plane.db.models import SlackProjectSync, WorkspaceIntegration, ProjectMember
-from plane.api.serializers import SlackProjectSyncSerializer
-from plane.api.permissions import ProjectBasePermission, ProjectEntityPermission
-
-
-class SlackProjectSyncViewSet(BaseViewSet):
-    permission_classes = [
-        ProjectBasePermission,
-    ]
-    serializer_class = SlackProjectSyncSerializer
-    model = SlackProjectSync
-
-    def create(self, request, slug, project_id, workspace_integration_id):
-        try:
-            serializer = SlackProjectSyncSerializer(data=request.data)
-
-            workspace_integration = WorkspaceIntegration.objects.get(
-                workspace__slug=slug, pk=workspace_integration_id
-            )
-
-            if serializer.is_valid():
-                serializer.save(
-                    project_id=project_id,
-                    workspace_integration_id=workspace_integration_id,
-                )
-
-                workspace_integration = WorkspaceIntegration.objects.get(
-                    pk=workspace_integration_id, workspace__slug=slug
-                )
-
-                _ = ProjectMember.objects.get_or_create(
-                    member=workspace_integration.actor, role=20, 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": "Slack is already enabled for the project"}, status=status.HTTP_400_BAD_REQUEST)
-        except WorkspaceIntegration.DoesNotExist:
-            return Response(
-                {"error": "Workspace Integration does not exist"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        except Exception as e:
-            print(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )

apiserver/plane/api/views/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
@@ -109,28 +107,6 @@ class ModuleViewSet(BaseViewSet):
             .order_by("-is_favorite", "name")
         )
 
-    def perform_destroy(self, instance):
-        module_issues = list(
-            ModuleIssue.objects.filter(module_id=self.kwargs.get("pk")).values_list(
-                "issue", flat=True
-            )
-        )
-        issue_activity.delay(
-            type="module.activity.deleted",
-            requested_data=json.dumps(
-                {
-                    "module_id": str(self.kwargs.get("pk")),
-                    "issues": [str(issue_id) for issue_id in module_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=None,
-        )
-
-        return super().perform_destroy(instance)
-
     def create(self, request, slug, project_id):
         try:
             project = Project.objects.get(workspace__slug=slug, pk=project_id)
@@ -180,22 +156,6 @@ class ModuleIssueViewSet(BaseViewSet):
             module_id=self.kwargs.get("module_id"),
         )
 
-    def perform_destroy(self, instance):
-        issue_activity.delay(
-            type="module.activity.deleted",
-            requested_data=json.dumps(
-                {
-                    "module_id": str(self.kwargs.get("module_id")),
-                    "issues": [str(instance.issue_id)],
-                }
-            ),
-            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=None,
-        )
-        return super().perform_destroy(instance)
-
     def get_queryset(self):
         return self.filter_queryset(
             super()
@@ -244,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
@@ -340,19 +286,21 @@ class ModuleIssueViewSet(BaseViewSet):
 
             # Capture Issue Activity
             issue_activity.delay(
-                type="module.activity.created",
-                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

@@ -96,36 +96,6 @@ class PageViewSet(BaseViewSet):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-    def partial_update(self, request, slug, project_id, pk):
-        try:
-            page = Page.objects.get(pk=pk, workspace__slug=slug, project_id=project_id)
-            # Only update access if the page owner is the requesting  user
-            if (
-                page.access != request.data.get("access", page.access)
-                and page.owned_by_id != request.user.id
-            ):
-                return Response(
-                    {
-                        "error": "Access cannot be updated since this page is owned by someone else"
-                    },
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-            serializer = PageSerializer(page, data=request.data, partial=True)
-            if serializer.is_valid():
-                serializer.save()
-                return Response(serializer.data, status=status.HTTP_200_OK)
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-        except Page.DoesNotExist:
-            return Response(
-                {"error": "Page Does not exist"}, status=status.HTTP_400_BAD_REQUEST
-            )
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
 
 class PageBlockViewSet(BaseViewSet):
     serializer_class = PageBlockSerializer
@@ -374,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,17 +66,6 @@ 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:

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
@@ -27,10 +27,9 @@ from plane.db.models import (
     User,
 )
 from .workspace_invitation_task import workspace_invitation
-from plane.bgtasks.user_welcome_task import send_welcome_email
 
 
-@shared_task
+@job("default")
 def service_importer(service, importer_id):
     try:
         importer = Importer.objects.get(pk=importer_id)
@@ -39,64 +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 users
-            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(
             [
-                send_welcome_email.delay(
-                    str(user.id),
-                    True,
-                    f"{user.email} was imported to Plane from {service}",
+                User(
+                    email=user.get("email").strip().lower(),
+                    username=uuid.uuid4().hex,
+                    password=make_password(uuid.uuid4().hex),
+                    is_password_autoset=True,
                 )
-                for user in new_users
+                for user in users
+                if user.get("import", False) == "invite"
+            ],
+            batch_size=10,
+            ignore_conflicts=True,
+        )
+
+        workspace_users = User.objects.filter(
+            email__in=[
+                user.get("email").strip().lower()
+                for user in users
+                if user.get("import", False) == "invite"
+                or user.get("import", False) == "map"
             ]
+        )
 
-            workspace_users = User.objects.filter(
-                email__in=[
-                    user.get("email").strip().lower()
-                    for user in users
-                    if user.get("import", False) == "invite"
-                    or user.get("import", False) == "map"
-                ]
-            )
 
-            # Add new users to Workspace and project automatically
-            WorkspaceMember.objects.bulk_create(
-                [
-                    WorkspaceMember(member=user, workspace_id=importer.workspace_id)
-                    for user in workspace_users
-                ],
-                batch_size=100,
-                ignore_conflicts=True,
-            )
+        # Add new users to Workspace and project automatically
+        WorkspaceMember.objects.bulk_create(
+            [
+                WorkspaceMember(member=user, workspace_id=importer.workspace_id)
+                for user in workspace_users
+            ],
+            batch_size=100,
+            ignore_conflicts=True,
+        )
 
-            ProjectMember.objects.bulk_create(
-                [
-                    ProjectMember(
-                        project_id=importer.project_id,
-                        workspace_id=importer.workspace_id,
-                        member=user,
-                    )
-                    for user in workspace_users
-                ],
-                batch_size=100,
-                ignore_conflicts=True,
-            )
+        ProjectMember.objects.bulk_create(
+            [
+                ProjectMember(
+                    project_id=importer.project_id,
+                    workspace_id=importer.workspace_id,
+                    member=user,
+                )
+                for user in workspace_users
+            ],
+            batch_size=100,
+            ignore_conflicts=True,
+        )
 
         # Check if sync config is on for github importers
         if service == "github" and importer.config.get("sync", False):

apiserver/plane/bgtasks/issue_activites_task.py

@@ -7,7 +7,7 @@ from django.conf import settings
 from django.core.serializers.json import DjangoJSONEncoder
 
 # Third Party imports
-from 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
@@ -506,181 +505,14 @@ def track_blockings(
                 )
 
 
-def create_issue_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities
+def track_cycles(
+    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} created the issue",
-            verb="created",
-            actor=actor,
-        )
-    )
-
-
-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
-):
-    ISSUE_ACTIVITY_MAPPER = {
-        "name": track_name,
-        "parent": track_parent,
-        "priority": track_priority,
-        "state": track_state,
-        "description": track_description,
-        "target_date": track_target_date,
-        "start_date": track_start_date,
-        "labels_list": track_labels,
-        "assignees_list": track_assignees,
-        "blocks_list": track_blocks,
-        "blockers_list": track_blockings,
-        "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:
-            func(
-                requested_data,
-                current_instance,
-                issue_id,
-                project,
-                actor,
-                issue_activities,
-            )
-
-
-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,
-            project=project,
-            workspace=project.workspace,
-            comment=f"{actor.email} created a comment",
-            verb="created",
-            actor=actor,
-            field="comment",
-            new_value=requested_data.get("comment_html", ""),
-            new_identifier=requested_data.get("id", None),
-            issue_comment_id=requested_data.get("id", None),
-        )
-    )
-
-
-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(
-                issue_id=issue_id,
-                project=project,
-                workspace=project.workspace,
-                comment=f"{actor.email} updated a comment",
-                verb="updated",
-                actor=actor,
-                field="comment",
-                old_value=current_instance.get("comment_html", ""),
-                old_identifier=current_instance.get("id"),
-                new_value=requested_data.get("comment_html", ""),
-                new_identifier=current_instance.get("id", None),
-                issue_comment_id=current_instance.get("id", None),
-            )
-        )
-
-
-def delete_comment_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 comment",
-            verb="deleted",
-            actor=actor,
-            field="comment",
-        )
-    )
-
-
-def create_cycle_issue_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
-    )
-
     # Updated Records:
     updated_records = current_instance.get("updated_cycle_issues", [])
     created_records = json.loads(current_instance.get("created_cycle_issues", []))
@@ -730,43 +562,14 @@ def create_cycle_issue_activity(
         )
 
 
-def delete_cycle_issue_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities
+def track_modules(
+    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
-    )
-
-    cycle_id = requested_data.get("cycle_id", "")
-    cycle = Cycle.objects.filter(pk=cycle_id).first()
-    issues = requested_data.get("issues")
-
-    for issue in issues:
-        issue_activities.append(
-            IssueActivity(
-                issue_id=issue,
-                actor=actor,
-                verb="deleted",
-                old_value=cycle.name if cycle is not None else "",
-                new_value="",
-                field="cycles",
-                project=project,
-                workspace=project.workspace,
-                comment=f"{actor.email} removed this issue from {cycle.name if cycle is not None else None}",
-                old_identifier=cycle.id if cycle is not None else None,
-            )
-        )
-
-
-def create_module_issue_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
-    )
-
     # Updated Records:
     updated_records = current_instance.get("updated_module_issues", [])
     created_records = json.loads(current_instance.get("created_module_issues", []))
@@ -815,124 +618,109 @@ def create_module_issue_activity(
         )
 
 
-def delete_module_issue_activity(
+def create_issue_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
-    )
-
-    module_id = requested_data.get("module_id", "")
-    module = Module.objects.filter(pk=module_id).first()
-    issues = requested_data.get("issues")
-
-    for issue in issues:
-        issue_activities.append(
-            IssueActivity(
-                issue_id=issue,
-                actor=actor,
-                verb="deleted",
-                old_value=module.name if module is not None else "",
-                new_value="",
-                field="modules",
-                project=project,
-                workspace=project.workspace,
-                comment=f"{actor.email} removed this issue from {module.name if module is not None else None}",
-                old_identifier=module.id if module is not None else None,
-            )
-        )
-
-
-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",
+            comment=f"{actor.email} created the issue",
             verb="created",
             actor=actor,
-            field="link",
-            new_value=requested_data.get("url", ""),
-            new_identifier=requested_data.get("id", None),
         )
     )
 
 
-def update_link_activity(
+def update_issue_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_ACTIVITY_MAPPER = {
+        "name": track_name,
+        "parent": track_parent,
+        "priority": track_priority,
+        "state": track_state,
+        "description": track_description,
+        "target_date": track_target_date,
+        "start_date": track_start_date,
+        "labels_list": track_labels,
+        "assignees_list": track_assignees,
+        "blocks_list": track_blocks,
+        "blockers_list": track_blockings,
+        "cycles_list": track_cycles,
+        "modules_list": track_modules,
+    }
+    for key in requested_data:
+        func = ISSUE_ACTIVITY_MAPPER.get(key, None)
+        if func is not None:
+            func(
+                requested_data,
+                current_instance,
+                issue_id,
+                project,
+                actor,
+                issue_activities,
+            )
+
+
+def create_comment_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} created a comment",
+            verb="created",
+            actor=actor,
+            field="comment",
+            new_value=requested_data.get("comment_html", ""),
+            new_identifier=requested_data.get("id", None),
+            issue_comment_id=requested_data.get("id", None),
+        )
     )
 
-    if current_instance.get("url") != requested_data.get("url"):
+
+def update_comment_activity(
+    requested_data, current_instance, issue_id, project, actor, issue_activities
+):
+    if current_instance.get("comment_html") != requested_data.get("comment_html"):
         issue_activities.append(
             IssueActivity(
                 issue_id=issue_id,
                 project=project,
                 workspace=project.workspace,
-                comment=f"{actor.email} updated a link",
+                comment=f"{actor.email} updated a comment",
                 verb="updated",
                 actor=actor,
-                field="link",
-                old_value=current_instance.get("url", ""),
+                field="comment",
+                old_value=current_instance.get("comment_html", ""),
                 old_identifier=current_instance.get("id"),
-                new_value=requested_data.get("url", ""),
+                new_value=requested_data.get("comment_html", ""),
                 new_identifier=current_instance.get("id", None),
+                issue_comment_id=current_instance.get("id", None),
             )
         )
 
 
-def delete_link_activity(
+def delete_issue_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",
+            comment=f"{actor.email} deleted the issue",
             verb="deleted",
             actor=actor,
-            field="link",
+            field="issue",
         )
     )
 
 
-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(
+def delete_comment_activity(
     requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
     issue_activities.append(
@@ -940,23 +728,36 @@ def delete_attachment_activity(
             issue_id=issue_id,
             project=project,
             workspace=project.workspace,
-            comment=f"{actor.email} deleted the attachment",
+            comment=f"{actor.email} deleted the comment",
             verb="deleted",
             actor=actor,
-            field="attachment",
+            field="comment",
         )
     )
 
 
 # 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 = {
@@ -966,15 +767,6 @@ def issue_activity(
             "comment.activity.created": create_comment_activity,
             "comment.activity.updated": update_comment_activity,
             "comment.activity.deleted": delete_comment_activity,
-            "cycle.activity.created": create_cycle_issue_activity,
-            "cycle.activity.deleted": delete_cycle_issue_activity,
-            "module.activity.created": create_module_issue_activity,
-            "module.activity.deleted": delete_module_issue_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/user_welcome_task.py

@@ -1,56 +0,0 @@
-# Django imports
-from django.conf import settings
-from django.core.mail import EmailMultiAlternatives
-from django.template.loader import render_to_string
-from django.utils.html import strip_tags
-
-# Third party imports
-from celery import shared_task
-from sentry_sdk import capture_exception
-from slack_sdk import WebClient
-from slack_sdk.errors import SlackApiError
-
-# Module imports
-from plane.db.models import User
-
-
-@shared_task
-def send_welcome_email(user_id, created, message):
-    try:
-        instance = User.objects.get(pk=user_id)
-
-        if created and not instance.is_bot:
-            first_name = instance.first_name.capitalize()
-            to_email = instance.email
-            from_email_string = settings.EMAIL_FROM
-
-            subject = f"Welcome to Plane ✈️!"
-
-            context = {"first_name": first_name, "email": instance.email}
-
-            html_content = render_to_string(
-                "emails/auth/user_welcome_email.html", context
-            )
-
-            text_content = strip_tags(html_content)
-
-            msg = EmailMultiAlternatives(
-                subject, text_content, from_email_string, [to_email]
-            )
-            msg.attach_alternative(html_content, "text/html")
-            msg.send()
-
-            # Send message on slack as well
-            if settings.SLACK_BOT_TOKEN:
-                client = WebClient(token=settings.SLACK_BOT_TOKEN)
-                try:
-                    _ = client.chat_postMessage(
-                        channel="#trackers",
-                        text=message,
-                    )
-                except SlackApiError as e:
-                    print(f"Got an error: {e.response['error']}")
-        return
-    except Exception as 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/migrations/0029_auto_20230502_0126.py

@@ -1,58 +0,0 @@
-# Generated by Django 3.2.18 on 2023-05-01 19:56
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0028_auto_20230414_1703'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='cycle',
-            name='view_props',
-            field=models.JSONField(default=dict),
-        ),
-        migrations.AddField(
-            model_name='importer',
-            name='imported_data',
-            field=models.JSONField(null=True),
-        ),
-        migrations.AddField(
-            model_name='module',
-            name='view_props',
-            field=models.JSONField(default=dict),
-        ),
-        migrations.CreateModel(
-            name='SlackProjectSync',
-            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)),
-                ('access_token', models.CharField(max_length=300)),
-                ('scopes', models.TextField()),
-                ('bot_user_id', models.CharField(max_length=50)),
-                ('webhook_url', models.URLField(max_length=1000)),
-                ('data', models.JSONField(default=dict)),
-                ('team_id', models.CharField(max_length=30)),
-                ('team_name', models.CharField(max_length=300)),
-                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='slackprojectsync_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
-                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_slackprojectsync', to='db.project')),
-                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='slackprojectsync_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_slackprojectsync', to='db.workspace')),
-                ('workspace_integration', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='slack_syncs', to='db.workspaceintegration')),
-            ],
-            options={
-                'verbose_name': 'Slack Project Sync',
-                'verbose_name_plural': 'Slack Project Syncs',
-                'db_table': 'slack_project_syncs',
-                'ordering': ('-created_at',),
-                'unique_together': {('team_id', 'project')},
-            },
-        ),
-    ]

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
@@ -59,11 +57,8 @@ from .integration import (
     GithubRepositorySync,
     GithubIssueSync,
     GithubCommentSync,
-    SlackProjectSync,
 )
 
 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/cycle.py

@@ -16,7 +16,6 @@ class Cycle(ProjectBaseModel):
         on_delete=models.CASCADE,
         related_name="owned_by_cycle",
     )
-    view_props = models.JSONField(default=dict)
 
     class Meta:
         verbose_name = "Cycle"

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/importer.py

@@ -33,7 +33,6 @@ class Importer(ProjectBaseModel):
     token = models.ForeignKey(
         "db.APIToken", on_delete=models.CASCADE, related_name="importer"
     )
-    imported_data = models.JSONField(null=True)
 
     class Meta:
         verbose_name = "Importer"

apiserver/plane/db/models/integration/__init__.py

@@ -1,3 +1,2 @@
 from .base import Integration, WorkspaceIntegration
 from .github import GithubRepository, GithubRepositorySync, GithubIssueSync, GithubCommentSync
-from .slack import SlackProjectSync

apiserver/plane/db/models/integration/slack.py

@@ -1,32 +0,0 @@
-# Python imports
-import uuid
-
-# Django imports
-from django.db import models
-
-# Module imports
-from plane.db.models import ProjectBaseModel
-
-
-class SlackProjectSync(ProjectBaseModel):
-    access_token = models.CharField(max_length=300)
-    scopes = models.TextField()
-    bot_user_id = models.CharField(max_length=50)
-    webhook_url = models.URLField(max_length=1000)
-    data = models.JSONField(default=dict)
-    team_id = models.CharField(max_length=30)
-    team_name = models.CharField(max_length=300)
-    workspace_integration = models.ForeignKey(
-        "db.WorkspaceIntegration", related_name="slack_syncs", on_delete=models.CASCADE
-    )
-
-    def __str__(self):
-        """Return the repo name"""
-        return f"{self.project.name}"
-
-    class Meta:
-        unique_together = ["team_id", "project"]
-        verbose_name = "Slack Project Sync"
-        verbose_name_plural = "Slack Project Syncs"
-        db_table = "slack_project_syncs"
-        ordering = ("-created_at",)

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/module.py

@@ -39,7 +39,6 @@ class Module(ProjectBaseModel):
         through="ModuleMember",
         through_fields=("module", "member"),
     )
-    view_props = models.JSONField(default=dict)
 
     class Meta:
         unique_together = ["name", "project"]

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 = {
@@ -80,7 +79,7 @@ AWS_S3_BUCKET_NAME = os.environ.get("AWS_S3_BUCKET_NAME")
 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 = ""
@@ -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_filters.py

@@ -13,17 +13,6 @@ def filter_state(params, filter, method):
     return filter
 
 
-def filter_estimate_point(params, filter, method):
-    if method == "GET":
-        estimate_points = params.get("estimate_point").split(",")
-        if len(estimate_points) and "" not in estimate_points:
-            filter["estimate_point__in"] = estimate_points
-    else:
-        if params.get("estimate_point", None) and len(params.get("estimate_point")):
-            filter["estimate_point__in"] = params.get("estimate_point")
-    return filter
-
-
 def filter_priority(params, filter, method):
     if method == "GET":
         priorties = params.get("priority").split(",")
@@ -203,7 +192,6 @@ def issue_filters(query_params, method):
 
     ISSUE_FILTER = {
         "state": filter_state,
-        "estimate_point": filter_estimate_point,
         "priority": filter_priority,
         "parent": filter_parent,
         "labels": filter_labels,

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>

apps/app/.env.example

@@ -0,0 +1,8 @@
+# Replace with your instance Public IP
+# NEXT_PUBLIC_API_BASE_URL = "http://localhost"
+NEXT_PUBLIC_GOOGLE_CLIENTID=""
+NEXT_PUBLIC_GITHUB_APP_NAME=""
+NEXT_PUBLIC_GITHUB_ID=""
+NEXT_PUBLIC_SENTRY_DSN=""
+NEXT_PUBLIC_ENABLE_OAUTH=0
+NEXT_PUBLIC_ENABLE_SENTRY=0

apps/app/Dockerfile.web

@@ -3,7 +3,6 @@ RUN apk add --no-cache libc6-compat
 RUN apk update
 # Set working directory
 WORKDIR /app
-ENV NEXT_PUBLIC_API_BASE_URL=http://NEXT_PUBLIC_API_BASE_URL_PLACEHOLDER
 
 RUN yarn global add turbo
 COPY . .
@@ -13,10 +12,10 @@ RUN turbo prune --scope=app --docker
 # Add lockfile and package.json's of isolated subworkspace
 FROM node:18-alpine AS installer
 
+
 RUN apk add --no-cache libc6-compat
 RUN apk update
 WORKDIR /app
-ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
 
 # First install the dependencies (as they change less often)
 COPY .gitignore .gitignore
@@ -27,17 +26,9 @@ RUN yarn install
 # Build the project
 COPY --from=builder /app/out/full/ .
 COPY turbo.json turbo.json
-COPY replace-env-vars.sh /usr/local/bin/
-USER root
-RUN chmod +x /usr/local/bin/replace-env-vars.sh
 
 RUN yarn turbo run build --filter=app
 
-ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
-    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
-
-RUN /usr/local/bin/replace-env-vars.sh http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER ${NEXT_PUBLIC_API_BASE_URL}
-
 FROM node:18-alpine AS runner
 WORKDIR /app
 
@@ -52,20 +43,8 @@ COPY --from=installer /app/apps/app/package.json .
 # Automatically leverage output traces to reduce image size
 # https://nextjs.org/docs/advanced-features/output-file-tracing
 COPY --from=installer --chown=captain:plane /app/apps/app/.next/standalone ./
-
-COPY --from=installer --chown=captain:plane /app/apps/app/.next ./apps/app/.next
-
-ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
-ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
-    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
-
-USER root
-COPY replace-env-vars.sh /usr/local/bin/
-COPY start.sh /usr/local/bin/
-RUN chmod +x /usr/local/bin/replace-env-vars.sh
-RUN chmod +x /usr/local/bin/start.sh
-
-USER captain
+# COPY --from=installer --chown=captain:plane /app/apps/app/.next/standalone/node_modules ./apps/app/node_modules
+COPY --from=installer --chown=captain:plane /app/apps/app/.next/static ./apps/app/.next/static
 
 ENV NEXT_TELEMETRY_DISABLED 1
 

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

@@ -92,13 +92,13 @@ export const EmailCodeForm = ({ onSuccess }: any) => {
     <>
       <form className="space-y-5 py-5 px-5">
         {(codeSent || codeResent) && (
-          <div className="rounded-md bg-green-500/20 p-4">
+          <div className="rounded-md bg-green-50 p-4">
             <div className="flex">
               <div className="flex-shrink-0">
-                <CheckCircleIcon className="h-5 w-5 text-green-500" aria-hidden="true" />
+                <CheckCircleIcon className="h-5 w-5 text-green-400" aria-hidden="true" />
               </div>
               <div className="ml-3">
-                <p className="text-sm font-medium text-green-500">
+                <p className="text-sm font-medium text-green-800">
                   {codeResent
                     ? "Please check your mail for new code."
                     : "Please check your mail for code."}
@@ -141,9 +141,7 @@ export const EmailCodeForm = ({ onSuccess }: any) => {
             <button
               type="button"
               className={`mt-5 flex w-full justify-end text-xs outline-none ${
-                isResendDisabled
-                  ? "cursor-default text-brand-secondary"
-                  : "cursor-pointer text-brand-accent"
+                isResendDisabled ? "cursor-default text-gray-400" : "cursor-pointer text-theme"
               } `}
               onClick={() => {
                 setIsCodeResending(true);
@@ -176,13 +174,13 @@ export const EmailCodeForm = ({ onSuccess }: any) => {
               className="w-full text-center"
               size="md"
               onClick={handleSubmit(handleSignin)}
-              disabled={!isValid && isDirty}
-              loading={isSubmitting}
+              loading={isSubmitting || (!isValid && isDirty)}
             >
               {isSubmitting ? "Signing in..." : "Sign in"}
             </PrimaryButton>
           ) : (
             <PrimaryButton
+              type="submit"
               className="w-full text-center"
               size="md"
               onClick={() => {

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

@@ -50,7 +50,7 @@ export const EmailPasswordForm = ({ onSuccess }: any) => {
         if (!error?.response?.data) return;
         Object.keys(error.response.data).forEach((key) => {
           const err = error.response.data[key];
-          console.log(err);
+          console.log("err", err);
           setError(key as keyof EmailPasswordFormValues, {
             type: "manual",
             message: Array.isArray(err) ? err.join(", ") : err,
@@ -94,9 +94,7 @@ export const EmailPasswordForm = ({ onSuccess }: any) => {
         <div className="mt-2 flex items-center justify-between">
           <div className="ml-auto text-sm">
             <Link href={"/forgot-password"}>
-              <a className="font-medium text-brand-accent hover:text-brand-accent">
-                Forgot your password?
-              </a>
+              <a className="font-medium text-theme hover:text-indigo-500">Forgot your password?</a>
             </Link>
           </div>
         </div>
@@ -104,8 +102,7 @@ export const EmailPasswordForm = ({ onSuccess }: any) => {
           <SecondaryButton
             type="submit"
             className="w-full text-center"
-            disabled={!isValid && isDirty}
-            loading={isSubmitting}
+            loading={isSubmitting || (!isValid && isDirty)}
           >
             {isSubmitting ? "Signing in..." : "Sign In"}
           </SecondaryButton>

apps/app/components/account/github-login-button.tsx

@@ -33,11 +33,11 @@ export const GithubLoginButton: FC<GithubLoginButtonProps> = (props) => {
   }, []);
 
   return (
-    <div className="w-full px-1">
+    <div className="px-1 w-full">
       <Link
         href={`https://github.com/login/oauth/authorize?client_id=${NEXT_PUBLIC_GITHUB_ID}&redirect_uri=${loginCallBackURL}&scope=read:user,user:email`}
       >
-        <button className="flex w-full items-center justify-center gap-3 rounded-md border border-brand-base p-2 text-sm font-medium text-brand-secondary duration-300 hover:bg-brand-surface-2">
+        <button className="flex w-full items-center justify-center gap-3 rounded-md border border-gray-200 p-2 text-sm font-medium text-gray-600 duration-300 hover:bg-gray-50">
           <Image src={githubImage} height={22} width={22} color="#000" alt="GitHub Logo" />
           <span>Sign In with Github</span>
         </button>

apps/app/components/account/google-login.tsx

@@ -47,7 +47,7 @@ export const GoogleLoginButton: FC<IGoogleLoginButton> = (props) => {
   return (
     <>
       <Script src="https://accounts.google.com/gsi/client" async defer onLoad={loadScript} />
-      <div className="overflow-hidden rounded" id="googleSignInButton" ref={googleSignInButton} />
+      <div className="h-12" id="googleSignInButton" ref={googleSignInButton} />
     </>
   );
 };

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

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

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

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

apps/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">You are not a member of this project</h1>
-
-      <div className="w-full max-w-md text-base text-brand-secondary">
-        <p className="mx-auto w-full text-sm md:w-3/4">
-          You are not a member of this project, but you can join this project by clicking the button
-          below.
-        </p>
-      </div>
-      <div>
-        <PrimaryButton
-          className="flex items-center gap-1"
-          loading={isJoiningProject}
-          onClick={handleJoin}
-        >
-          <AssignmentClipboardIcon height={16} width={16} color="white" />
-          {isJoiningProject ? "Joining..." : "Click to join"}
-        </PrimaryButton>
-      </div>
-    </div>
-  );
-};

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

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

apps/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="mx-auto w-1/2 text-sm text-brand-secondary">
-              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 justify-center gap-2">
-            <Link href="/invitations">
-              <a>
-                <SecondaryButton>Check pending invites</SecondaryButton>
-              </a>
-            </Link>
-            <Link href="/create-workspace">
-              <a>
-                <PrimaryButton>Create new workspace</PrimaryButton>
-              </a>
-            </Link>
-          </div>
-        </div>
-      </div>
-    </DefaultLayout>
-  );
-};

apps/app/components/breadcrumbs/index.tsx

@@ -16,18 +16,8 @@ const Breadcrumbs = ({ children }: BreadcrumbsProps) => {
       <div className="flex items-center">
         <button
           type="button"
-          className="grid h-8 w-8 flex-shrink-0 cursor-pointer place-items-center rounded border border-brand-base text-center text-sm hover:bg-brand-surface-1"
-          onClick={() => {
-            const lastTenUrls = JSON.parse(localStorage.getItem("lastTenUrls") || "[]");
-            if (lastTenUrls.length > 0) {
-              const url = lastTenUrls[1];
-              lastTenUrls.splice(0, 2);
-              localStorage.setItem("lastTenUrls", JSON.stringify(lastTenUrls));
-              router.push(url);
-            } else {
-              router.push("/");
-            }
-          }}
+          className="grid h-8 w-8 flex-shrink-0 cursor-pointer place-items-center rounded border border-gray-300 text-center text-sm hover:bg-gray-100"
+          onClick={() => router.back()}
         >
           <ArrowLeftIcon className="h-3 w-3" />
         </button>
@@ -47,7 +37,7 @@ const BreadcrumbItem: React.FC<BreadcrumbItemProps> = ({ title, link, icon }) =>
   <>
     {link ? (
       <Link href={link}>
-        <a className="border-r-2 border-brand-base px-3 text-sm">
+        <a className="border-r-2 border-gray-300 px-3 text-sm">
           <p className={`${icon ? "flex items-center gap-2" : ""}`}>
             {icon ?? null}
             {title}

apps/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>
-      ))}
-    </>
-  );
-};

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

@@ -14,7 +14,7 @@ import stateService from "services/state.service";
 // types
 import { IIssue } from "types";
 // fetch keys
-import { ISSUE_DETAILS, PROJECT_ISSUES_ACTIVITY, STATES_LIST } from "constants/fetch-keys";
+import { ISSUE_DETAILS, PROJECT_ISSUES_ACTIVITY, STATE_LIST } from "constants/fetch-keys";
 // icons
 import { CheckIcon, getStateGroupIcon } from "components/icons";
 
@@ -28,7 +28,7 @@ export const ChangeIssueState: React.FC<Props> = ({ setIsPaletteOpen, issue }) =
   const { workspaceSlug, projectId, issueId } = router.query;
 
   const { data: stateGroups, mutate: mutateIssueDetails } = useSWR(
-    workspaceSlug && projectId ? STATES_LIST(projectId as string) : null,
+    workspaceSlug && projectId ? STATE_LIST(projectId as string) : null,
     workspaceSlug && projectId
       ? () => stateService.getStates(workspaceSlug as string, projectId as string)
       : null

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

@@ -44,7 +44,6 @@ import {
   ChangeIssueState,
   ChangeIssuePriority,
   ChangeIssueAssignee,
-  ChangeInterfaceTheme,
 } from "components/command-palette";
 import { BulkDeleteIssuesModal } from "components/core";
 import { CreateUpdateCycleModal } from "components/cycles";
@@ -178,49 +177,46 @@ export const CommandPalette: React.FC = () => {
 
   const handleKeyDown = useCallback(
     (e: KeyboardEvent) => {
-      const singleShortcutKeys = ["p", "v", "d", "h", "q", "m"];
-      const { key, ctrlKey, metaKey, altKey, shiftKey } = e;
-      if (!key) return;
-      const keyPressed = key.toLowerCase();
       if (
         !(e.target instanceof HTMLTextAreaElement) &&
         !(e.target instanceof HTMLInputElement) &&
         !(e.target as Element).classList?.contains("remirror-editor")
       ) {
-        if ((ctrlKey || metaKey) && keyPressed === "k") {
+        if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === "k") {
           e.preventDefault();
           setIsPaletteOpen(true);
-        } else if ((ctrlKey || metaKey) && keyPressed === "c") {
-          if (altKey) {
+        } else if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === "c") {
+          if (e.altKey) {
             e.preventDefault();
             copyIssueUrlToClipboard();
           }
-        } else if (keyPressed === "c") {
+        } else if (e.key.toLowerCase() === "c") {
           e.preventDefault();
           setIsIssueModalOpen(true);
-        } else if ((ctrlKey || metaKey) && keyPressed === "b") {
+        } else if (e.key.toLowerCase() === "p") {
+          e.preventDefault();
+          setIsProjectModalOpen(true);
+        } else if (e.key.toLowerCase() === "v") {
+          e.preventDefault();
+          setIsCreateViewModalOpen(true);
+        } else if (e.key.toLowerCase() === "d") {
+          e.preventDefault();
+          setIsCreateUpdatePageModalOpen(true);
+        } else if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === "b") {
           e.preventDefault();
           toggleCollapsed();
-        } else if (key === "Delete") {
+        } else if (e.key.toLowerCase() === "h") {
+          e.preventDefault();
+          setIsShortcutsModalOpen(true);
+        } else if (e.key.toLowerCase() === "q") {
+          e.preventDefault();
+          setIsCreateCycleModalOpen(true);
+        } else if (e.key.toLowerCase() === "m") {
+          e.preventDefault();
+          setIsCreateModuleModalOpen(true);
+        } else if (e.key === "Delete") {
           e.preventDefault();
           setIsBulkDeleteIssuesModalOpen(true);
-        } else if (
-          singleShortcutKeys.includes(keyPressed) &&
-          (ctrlKey || metaKey || altKey || shiftKey)
-        ) {
-          e.preventDefault();
-        } else if (keyPressed === "p") {
-          setIsProjectModalOpen(true);
-        } else if (keyPressed === "v") {
-          setIsCreateViewModalOpen(true);
-        } else if (keyPressed === "d") {
-          setIsCreateUpdatePageModalOpen(true);
-        } else if (keyPressed === "h") {
-          setIsShortcutsModalOpen(true);
-        } else if (keyPressed === "q") {
-          setIsCreateCycleModalOpen(true);
-        } else if (keyPressed === "m") {
-          setIsCreateModuleModalOpen(true);
         }
       }
     },
@@ -301,11 +297,6 @@ export const CommandPalette: React.FC = () => {
     setIsCreateViewModalOpen(true);
   };
 
-  const createNewPage = () => {
-    setIsPaletteOpen(false);
-    setIsCreateUpdatePageModalOpen(true);
-  };
-
   const createNewModule = () => {
     setIsPaletteOpen(false);
     setIsCreateModuleModalOpen(true);
@@ -380,7 +371,7 @@ export const CommandPalette: React.FC = () => {
             leaveFrom="opacity-100"
             leaveTo="opacity-0"
           >
-            <div className="fixed inset-0 bg-[#131313] bg-opacity-50 transition-opacity" />
+            <div className="fixed inset-0 bg-gray-500 bg-opacity-25 transition-opacity" />
           </Transition.Child>
 
           <div className="fixed inset-0 z-30 overflow-y-auto p-4 sm:p-6 md:p-20">
@@ -393,7 +384,7 @@ export const CommandPalette: React.FC = () => {
               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 mx-auto max-w-2xl transform divide-y divide-brand-base divide-opacity-10 rounded-xl border border-brand-base bg-brand-surface-2 shadow-2xl transition-all">
+              <Dialog.Panel className="relative mx-auto max-w-2xl transform divide-y divide-gray-500 divide-opacity-10 rounded-xl bg-white shadow-2xl ring-1 ring-black ring-opacity-5 transition-all">
                 <Command
                   filter={(value, search) => {
                     if (value.toLowerCase().includes(search.toLowerCase())) return 1;
@@ -416,7 +407,7 @@ export const CommandPalette: React.FC = () => {
                 >
                   {issueId && issueDetails && (
                     <div className="flex p-3">
-                      <p className="overflow-hidden truncate rounded-md bg-brand-surface-1 p-1 px-2 text-xs font-medium text-brand-secondary">
+                      <p className="overflow-hidden truncate rounded-md bg-gray-100 p-1 px-2 text-xs font-medium text-gray-500">
                         {issueDetails.project_detail?.identifier}-{issueDetails.sequence_id}{" "}
                         {issueDetails?.name}
                       </p>
@@ -424,11 +415,11 @@ export const CommandPalette: React.FC = () => {
                   )}
                   <div className="relative">
                     <MagnifyingGlassIcon
-                      className="pointer-events-none absolute top-3.5 left-4 h-5 w-5 text-brand-secondary"
+                      className="pointer-events-none absolute top-3.5 left-4 h-5 w-5 text-gray-900 text-opacity-40"
                       aria-hidden="true"
                     />
                     <Command.Input
-                      className="w-full border-0 border-b border-brand-base bg-transparent p-4 pl-11 text-brand-base placeholder-gray-500 outline-none focus:ring-0 sm:text-sm"
+                      className="w-full border-0 border-b bg-transparent p-4 pl-11 text-gray-900 placeholder-gray-500 outline-none focus:ring-0 sm:text-sm"
                       placeholder={placeholder}
                       value={searchTerm}
                       onValueChange={(e) => {
@@ -442,9 +433,7 @@ export const CommandPalette: React.FC = () => {
                       resultsCount === 0 &&
                       searchTerm !== "" &&
                       debouncedSearchTerm !== "" && (
-                        <div className="my-4 text-center text-brand-secondary">
-                          No results found.
-                        </div>
+                        <div className="my-4 text-center text-gray-500">No results found.</div>
                       )}
 
                     {(isLoading || isSearching) && (
@@ -505,11 +494,8 @@ export const CommandPalette: React.FC = () => {
                                       value={value}
                                       className="focus:outline-none"
                                     >
-                                      <div className="flex items-center gap-2 overflow-hidden text-brand-secondary">
-                                        <Icon
-                                          className="h-4 w-4 text-brand-secondary"
-                                          color="#6b7280"
-                                        />
+                                      <div className="flex items-center gap-2 overflow-hidden text-gray-700">
+                                        <Icon className="h-4 w-4 text-gray-500" color="#6b7280" />
                                         <p className="block flex-1 truncate">{item.name}</p>
                                       </div>
                                     </Command.Item>
@@ -534,8 +520,8 @@ export const CommandPalette: React.FC = () => {
                               }}
                               className="focus:outline-none"
                             >
-                              <div className="flex items-center gap-2 text-brand-secondary">
-                                <Squares2X2Icon className="h-4 w-4 text-brand-secondary" />
+                              <div className="flex items-center gap-2 text-gray-700">
+                                <Squares2X2Icon className="h-4 w-4 text-gray-500" />
                                 Change state...
                               </div>
                             </Command.Item>
@@ -547,8 +533,8 @@ export const CommandPalette: React.FC = () => {
                               }}
                               className="focus:outline-none"
                             >
-                              <div className="flex items-center gap-2 text-brand-secondary">
-                                <ChartBarIcon className="h-4 w-4 text-brand-secondary" />
+                              <div className="flex items-center gap-2 text-gray-700">
+                                <ChartBarIcon className="h-4 w-4 text-gray-500" />
                                 Change priority...
                               </div>
                             </Command.Item>
@@ -560,8 +546,8 @@ export const CommandPalette: React.FC = () => {
                               }}
                               className="focus:outline-none"
                             >
-                              <div className="flex items-center gap-2 text-brand-secondary">
-                                <UsersIcon className="h-4 w-4 text-brand-secondary" />
+                              <div className="flex items-center gap-2 text-gray-700">
+                                <UsersIcon className="h-4 w-4 text-gray-500" />
                                 Assign to...
                               </div>
                             </Command.Item>
@@ -572,15 +558,15 @@ export const CommandPalette: React.FC = () => {
                               }}
                               className="focus:outline-none"
                             >
-                              <div className="flex items-center gap-2 text-brand-secondary">
+                              <div className="flex items-center gap-2 text-gray-700">
                                 {issueDetails?.assignees.includes(user.id) ? (
                                   <>
-                                    <UserMinusIcon className="h-4 w-4 text-brand-secondary" />
+                                    <UserMinusIcon className="h-4 w-4 text-gray-500" />
                                     Un-assign from me
                                   </>
                                 ) : (
                                   <>
-                                    <UserPlusIcon className="h-4 w-4 text-brand-secondary" />
+                                    <UserPlusIcon className="h-4 w-4 text-gray-500" />
                                     Assign to me
                                   </>
                                 )}
@@ -588,8 +574,8 @@ export const CommandPalette: React.FC = () => {
                             </Command.Item>
 
                             <Command.Item onSelect={deleteIssue} className="focus:outline-none">
-                              <div className="flex items-center gap-2 text-brand-secondary">
-                                <TrashIcon className="h-4 w-4 text-brand-secondary" />
+                              <div className="flex items-center gap-2 text-gray-700">
+                                <TrashIcon className="h-4 w-4 text-gray-500" />
                                 Delete issue
                               </div>
                             </Command.Item>
@@ -600,19 +586,16 @@ export const CommandPalette: React.FC = () => {
                               }}
                               className="focus:outline-none"
                             >
-                              <div className="flex items-center gap-2 text-brand-secondary">
-                                <LinkIcon className="h-4 w-4 text-brand-secondary" />
+                              <div className="flex items-center gap-2 text-gray-700">
+                                <LinkIcon className="h-4 w-4 text-gray-500" />
                                 Copy issue URL to clipboard
                               </div>
                             </Command.Item>
                           </>
                         )}
                         <Command.Group heading="Issue">
-                          <Command.Item
-                            onSelect={createNewIssue}
-                            className="focus:bg-brand-surface-2"
-                          >
-                            <div className="flex items-center gap-2 text-brand-secondary">
+                          <Command.Item onSelect={createNewIssue} className="focus:bg-gray-200">
+                            <div className="flex items-center gap-2 text-gray-700">
                               <LayerDiagonalIcon className="h-4 w-4" color="#6b7280" />
                               Create new issue
                             </div>
@@ -626,7 +609,7 @@ export const CommandPalette: React.FC = () => {
                               onSelect={createNewProject}
                               className="focus:outline-none"
                             >
-                              <div className="flex items-center gap-2 text-brand-secondary">
+                              <div className="flex items-center gap-2 text-gray-700">
                                 <AssignmentClipboardIcon className="h-4 w-4" color="#6b7280" />
                                 Create new project
                               </div>
@@ -642,7 +625,7 @@ export const CommandPalette: React.FC = () => {
                                 onSelect={createNewCycle}
                                 className="focus:outline-none"
                               >
-                                <div className="flex items-center gap-2 text-brand-secondary">
+                                <div className="flex items-center gap-2 text-gray-700">
                                   <ContrastIcon className="h-4 w-4" color="#6b7280" />
                                   Create new cycle
                                 </div>
@@ -655,7 +638,7 @@ export const CommandPalette: React.FC = () => {
                                 onSelect={createNewModule}
                                 className="focus:outline-none"
                               >
-                                <div className="flex items-center gap-2 text-brand-secondary">
+                                <div className="flex items-center gap-2 text-gray-700">
                                   <PeopleGroupIcon className="h-4 w-4" color="#6b7280" />
                                   Create new module
                                 </div>
@@ -665,21 +648,11 @@ export const CommandPalette: React.FC = () => {
 
                             <Command.Group heading="View">
                               <Command.Item onSelect={createNewView} className="focus:outline-none">
-                                <div className="flex items-center gap-2 text-brand-secondary">
+                                <div className="flex items-center gap-2 text-gray-700">
                                   <ViewListIcon className="h-4 w-4" color="#6b7280" />
                                   Create new view
                                 </div>
-                                <kbd>V</kbd>
-                              </Command.Item>
-                            </Command.Group>
-
-                            <Command.Group heading="Page">
-                              <Command.Item onSelect={createNewPage} className="focus:outline-none">
-                                <div className="flex items-center gap-2 text-brand-secondary">
-                                  <DocumentTextIcon className="h-4 w-4" color="#6b7280" />
-                                  Create new page
-                                </div>
-                                <kbd>D</kbd>
+                                <kbd>Q</kbd>
                               </Command.Item>
                             </Command.Group>
                           </>
@@ -694,7 +667,7 @@ export const CommandPalette: React.FC = () => {
                             }}
                             className="focus:outline-none"
                           >
-                            <div className="flex items-center gap-2 text-brand-secondary">
+                            <div className="flex items-center gap-2 text-gray-700">
                               <SettingIcon className="h-4 w-4" color="#6b7280" />
                               Search settings...
                             </div>
@@ -705,24 +678,11 @@ export const CommandPalette: React.FC = () => {
                             onSelect={createNewWorkspace}
                             className="focus:outline-none"
                           >
-                            <div className="flex items-center gap-2 text-brand-secondary">
-                              <FolderPlusIcon className="h-4 w-4 text-brand-secondary" />
+                            <div className="flex items-center gap-2 text-gray-700">
+                              <FolderPlusIcon className="h-4 w-4 text-gray-500" />
                               Create new workspace
                             </div>
                           </Command.Item>
-                          <Command.Item
-                            onSelect={() => {
-                              setPlaceholder("Change interface theme...");
-                              setSearchTerm("");
-                              setPages([...pages, "change-interface-theme"]);
-                            }}
-                            className="focus:outline-none"
-                          >
-                            <div className="flex items-center gap-2 text-brand-secondary">
-                              <SettingIcon className="h-4 w-4 text-brand-secondary" />
-                              Change interface theme...
-                            </div>
-                          </Command.Item>
                         </Command.Group>
                         <Command.Group heading="Help">
                           <Command.Item
@@ -735,8 +695,8 @@ export const CommandPalette: React.FC = () => {
                             }}
                             className="focus:outline-none"
                           >
-                            <div className="flex items-center gap-2 text-brand-secondary">
-                              <RocketLaunchIcon className="h-4 w-4 text-brand-secondary" />
+                            <div className="flex items-center gap-2 text-gray-700">
+                              <RocketLaunchIcon className="h-4 w-4 text-gray-500" />
                               Open keyboard shortcuts
                             </div>
                           </Command.Item>
@@ -747,8 +707,8 @@ export const CommandPalette: React.FC = () => {
                             }}
                             className="focus:outline-none"
                           >
-                            <div className="flex items-center gap-2 text-brand-secondary">
-                              <DocumentIcon className="h-4 w-4 text-brand-secondary" />
+                            <div className="flex items-center gap-2 text-gray-700">
+                              <DocumentIcon className="h-4 w-4 text-gray-500" />
                               Open Plane documentation
                             </div>
                           </Command.Item>
@@ -759,7 +719,7 @@ export const CommandPalette: React.FC = () => {
                             }}
                             className="focus:outline-none"
                           >
-                            <div className="flex items-center gap-2 text-brand-secondary">
+                            <div className="flex items-center gap-2 text-gray-700">
                               <DiscordIcon className="h-4 w-4" color="#6b7280" />
                               Join our Discord
                             </div>
@@ -774,7 +734,7 @@ export const CommandPalette: React.FC = () => {
                             }}
                             className="focus:outline-none"
                           >
-                            <div className="flex items-center gap-2 text-brand-secondary">
+                            <div className="flex items-center gap-2 text-gray-700">
                               <GithubIcon className="h-4 w-4" color="#6b7280" />
                               Report a bug
                             </div>
@@ -786,8 +746,8 @@ export const CommandPalette: React.FC = () => {
                             }}
                             className="focus:outline-none"
                           >
-                            <div className="flex items-center gap-2 text-brand-secondary">
-                              <ChatBubbleOvalLeftEllipsisIcon className="h-4 w-4 text-brand-secondary" />
+                            <div className="flex items-center gap-2 text-gray-700">
+                              <ChatBubbleOvalLeftEllipsisIcon className="h-4 w-4 text-gray-500" />
                               Chat with us
                             </div>
                           </Command.Item>
@@ -801,8 +761,8 @@ export const CommandPalette: React.FC = () => {
                           onSelect={() => goToSettings()}
                           className="focus:outline-none"
                         >
-                          <div className="flex items-center gap-2 text-brand-secondary">
-                            <SettingIcon className="h-4 w-4 text-brand-secondary" />
+                          <div className="flex items-center gap-2 text-gray-700">
+                            <SettingIcon className="h-4 w-4 text-gray-500" />
                             General
                           </div>
                         </Command.Item>
@@ -810,8 +770,8 @@ export const CommandPalette: React.FC = () => {
                           onSelect={() => goToSettings("members")}
                           className="focus:outline-none"
                         >
-                          <div className="flex items-center gap-2 text-brand-secondary">
-                            <SettingIcon className="h-4 w-4 text-brand-secondary" />
+                          <div className="flex items-center gap-2 text-gray-700">
+                            <SettingIcon className="h-4 w-4 text-gray-500" />
                             Members
                           </div>
                         </Command.Item>
@@ -819,8 +779,8 @@ export const CommandPalette: React.FC = () => {
                           onSelect={() => goToSettings("billing")}
                           className="focus:outline-none"
                         >
-                          <div className="flex items-center gap-2 text-brand-secondary">
-                            <SettingIcon className="h-4 w-4 text-brand-secondary" />
+                          <div className="flex items-center gap-2 text-gray-700">
+                            <SettingIcon className="h-4 w-4 text-gray-500" />
                             Billings and Plans
                           </div>
                         </Command.Item>
@@ -828,8 +788,8 @@ export const CommandPalette: React.FC = () => {
                           onSelect={() => goToSettings("integrations")}
                           className="focus:outline-none"
                         >
-                          <div className="flex items-center gap-2 text-brand-secondary">
-                            <SettingIcon className="h-4 w-4 text-brand-secondary" />
+                          <div className="flex items-center gap-2 text-gray-700">
+                            <SettingIcon className="h-4 w-4 text-gray-500" />
                             Integrations
                           </div>
                         </Command.Item>
@@ -837,8 +797,8 @@ export const CommandPalette: React.FC = () => {
                           onSelect={() => goToSettings("import-export")}
                           className="focus:outline-none"
                         >
-                          <div className="flex items-center gap-2 text-brand-secondary">
-                            <SettingIcon className="h-4 w-4 text-brand-secondary" />
+                          <div className="flex items-center gap-2 text-gray-700">
+                            <SettingIcon className="h-4 w-4 text-gray-500" />
                             Import/Export
                           </div>
                         </Command.Item>
@@ -864,9 +824,6 @@ export const CommandPalette: React.FC = () => {
                         setIsPaletteOpen={setIsPaletteOpen}
                       />
                     )}
-                    {page === "change-interface-theme" && (
-                      <ChangeInterfaceTheme setIsPaletteOpen={setIsPaletteOpen} />
-                    )}
                   </Command.List>
                 </Command>
               </Dialog.Panel>

apps/app/components/command-palette/index.ts

@@ -3,4 +3,3 @@ export * from "./shortcuts-modal";
 export * from "./change-issue-state";
 export * from "./change-issue-priority";
 export * from "./change-issue-assignee";
-export * from "./change-interface-theme";

apps/app/components/command-palette/shortcuts-modal.tsx

@@ -4,7 +4,7 @@ import { Dialog, Transition } from "@headlessui/react";
 // icons
 import { XMarkIcon } from "@heroicons/react/20/solid";
 import { MagnifyingGlassIcon } from "@heroicons/react/24/outline";
-import { CommandIcon } from "components/icons";
+import { MacCommandIcon } from "components/icons";
 // ui
 import { Input } from "components/ui";
 
@@ -71,7 +71,7 @@ export const ShortcutsModal: React.FC<Props> = ({ isOpen, setIsOpen }) => {
           leaveFrom="opacity-100"
           leaveTo="opacity-0"
         >
-          <div className="fixed inset-0 bg-[#131313] bg-opacity-50 transition-opacity" />
+          <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">
@@ -85,29 +85,29 @@ export const ShortcutsModal: React.FC<Props> = ({ isOpen, setIsOpen }) => {
               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-brand-surface-2 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-lg">
-                <div className="bg-brand-surface-2 p-5">
+              <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-lg">
+                <div className="bg-white p-5">
                   <div className="sm:flex sm:items-start">
                     <div className="flex w-full flex-col gap-y-4 text-center sm:text-left">
                       <Dialog.Title
                         as="h3"
-                        className="flex justify-between text-lg font-medium leading-6 text-brand-base"
+                        className="flex justify-between text-lg font-medium leading-6 text-gray-900"
                       >
                         <span>Keyboard Shortcuts</span>
                         <span>
                           <button type="button" onClick={() => setIsOpen(false)}>
                             <XMarkIcon
-                              className="h-6 w-6 text-gray-400 hover:text-brand-secondary"
+                              className="h-6 w-6 text-gray-400 hover:text-gray-500"
                               aria-hidden="true"
                             />
                           </button>
                         </span>
                       </Dialog.Title>
                       <div>
-                        <div className="flex w-full items-center justify-start gap-1 rounded border-[0.6px] border-brand-base bg-brand-surface-1 px-3 py-2">
-                          <MagnifyingGlassIcon className="h-3.5 w-3.5 text-brand-secondary" />
+                        <div className="flex w-full items-center justify-start gap-1 rounded border-[0.6px] border-gray-200 bg-gray-100 px-3 py-2">
+                          <MagnifyingGlassIcon className="h-3.5 w-3.5 text-gray-500" />
                           <Input
-                            className="w-full  border-none bg-transparent py-1 px-2 text-xs text-brand-secondary focus:outline-none"
+                            className="w-full  border-none bg-transparent py-1 px-2 text-xs text-gray-500 focus:outline-none"
                             id="search"
                             name="search"
                             type="text"
@@ -123,23 +123,17 @@ export const ShortcutsModal: React.FC<Props> = ({ isOpen, setIsOpen }) => {
                               <div key={shortcut.keys} className="flex w-full flex-col">
                                 <div className="flex flex-col gap-y-3">
                                   <div className="flex items-center justify-between">
-                                    <p className="text-sm text-brand-secondary">
-                                      {shortcut.description}
-                                    </p>
+                                    <p className="text-sm text-gray-500">{shortcut.description}</p>
                                     <div className="flex items-center gap-x-2.5">
                                       {shortcut.keys.split(",").map((key, index) => (
                                         <span key={index} className="flex items-center gap-1">
                                           {key === "Ctrl" ? (
-                                            <span className="flex h-full items-center rounded-sm border border-brand-base bg-brand-surface-1 p-1.5">
-                                              <CommandIcon className="h-4 w-4 fill-current text-brand-secondary" />
+                                            <span className="flex h-full items-center rounded-sm border border-gray-200 bg-gray-100 p-2">
+                                              <MacCommandIcon />
                                             </span>
-                                          ) : key === "Ctrl" ? (
-                                            <kbd className="rounded-sm border border-brand-base bg-brand-surface-1 p-1.5 text-sm font-medium text-brand-secondary">
-                                              <CommandIcon className="h-4 w-4 fill-current text-brand-secondary" />
-                                            </kbd>
                                           ) : (
-                                            <kbd className="rounded-sm border border-brand-base bg-brand-surface-1 px-2 py-1 text-sm font-medium text-brand-secondary">
-                                              {key}
+                                            <kbd className="rounded-sm border border-gray-200 bg-gray-100 px-2 py-1 text-sm font-medium text-gray-800">
+                                              {key === "Ctrl" ? <MacCommandIcon /> : key}
                                             </kbd>
                                           )}
                                         </span>
@@ -151,7 +145,7 @@ export const ShortcutsModal: React.FC<Props> = ({ isOpen, setIsOpen }) => {
                             ))
                           ) : (
                             <div className="flex flex-col gap-y-3">
-                              <p className="text-sm text-brand-secondary">
+                              <p className="text-sm text-gray-500">
                                 No shortcuts found for{" "}
                                 <span className="font-semibold italic">
                                   {`"`}
@@ -168,21 +162,17 @@ export const ShortcutsModal: React.FC<Props> = ({ isOpen, setIsOpen }) => {
                               <div className="flex flex-col gap-y-3">
                                 {shortcuts.map(({ keys, description }, index) => (
                                   <div key={index} className="flex items-center justify-between">
-                                    <p className="text-sm text-brand-secondary">{description}</p>
+                                    <p className="text-sm text-gray-500">{description}</p>
                                     <div className="flex items-center gap-x-2.5">
                                       {keys.split(",").map((key, index) => (
                                         <span key={index} className="flex items-center gap-1">
                                           {key === "Ctrl" ? (
-                                            <span className="flex h-full items-center rounded-sm border border-brand-base bg-brand-surface-1 p-1.5 text-brand-secondary">
-                                              <CommandIcon className="h-4 w-4 fill-current text-brand-secondary" />
+                                            <span className="flex h-full items-center rounded-sm border border-gray-200 bg-gray-100 p-2">
+                                              <MacCommandIcon />
                                             </span>
-                                          ) : key === "Ctrl" ? (
-                                            <kbd className="rounded-sm border border-brand-base bg-brand-surface-1 p-1.5 text-sm font-medium text-brand-secondary">
-                                              <CommandIcon className="h-4 w-4 fill-current text-brand-secondary" />
-                                            </kbd>
                                           ) : (
-                                            <kbd className="rounded-sm border border-brand-base bg-brand-surface-1 px-2 py-1 text-sm font-medium text-brand-secondary">
-                                              {key}
+                                            <kbd className="rounded-sm border border-gray-200 bg-gray-100 px-2 py-1 text-sm font-medium text-gray-800">
+                                              {key === "Ctrl" ? <MacCommandIcon /> : key}
                                             </kbd>
                                           )}
                                         </span>

apps/app/components/core/board-view/all-boards.tsx

@@ -17,7 +17,7 @@ type Props = {
   openIssuesListModal?: (() => void) | null;
   handleDeleteIssue: (issue: IIssue) => void;
   handleTrashBox: (isDragging: boolean) => void;
-  removeIssue: ((bridgeId: string, issueId: string) => void) | null;
+  removeIssue: ((bridgeId: string) => void) | null;
   isCompleted?: boolean;
   userAuth: UserAuth;
 };
@@ -81,7 +81,7 @@ export const AllBoards: React.FC<Props> = ({
                     return (
                       <div
                         key={index}
-                        className="flex items-center justify-between gap-2 rounded bg-brand-surface-1 p-2 shadow"
+                        className="flex items-center justify-between gap-2 rounded bg-white p-2 shadow"
                       >
                         <div className="flex items-center gap-2">
                           {currentState &&
@@ -92,7 +92,7 @@ export const AllBoards: React.FC<Props> = ({
                               : addSpaceIfCamelCase(singleGroup)}
                           </h4>
                         </div>
-                        <span className="text-xs text-brand-secondary">0</span>
+                        <span className="text-xs text-gray-500">0</span>
                       </div>
                     );
                 })}

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

@@ -96,17 +96,17 @@ export const BoardHeader: React.FC<Props> = ({
 
     switch (selectedGroup) {
       case "state":
-        icon = currentState && getStateGroupIcon(currentState.group, "16", "16", bgColor);
+        icon = currentState && getStateGroupIcon(currentState.group, "18", "18", bgColor);
         break;
       case "priority":
-        icon = getPriorityIcon(groupTitle, "text-lg");
+        icon = getPriorityIcon(groupTitle, "h-[18px] w-[18px] flex items-center");
         break;
       case "labels":
         const labelColor =
           issueLabels?.find((label) => label.id === groupTitle)?.color ?? "#000000";
         icon = (
           <span
-            className="h-3.5 w-3.5 flex-shrink-0 rounded-full"
+            className="h-[18px] w-[18px] flex-shrink-0 rounded-full"
             style={{ backgroundColor: labelColor }}
           />
         );
@@ -123,8 +123,8 @@ export const BoardHeader: React.FC<Props> = ({
 
   return (
     <div
-      className={`flex items-center justify-between px-1 ${
-        !isCollapsed ? "flex-col rounded-md bg-brand-surface-1" : ""
+      className={`flex justify-between items-center px-1 ${
+        !isCollapsed ? "flex-col rounded-md border bg-gray-50" : ""
       }`}
     >
       <div className={`flex items-center ${!isCollapsed ? "flex-col gap-2" : "gap-1"}`}>
@@ -142,11 +142,7 @@ export const BoardHeader: React.FC<Props> = ({
           >
             {getGroupTitle()}
           </h2>
-          <span
-            className={`${
-              isCollapsed ? "ml-0.5" : ""
-            } min-w-[2.5rem] rounded-full bg-brand-surface-2 py-1 text-center text-xs`}
-          >
+          <span className="ml-0.5 rounded-full bg-gray-100 py-1 px-3 text-sm">
             {groupedByIssues?.[groupTitle].length ?? 0}
           </span>
         </div>
@@ -155,7 +151,7 @@ export const BoardHeader: React.FC<Props> = ({
       <div className={`flex items-center ${!isCollapsed ? "flex-col pb-2" : ""}`}>
         <button
           type="button"
-          className="grid h-7 w-7 place-items-center rounded p-1 text-brand-secondary outline-none duration-300 hover:bg-brand-surface-2"
+          className="grid h-7 w-7 place-items-center rounded p-1 text-gray-700 outline-none duration-300 hover:bg-gray-100"
           onClick={() => {
             setIsCollapsed((prevData) => !prevData);
           }}
@@ -169,7 +165,7 @@ export const BoardHeader: React.FC<Props> = ({
         {!isCompleted && (
           <button
             type="button"
-            className="grid h-7 w-7 place-items-center rounded p-1 text-brand-secondary outline-none duration-300 hover:bg-brand-surface-2"
+            className="grid h-7 w-7 place-items-center rounded p-1 text-gray-700 outline-none duration-300 hover:bg-gray-100"
             onClick={addIssueToState}
           >
             <PlusIcon className="h-4 w-4" />

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

@@ -29,7 +29,7 @@ type Props = {
   handleDeleteIssue: (issue: IIssue) => void;
   openIssuesListModal?: (() => void) | null;
   handleTrashBox: (isDragging: boolean) => void;
-  removeIssue: ((bridgeId: string, issueId: string) => void) | null;
+  removeIssue: ((bridgeId: string) => void) | null;
   isCompleted?: boolean;
   userAuth: UserAuth;
 };
@@ -66,7 +66,7 @@ export const SingleBoard: React.FC<Props> = ({
   }, [currentState]);
 
   return (
-    <div className={`h-full flex-shrink-0 ${!isCollapsed ? "" : "w-96"}`}>
+    <div className={`h-full flex-shrink-0 ${!isCollapsed ? "" : "w-96 bg-gray-50"}`}>
       <div className={`${!isCollapsed ? "" : "flex h-full flex-col space-y-3"}`}>
         <BoardHeader
           addIssueToState={addIssueToState}
@@ -81,7 +81,7 @@ export const SingleBoard: React.FC<Props> = ({
             {(provided, snapshot) => (
               <div
                 className={`relative h-full overflow-y-auto p-1  ${
-                  snapshot.isDraggingOver ? "bg-brand-base/20" : ""
+                  snapshot.isDraggingOver ? "bg-indigo-50 bg-opacity-50" : ""
                 } ${!isCollapsed ? "hidden" : "block"}`}
                 ref={provided.innerRef}
                 {...provided.droppableProps}
@@ -91,17 +91,15 @@ export const SingleBoard: React.FC<Props> = ({
                     <div
                       className={`absolute ${
                         snapshot.isDraggingOver ? "block" : "hidden"
-                      } pointer-events-none top-0 left-0 z-[99] h-full w-full bg-brand-surface-1 opacity-50`}
+                      } pointer-events-none top-0 left-0 z-[99] h-full w-full bg-gray-100 opacity-50`}
                     />
                     <div
                       className={`absolute ${
                         snapshot.isDraggingOver ? "block" : "hidden"
-                      } pointer-events-none top-1/2 left-1/2 z-[99] -translate-y-1/2 -translate-x-1/2 whitespace-nowrap rounded bg-brand-base p-2 text-xs`}
+                      } pointer-events-none top-1/2 left-1/2 z-[99] -translate-y-1/2 -translate-x-1/2 whitespace-nowrap rounded bg-white p-2 text-xs`}
                     >
                       This board is ordered by{" "}
-                      {replaceUnderscoreIfSnakeCase(
-                        orderBy ? (orderBy[0] === "-" ? orderBy.slice(1) : orderBy) : "created_at"
-                      )}
+                      {replaceUnderscoreIfSnakeCase(orderBy ?? "created_at")}
                     </div>
                   </>
                 )}
@@ -110,9 +108,7 @@ export const SingleBoard: React.FC<Props> = ({
                     key={issue.id}
                     draggableId={issue.id}
                     index={index}
-                    isDragDisabled={
-                      isNotAllowed || selectedGroup === "created_by" || selectedGroup === "labels"
-                    }
+                    isDragDisabled={isNotAllowed || selectedGroup === "created_by"}
                   >
                     {(provided, snapshot) => (
                       <SingleBoardIssue
@@ -130,8 +126,7 @@ export const SingleBoard: React.FC<Props> = ({
                         handleDeleteIssue={handleDeleteIssue}
                         handleTrashBox={handleTrashBox}
                         removeIssue={() => {
-                          if (removeIssue && issue.bridge_id)
-                            removeIssue(issue.bridge_id, issue.id);
+                          if (removeIssue && issue.bridge_id) removeIssue(issue.bridge_id);
                         }}
                         isCompleted={isCompleted}
                         userAuth={userAuth}
@@ -149,7 +144,7 @@ export const SingleBoard: React.FC<Props> = ({
                 {type === "issue" ? (
                   <button
                     type="button"
-                    className="flex items-center gap-2 font-medium text-brand-accent outline-none"
+                    className="flex items-center gap-2 font-medium text-theme outline-none"
                     onClick={addIssueToState}
                   >
                     <PlusIcon className="h-4 w-4" />
@@ -161,7 +156,7 @@ export const SingleBoard: React.FC<Props> = ({
                       customButton={
                         <button
                           type="button"
-                          className="flex items-center gap-2 font-medium text-brand-accent outline-none"
+                          className="flex items-center gap-2 font-medium text-theme outline-none"
                         >
                           <PlusIcon className="h-4 w-4" />
                           Add Issue

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

@@ -21,12 +21,11 @@ import useToast from "hooks/use-toast";
 import {
   ViewAssigneeSelect,
   ViewDueDateSelect,
-  ViewEstimateSelect,
   ViewPrioritySelect,
   ViewStateSelect,
-} from "components/issues";
+} from "components/issues/view-select";
 // ui
-import { ContextMenu, CustomMenu, Tooltip } from "components/ui";
+import { ContextMenu, CustomMenu } from "components/ui";
 // icons
 import {
   ClipboardDocumentCheckIcon,
@@ -35,7 +34,7 @@ import {
   TrashIcon,
   XMarkIcon,
   ArrowTopRightOnSquareIcon,
-  PaperClipIcon,
+
 } from "@heroicons/react/24/outline";
 // helpers
 import { handleIssuesMutation } from "constants/issue";
@@ -110,14 +109,7 @@ export const SingleBoardIssue: React.FC<Props> = ({
         >(
           CYCLE_ISSUES_WITH_PARAMS(cycleId as string, params),
           (prevData) =>
-            handleIssuesMutation(
-              formData,
-              groupTitle ?? "",
-              selectedGroup,
-              index,
-              orderBy,
-              prevData
-            ),
+            handleIssuesMutation(formData, groupTitle ?? "", selectedGroup, index, prevData),
           false
         );
       else if (moduleId)
@@ -129,17 +121,10 @@ export const SingleBoardIssue: React.FC<Props> = ({
         >(
           MODULE_ISSUES_WITH_PARAMS(moduleId as string),
           (prevData) =>
-            handleIssuesMutation(
-              formData,
-              groupTitle ?? "",
-              selectedGroup,
-              index,
-              orderBy,
-              prevData
-            ),
+            handleIssuesMutation(formData, groupTitle ?? "", selectedGroup, index, prevData),
           false
         );
-      else {
+      else
         mutate<
           | {
               [key: string]: IIssue[];
@@ -147,21 +132,10 @@ export const SingleBoardIssue: React.FC<Props> = ({
           | IIssue[]
         >(
           PROJECT_ISSUES_LIST_WITH_PARAMS(projectId as string, params),
-          (prevData) => {
-            if (!prevData) return prevData;
-
-            return handleIssuesMutation(
-              formData,
-              groupTitle ?? "",
-              selectedGroup,
-              index,
-              orderBy,
-              prevData
-            );
-          },
+          (prevData) =>
+            handleIssuesMutation(formData, groupTitle ?? "", selectedGroup, index, prevData),
           false
         );
-      }
 
       issuesService
         .patchIssue(workspaceSlug as string, projectId as string, issue.id, formData)
@@ -178,18 +152,7 @@ export const SingleBoardIssue: React.FC<Props> = ({
           console.log(error);
         });
     },
-    [
-      workspaceSlug,
-      projectId,
-      cycleId,
-      moduleId,
-      issue,
-      groupTitle,
-      index,
-      selectedGroup,
-      orderBy,
-      params,
-    ]
+    [workspaceSlug, projectId, cycleId, moduleId, issue, groupTitle, index, selectedGroup, params]
   );
 
   const getStyle = (
@@ -261,8 +224,8 @@ export const SingleBoardIssue: React.FC<Props> = ({
         </a>
       </ContextMenu>
       <div
-        className={`mb-3 rounded bg-brand-base shadow ${
-          snapshot.isDragging ? "border-2 border-brand-accent shadow-lg" : ""
+        className={`mb-3 rounded bg-white shadow ${
+          snapshot.isDragging ? "border-2 border-theme shadow-lg" : ""
         }`}
         ref={provided.innerRef}
         {...provided.draggableProps}
@@ -312,12 +275,12 @@ export const SingleBoardIssue: React.FC<Props> = ({
           <Link href={`/${workspaceSlug}/projects/${issue.project}/issues/${issue.id}`}>
             <a>
               {properties.key && (
-                <div className="mb-2.5 text-xs font-medium text-brand-secondary">
+                <div className="mb-2.5 text-xs font-medium text-gray-700">
                   {issue.project_detail.identifier}-{issue.sequence_id}
                 </div>
               )}
               <h5
-                className="break-all text-sm group-hover:text-brand-accent"
+                className="break-all text-sm group-hover:text-theme"
                 style={{ lineClamp: 3, WebkitLineClamp: 3 }}
               >
                 {truncateText(issue.name, 100)}
@@ -349,7 +312,7 @@ export const SingleBoardIssue: React.FC<Props> = ({
               />
             )}
             {properties.sub_issue_count && (
-              <div className="flex flex-shrink-0 items-center gap-1 rounded-md border border-brand-base px-2 py-1 text-xs text-brand-secondary shadow-sm">
+              <div className="flex flex-shrink-0 items-center gap-1 rounded-md border px-3 py-1.5 text-xs shadow-sm">
                 {issue.sub_issues_count} {issue.sub_issues_count === 1 ? "sub-issue" : "sub-issues"}
               </div>
             )}
@@ -358,7 +321,7 @@ export const SingleBoardIssue: React.FC<Props> = ({
                 {issue.label_details.map((label) => (
                   <div
                     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"
+                    className="group flex items-center gap-1 rounded-2xl border px-2 py-0.5 text-xs"
                   >
                     <span
                       className="h-1.5 w-1.5 flex-shrink-0 rounded-full"
@@ -380,34 +343,6 @@ export const SingleBoardIssue: React.FC<Props> = ({
                 selfPositioned
               />
             )}
-            {properties.estimate && (
-              <ViewEstimateSelect
-                issue={issue}
-                partialUpdateIssue={partialUpdateIssue}
-                isNotAllowed={isNotAllowed}
-                selfPositioned
-              />
-            )}
-            {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="Link" tooltipContent={`${issue.link_count}`}>
-                  <div className="flex items-center gap-1 text-brand-secondary">
-                    <LinkIcon className="h-3.5 w-3.5 text-brand-secondary" />
-                    {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="Attachment" tooltipContent={`${issue.attachment_count}`}>
-                  <div className="flex items-center gap-1 text-brand-secondary">
-                    <PaperClipIcon className="h-3.5 w-3.5 -rotate-45 text-brand-secondary" />
-                    {issue.attachment_count}
-                  </div>
-                </Tooltip>
-              </div>
-            )}
           </div>
         </div>
       </div>

apps/app/components/core/bulk-delete-issues-modal.tsx

@@ -121,7 +121,7 @@ export const BulkDeleteIssuesModal: React.FC<Props> = ({ isOpen, setIsOpen }) =>
             leaveFrom="opacity-100 scale-100"
             leaveTo="opacity-0 scale-95"
           >
-            <Dialog.Panel className="relative mx-auto max-w-2xl transform divide-y divide-gray-500 divide-opacity-10 rounded-xl bg-brand-surface-2 shadow-2xl ring-1 ring-black ring-opacity-5 transition-all">
+            <Dialog.Panel className="relative mx-auto max-w-2xl transform divide-y divide-gray-500 divide-opacity-10 rounded-xl bg-white shadow-2xl ring-1 ring-black ring-opacity-5 transition-all">
               <form>
                 <Combobox
                   onChange={(val: string) => {
@@ -136,12 +136,12 @@ export const BulkDeleteIssuesModal: React.FC<Props> = ({ isOpen, setIsOpen }) =>
                 >
                   <div className="relative m-1">
                     <MagnifyingGlassIcon
-                      className="pointer-events-none absolute top-3.5 left-4 h-5 w-5 text-brand-base text-opacity-40"
+                      className="pointer-events-none absolute top-3.5 left-4 h-5 w-5 text-gray-900 text-opacity-40"
                       aria-hidden="true"
                     />
                     <input
                       type="text"
-                      className="h-12 w-full border-0 bg-transparent pl-11 pr-4 text-brand-base placeholder-gray-500 outline-none focus:ring-0 sm:text-sm"
+                      className="h-12 w-full border-0 bg-transparent pl-11 pr-4 text-gray-900 placeholder-gray-500 outline-none focus:ring-0 sm:text-sm"
                       placeholder="Search..."
                       onChange={(event) => setQuery(event.target.value)}
                     />
@@ -154,7 +154,7 @@ export const BulkDeleteIssuesModal: React.FC<Props> = ({ isOpen, setIsOpen }) =>
                     {filteredIssues.length > 0 ? (
                       <li className="p-2">
                         {query === "" && (
-                          <h2 className="mt-4 mb-2 px-3 text-xs font-semibold text-brand-base">
+                          <h2 className="mt-4 mb-2 px-3 text-xs font-semibold text-gray-900">
                             Select issues to delete
                           </h2>
                         )}
@@ -166,7 +166,7 @@ export const BulkDeleteIssuesModal: React.FC<Props> = ({ isOpen, setIsOpen }) =>
                               value={issue.id}
                               className={({ active }) =>
                                 `flex cursor-pointer select-none items-center justify-between rounded-md px-3 py-2 ${
-                                  active ? "bg-gray-900 bg-opacity-5 text-brand-base" : ""
+                                  active ? "bg-gray-900 bg-opacity-5 text-gray-900" : ""
                                 }`
                               }
                             >
@@ -182,7 +182,7 @@ export const BulkDeleteIssuesModal: React.FC<Props> = ({ isOpen, setIsOpen }) =>
                                     backgroundColor: issue.state_detail.color,
                                   }}
                                 />
-                                <span className="flex-shrink-0 text-xs text-brand-secondary">
+                                <span className="flex-shrink-0 text-xs text-gray-500">
                                   {issue.project_detail.identifier}-{issue.sequence_id}
                                 </span>
                                 <span>{issue.name}</span>
@@ -194,9 +194,9 @@ export const BulkDeleteIssuesModal: React.FC<Props> = ({ isOpen, setIsOpen }) =>
                     ) : (
                       <div className="flex flex-col items-center justify-center gap-4 px-3 py-8 text-center">
                         <LayerDiagonalIcon height="56" width="56" />
-                        <h3 className="text-brand-secondary">
+                        <h3 className="text-gray-500">
                           No issues found. Create a new issue with{" "}
-                          <pre className="inline rounded bg-brand-surface-2 px-2 py-1">C</pre>.
+                          <pre className="inline rounded bg-gray-200 px-2 py-1">C</pre>.
                         </h3>
                       </div>
                     )}

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

@@ -26,17 +26,14 @@ import {
 import { Popover, Transition } from "@headlessui/react";
 import { DragDropContext, Draggable, DropResult } from "react-beautiful-dnd";
 import StrictModeDroppable from "components/dnd/StrictModeDroppable";
-import { CustomMenu, Spinner, ToggleSwitch } from "components/ui";
+import { CustomMenu } from "components/ui";
 // icon
 import {
   CheckIcon,
   ChevronDownIcon,
   ChevronLeftIcon,
   ChevronRightIcon,
-  PlusIcon,
 } from "@heroicons/react/24/outline";
-// hooks
-import useIssuesView from "hooks/use-issues-view";
 // services
 import issuesService from "services/issues.service";
 import cyclesService from "services/cycles.service";
@@ -51,28 +48,20 @@ import { IIssue } from "types";
 // constant
 import { monthOptions, yearOptions } from "constants/calendar";
 import modulesService from "services/modules.service";
-import { getStateGroupIcon } from "components/icons";
-
-type Props = {
-  addIssueToDate: (date: string) => void;
-};
 
 interface ICalendarRange {
   startDate: Date;
   endDate: Date;
 }
 
-export const CalendarView: React.FC<Props> = ({ addIssueToDate }) => {
-  const [showWeekEnds, setShowWeekEnds] = useState(false);
-  const [currentDate, setCurrentDate] = useState(new Date());
-  const [isMonthlyView, setIsMonthlyView] = useState(true);
-  const [showAllIssues, setShowAllIssues] = useState(false);
+export const CalendarView = () => {
+  const [showWeekEnds, setShowWeekEnds] = useState<boolean>(false);
+  const [currentDate, setCurrentDate] = useState<Date>(new Date());
+  const [isMonthlyView, setIsMonthlyView] = useState<boolean>(true);
 
   const router = useRouter();
   const { workspaceSlug, projectId, cycleId, moduleId } = router.query;
 
-  const { params } = useIssuesView();
-
   const [calendarDateRange, setCalendarDateRange] = useState<ICalendarRange>({
     startDate: startOfWeek(currentDate),
     endDate: lastDayOfWeek(currentDate),
@@ -88,13 +77,11 @@ export const CalendarView: React.FC<Props> = ({ addIssueToDate }) => {
     workspaceSlug && projectId ? PROJECT_CALENDAR_ISSUES(projectId as string) : null,
     workspaceSlug && projectId
       ? () =>
-          issuesService.getIssuesWithParams(workspaceSlug as string, projectId as string, {
-            ...params,
-            target_date: `${renderDateFormat(calendarDateRange.startDate)};after,${renderDateFormat(
-              calendarDateRange.endDate
-            )};before`,
-            group_by: null,
-          })
+          issuesService.getIssuesWithParams(
+            workspaceSlug as string,
+            projectId as string,
+            targetDateFilter
+          )
       : null
   );
 
@@ -108,13 +95,7 @@ export const CalendarView: React.FC<Props> = ({ addIssueToDate }) => {
             workspaceSlug as string,
             projectId as string,
             cycleId as string,
-            {
-              ...params,
-              target_date: `${renderDateFormat(
-                calendarDateRange.startDate
-              )};after,${renderDateFormat(calendarDateRange.endDate)};before`,
-              group_by: null,
-            }
+            targetDateFilter
           )
       : null
   );
@@ -129,13 +110,7 @@ export const CalendarView: React.FC<Props> = ({ addIssueToDate }) => {
             workspaceSlug as string,
             projectId as string,
             moduleId as string,
-            {
-              ...params,
-              target_date: `${renderDateFormat(
-                calendarDateRange.startDate
-              )};after,${renderDateFormat(calendarDateRange.endDate)};before`,
-              group_by: null,
-            }
+            targetDateFilter
           )
       : null
   );
@@ -152,16 +127,12 @@ export const CalendarView: React.FC<Props> = ({ addIssueToDate }) => {
 
   const currentViewDays = showWeekEnds ? totalDate : onlyWeekDays;
 
-  const calendarIssues = cycleId
-    ? (cycleCalendarIssues as IIssue[])
-    : moduleId
-    ? (moduleCalendarIssues as IIssue[])
-    : (projectCalendarIssues as IIssue[]);
+  const calendarIssues = cycleCalendarIssues ?? moduleCalendarIssues ?? projectCalendarIssues;
 
   const currentViewDaysData = currentViewDays.map((date: Date) => {
     const filterIssue =
       calendarIssues && calendarIssues.length > 0
-        ? calendarIssues.filter(
+        ? (calendarIssues as IIssue[]).filter(
             (issue) =>
               issue.target_date && renderDateFormat(issue.target_date) === renderDateFormat(date)
           )
@@ -227,17 +198,17 @@ export const CalendarView: React.FC<Props> = ({ addIssueToDate }) => {
     });
   };
 
-  return calendarIssues ? (
+  return (
     <DragDropContext onDragEnd={onDragEnd}>
-      <div className="-m-2 h-full overflow-y-auto rounded-lg text-brand-secondary">
+      <div className="h-full overflow-y-auto rounded-lg text-gray-600 -m-2">
         <div className="mb-4 flex items-center justify-between">
-          <div className="relative flex h-full w-full items-center justify-start gap-2 text-sm ">
+          <div className="relative flex h-full w-full gap-2 items-center justify-start text-sm ">
             <Popover className="flex h-full items-center justify-start rounded-lg">
               {({ open }) => (
                 <>
-                  <Popover.Button className={`group flex h-full items-start gap-1 text-brand-base`}>
+                  <Popover.Button className={`group flex h-full items-start gap-1 text-gray-800`}>
                     <div className="flex  items-center   justify-center gap-2 text-2xl font-semibold">
-                      <span>{formatDate(currentDate, "Month")}</span>{" "}
+                      <span className="text-black">{formatDate(currentDate, "Month")}</span>{" "}
                       <span>{formatDate(currentDate, "yyyy")}</span>
                     </div>
                   </Popover.Button>
@@ -251,30 +222,30 @@ export const CalendarView: React.FC<Props> = ({ addIssueToDate }) => {
                     leaveFrom="opacity-100 translate-y-0"
                     leaveTo="opacity-0 translate-y-1"
                   >
-                    <Popover.Panel className="absolute top-10 left-0 z-20 flex w-full max-w-xs transform flex-col overflow-hidden rounded-[10px] bg-brand-surface-2 shadow-lg">
-                      <div className="flex items-center justify-center gap-5 px-2 py-2 text-sm">
+                    <Popover.Panel className="absolute top-10 left-0 z-20 w-full max-w-xs flex flex-col transform overflow-hidden bg-white shadow-lg rounded-[10px]">
+                      <div className="flex justify-center items-center text-sm gap-5 px-2 py-2">
                         {yearOptions.map((year) => (
                           <button
                             onClick={() => updateDate(updateDateWithYear(year.label, currentDate))}
                             className={` ${
                               isSameYear(year.value, currentDate)
-                                ? "text-sm font-medium text-brand-base"
-                                : "text-xs text-brand-secondary "
-                            } hover:text-sm hover:font-medium hover:text-brand-base`}
+                                ? "text-sm font-medium text-gray-800"
+                                : "text-xs text-gray-400 "
+                            } hover:text-sm hover:text-gray-800 hover:font-medium `}
                           >
                             {year.label}
                           </button>
                         ))}
                       </div>
-                      <div className="grid grid-cols-4  border-t border-brand-base px-2">
+                      <div className="grid grid-cols-4  px-2 border-t border-gray-200">
                         {monthOptions.map((month) => (
                           <button
                             onClick={() =>
                               updateDate(updateDateWithMonth(month.value, currentDate))
                             }
-                            className={`px-2 py-2 text-xs text-brand-secondary hover:font-medium hover:text-brand-base ${
+                            className={`text-gray-400 text-xs px-2 py-2 hover:font-medium hover:text-gray-800 ${
                               isSameMonth(month.value, currentDate)
-                                ? "font-medium text-brand-base"
+                                ? "font-medium text-gray-800"
                                 : ""
                             }`}
                           >
@@ -324,9 +295,9 @@ export const CalendarView: React.FC<Props> = ({ addIssueToDate }) => {
             </div>
           </div>
 
-          <div className="flex w-full items-center justify-end gap-2">
+          <div className="flex w-full gap-2 items-center justify-end">
             <button
-              className="group flex cursor-pointer items-center gap-2 rounded-md border border-brand-base px-3 py-1 text-sm hover:bg-brand-surface-2 hover:text-brand-base focus:outline-none"
+              className="group flex cursor-pointer items-center gap-2 rounded-md border bg-white px-4 py-1.5 text-sm  hover:bg-gray-100 hover:text-gray-900 focus:outline-none"
               onClick={() => {
                 if (isMonthlyView) {
                   updateDate(new Date());
@@ -339,12 +310,13 @@ export const CalendarView: React.FC<Props> = ({ addIssueToDate }) => {
                 }
               }}
             >
-              Today
+              Today{" "}
             </button>
-
             <CustomMenu
               customButton={
-                <div className="group flex cursor-pointer items-center gap-2 rounded-md border border-brand-base px-3 py-1 text-sm hover:bg-brand-surface-2 hover:text-brand-base focus:outline-none ">
+                <div
+                  className={`group flex cursor-pointer items-center gap-2 rounded-md border bg-white px-3 py-1.5 text-sm  hover:bg-gray-100 hover:text-gray-900 focus:outline-none `}
+                >
                   {isMonthlyView ? "Monthly" : "Weekly"}
                   <ChevronDownIcon className="h-3 w-3" aria-hidden="true" />
                 </div>
@@ -358,7 +330,7 @@ export const CalendarView: React.FC<Props> = ({ addIssueToDate }) => {
                     endDate: lastDayOfWeek(currentDate),
                   });
                 }}
-                className="w-52 text-sm text-brand-secondary"
+                className="w-52 text-sm text-gray-600"
               >
                 <div className="flex w-full max-w-[260px] items-center justify-between gap-2">
                   <span className="flex items-center gap-2">Monthly View</span>
@@ -377,7 +349,7 @@ export const CalendarView: React.FC<Props> = ({ addIssueToDate }) => {
                     endDate: getCurrentWeekEndDate(currentDate),
                   });
                 }}
-                className="w-52 text-sm text-brand-secondary"
+                className="w-52 text-sm text-gray-600"
               >
                 <div className="flex w-full items-center justify-between gap-2">
                   <span className="flex items-center gap-2">Weekly View</span>
@@ -388,12 +360,25 @@ export const CalendarView: React.FC<Props> = ({ addIssueToDate }) => {
                   />
                 </div>
               </CustomMenu.MenuItem>
-              <div className="mt-1 flex w-52 items-center justify-between border-t border-brand-base py-2 px-1  text-sm text-brand-secondary">
+              <div className="mt-1 flex w-52 items-center justify-between border-t border-gray-200 py-2 px-1  text-sm text-gray-600">
                 <h4>Show weekends</h4>
-                <ToggleSwitch
-                  value={showWeekEnds}
-                  onChange={() => setShowWeekEnds(!showWeekEnds)}
-                />
+                <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 ${
+                    showWeekEnds ? "bg-green-500" : "bg-gray-200"
+                  }`}
+                  role="switch"
+                  aria-checked={showWeekEnds}
+                  onClick={() => setShowWeekEnds(!showWeekEnds)}
+                >
+                  <span className="sr-only">Show weekends</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 ${
+                      showWeekEnds ? "translate-x-2.5" : "translate-x-0"
+                    }`}
+                  />
+                </button>
               </div>
             </CustomMenu>
           </div>
@@ -407,7 +392,7 @@ export const CalendarView: React.FC<Props> = ({ addIssueToDate }) => {
           {weeks.map((date, index) => (
             <div
               key={index}
-              className={`flex  items-center justify-start gap-2 border-brand-base bg-brand-surface-1 p-1.5 text-base font-medium text-brand-secondary ${
+              className={`flex  items-center justify-start p-1.5 gap-2 border-gray-300 bg-gray-100 text-base font-medium text-gray-600 ${
                 !isMonthlyView
                   ? showWeekEnds
                     ? (index + 1) % 7 === 0
@@ -432,93 +417,54 @@ export const CalendarView: React.FC<Props> = ({ addIssueToDate }) => {
             showWeekEnds ? "grid-cols-7" : "grid-cols-5"
           } `}
         >
-          {currentViewDaysData.map((date, index) => {
-            const totalIssues = date.issues.length;
-
-            return (
-              <StrictModeDroppable droppableId={date.date}>
-                {(provided) => (
-                  <div
-                    key={index}
-                    ref={provided.innerRef}
-                    {...provided.droppableProps}
-                    className={`group relative flex flex-col gap-1.5 border-t border-brand-base p-2.5 text-left text-sm font-medium hover:bg-brand-surface-1 ${
-                      showWeekEnds
-                        ? (index + 1) % 7 === 0
-                          ? ""
-                          : "border-r"
-                        : (index + 1) % 5 === 0
+          {currentViewDaysData.map((date, index) => (
+            <StrictModeDroppable droppableId={date.date}>
+              {(provided, snapshot) => (
+                <div
+                  key={index}
+                  ref={provided.innerRef}
+                  {...provided.droppableProps}
+                  className={`flex flex-col gap-1.5 border-t border-gray-300 p-2.5 text-left text-sm font-medium hover:bg-gray-100 ${
+                    showWeekEnds
+                      ? (index + 1) % 7 === 0
                         ? ""
                         : "border-r"
-                    }`}
-                  >
-                    {isMonthlyView && <span>{formatDate(new Date(date.date), "d")}</span>}
-                    {totalIssues > 0 &&
-                      date.issues
-                        .slice(0, showAllIssues ? totalIssues : 4)
-                        .map((issue: IIssue, index) => (
-                          <Draggable draggableId={issue.id} index={index}>
-                            {(provided, snapshot) => (
-                              <div
-                                key={index}
-                                ref={provided.innerRef}
-                                {...provided.draggableProps}
-                                {...provided.dragHandleProps}
-                                className={`w-full cursor-pointer truncate rounded border border-brand-base px-1.5 py-1 text-xs duration-300 hover:cursor-move hover:bg-brand-surface-2 ${
-                                  snapshot.isDragging ? "bg-brand-surface-2 shadow-lg" : ""
-                                }`}
-                              >
-                                <Link
-                                  href={`/${workspaceSlug}/projects/${issue?.project_detail.id}/issues/${issue.id}`}
-                                >
-                                  <a className="flex w-full items-center gap-2">
-                                    {getStateGroupIcon(
-                                      issue.state_detail.group,
-                                      "12",
-                                      "12",
-                                      issue.state_detail.color
-                                    )}
-                                    {issue.name}
-                                  </a>
-                                </Link>
-                              </div>
-                            )}
-                          </Draggable>
-                        ))}
-                    {totalIssues > 4 && (
-                      <button
-                        type="button"
-                        className="w-min whitespace-nowrap rounded-md border border-brand-base bg-brand-surface-2 px-1.5 py-1 text-xs"
-                        onClick={() => setShowAllIssues((prevData) => !prevData)}
-                      >
-                        {showAllIssues ? "Hide" : totalIssues - 4 + " more"}
-                      </button>
-                    )}
-                    <div
-                      className={`absolute ${
-                        isMonthlyView ? "bottom-2" : "top-2"
-                      } right-2 flex items-center justify-center rounded-md bg-brand-surface-2 p-1 text-xs text-brand-secondary opacity-0 group-hover:opacity-100`}
-                    >
-                      <button
-                        className="flex items-center justify-center gap-1 text-center"
-                        onClick={() => addIssueToDate(date.date)}
-                      >
-                        <PlusIcon className="h-3 w-3 text-brand-secondary" />
-                        Add issue
-                      </button>
-                    </div>
-                    {provided.placeholder}
-                  </div>
-                )}
-              </StrictModeDroppable>
-            );
-          })}
+                      : (index + 1) % 5 === 0
+                      ? ""
+                      : "border-r"
+                  }`}
+                >
+                  {isMonthlyView && <span>{formatDate(new Date(date.date), "d")}</span>}
+                  {date.issues.length > 0 &&
+                    date.issues.map((issue: IIssue, index) => (
+                      <Draggable draggableId={issue.id} index={index}>
+                        {(provided, snapshot) => (
+                          <div
+                            key={index}
+                            ref={provided.innerRef}
+                            {...provided.draggableProps}
+                            {...provided.dragHandleProps}
+                            className={`w-full cursor-pointer truncate rounded bg-white p-1.5 hover:scale-105 ${
+                              snapshot.isDragging ? "shadow-lg" : ""
+                            }`}
+                          >
+                            <Link
+                              href={`/${workspaceSlug}/projects/${issue?.project_detail?.id}/issues/${issue.id}`}
+                              className="w-full"
+                            >
+                              {issue.name}
+                            </Link>
+                          </div>
+                        )}
+                      </Draggable>
+                    ))}
+                  {provided.placeholder}
+                </div>
+              )}
+            </StrictModeDroppable>
+          ))}
         </div>
       </div>
     </DragDropContext>
-  ) : (
-    <div className="flex h-full w-full items-center justify-center">
-      <Spinner />
-    </div>
   );
 };

apps/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>
-  );
-};

apps/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>
-  );
-};

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

@@ -19,12 +19,7 @@ import { LayerDiagonalIcon } from "components/icons";
 // types
 import { IIssue } from "types";
 // fetch-keys
-import {
-  CYCLE_DETAILS,
-  CYCLE_ISSUES_WITH_PARAMS,
-  MODULE_DETAILS,
-  MODULE_ISSUES_WITH_PARAMS,
-} from "constants/fetch-keys";
+import { CYCLE_ISSUES_WITH_PARAMS, MODULE_ISSUES_WITH_PARAMS } from "constants/fetch-keys";
 
 type FormInput = {
   issues: string[];
@@ -81,14 +76,8 @@ export const ExistingIssuesListModal: React.FC<Props> = ({
     }
 
     await handleOnSubmit(data);
-    if (cycleId) {
-      mutate(CYCLE_ISSUES_WITH_PARAMS(cycleId as string, params));
-      mutate(CYCLE_DETAILS(cycleId as string));
-    }
-    if (moduleId) {
-      mutate(MODULE_ISSUES_WITH_PARAMS(moduleId as string, params));
-      mutate(MODULE_DETAILS(moduleId as string));
-    }
+    if (cycleId) mutate(CYCLE_ISSUES_WITH_PARAMS(cycleId as string, params));
+    if (moduleId) mutate(MODULE_ISSUES_WITH_PARAMS(moduleId as string, params));
 
     handleClose();
 
@@ -117,7 +106,7 @@ export const ExistingIssuesListModal: React.FC<Props> = ({
             leaveFrom="opacity-100"
             leaveTo="opacity-0"
           >
-            <div className="fixed inset-0 bg-brand-backdrop bg-opacity-50 transition-opacity" />
+            <div className="fixed inset-0 bg-gray-500 bg-opacity-25 transition-opacity" />
           </Transition.Child>
 
           <div className="fixed inset-0 z-10 overflow-y-auto p-4 sm:p-6 md:p-20">
@@ -130,7 +119,7 @@ export const ExistingIssuesListModal: React.FC<Props> = ({
               leaveFrom="opacity-100 scale-100"
               leaveTo="opacity-0 scale-95"
             >
-              <Dialog.Panel className="relative mx-auto max-w-2xl transform rounded-xl border border-brand-base bg-brand-base shadow-2xl transition-all">
+              <Dialog.Panel className="relative mx-auto max-w-2xl transform divide-y divide-gray-500 divide-opacity-10 rounded-xl bg-white shadow-2xl ring-1 ring-black ring-opacity-5 transition-all">
                 <form>
                   <Controller
                     control={control}
@@ -139,11 +128,11 @@ export const ExistingIssuesListModal: React.FC<Props> = ({
                       <Combobox as="div" {...field} multiple>
                         <div className="relative m-1">
                           <MagnifyingGlassIcon
-                            className="pointer-events-none absolute top-3.5 left-4 h-5 w-5 text-brand-base text-opacity-40"
+                            className="pointer-events-none absolute top-3.5 left-4 h-5 w-5 text-gray-900 text-opacity-40"
                             aria-hidden="true"
                           />
                           <Combobox.Input
-                            className="h-12 w-full border-0 bg-transparent pl-11 pr-4 text-brand-base placeholder-gray-500 outline-none focus:ring-0 sm:text-sm"
+                            className="h-12 w-full border-0 bg-transparent pl-11 pr-4 text-gray-900 placeholder-gray-500 outline-none focus:ring-0 sm:text-sm"
                             placeholder="Search..."
                             onChange={(e) => setQuery(e.target.value)}
                           />
@@ -151,26 +140,26 @@ export const ExistingIssuesListModal: React.FC<Props> = ({
 
                         <Combobox.Options
                           static
-                          className="max-h-80 scroll-py-2 divide-y divide-brand-base overflow-y-auto"
+                          className="max-h-80 scroll-py-2 divide-y divide-gray-500 divide-opacity-10 overflow-y-auto"
                         >
                           {filteredIssues.length > 0 ? (
                             <li className="p-2">
                               {query === "" && (
-                                <h2 className="mb-2 px-3 text-xs font-medium text-brand-base">
+                                <h2 className="mb-2 px-3 text-xs font-semibold text-gray-900">
                                   Select issues to add
                                 </h2>
                               )}
-                              <ul className="text-sm text-brand-base">
+                              <ul className="text-sm text-gray-700">
                                 {filteredIssues.map((issue) => (
                                   <Combobox.Option
                                     key={issue.id}
                                     as="label"
                                     htmlFor={`issue-${issue.id}`}
                                     value={issue.id}
-                                    className={({ active, selected }) =>
-                                      `flex w-full cursor-pointer select-none items-center gap-2 rounded-md px-3 py-2 text-brand-secondary ${
-                                        active ? "bg-brand-surface-2 text-brand-base" : ""
-                                      } ${selected ? "text-brand-base" : ""}`
+                                    className={({ active }) =>
+                                      `flex w-full cursor-pointer select-none items-center gap-2 rounded-md px-3 py-2 ${
+                                        active ? "bg-gray-900 bg-opacity-5 text-gray-900" : ""
+                                      }`
                                     }
                                   >
                                     {({ selected }) => (
@@ -182,7 +171,7 @@ export const ExistingIssuesListModal: React.FC<Props> = ({
                                             backgroundColor: issue.state_detail.color,
                                           }}
                                         />
-                                        <span className="flex-shrink-0 text-xs">
+                                        <span className="flex-shrink-0 text-xs text-gray-500">
                                           {issue.project_detail.identifier}-{issue.sequence_id}
                                         </span>
                                         {issue.name}
@@ -194,11 +183,10 @@ export const ExistingIssuesListModal: React.FC<Props> = ({
                             </li>
                           ) : (
                             <div className="flex flex-col items-center justify-center gap-4 px-3 py-8 text-center">
-                              <LayerDiagonalIcon height="52" width="52" />
-                              <h3 className="text-sm text-brand-secondary">
+                              <LayerDiagonalIcon height="56" width="56" />
+                              <h3 className="text-gray-500">
                                 No issues found. Create a new issue with{" "}
-                                <pre className="inline rounded bg-brand-surface-2 px-2 py-1">C</pre>
-                                .
+                                <pre className="inline rounded bg-gray-200 px-2 py-1">C</pre>.
                               </h3>
                             </div>
                           )}