fix: added capture message

.env.example

@@ -21,15 +21,15 @@ AWS_S3_BUCKET_NAME="uploads"
 FILE_SIZE_LIMIT=5242880
 
 # GPT settings
-OPENAI_API_BASE="https://api.openai.com/v1" # deprecated
-OPENAI_API_KEY="sk-" # deprecated
-GPT_ENGINE="gpt-3.5-turbo" # deprecated
+OPENAI_API_BASE="https://api.openai.com/v1" # change if using a custom endpoint
+OPENAI_API_KEY="sk-" # add your openai key here
+GPT_ENGINE="gpt-3.5-turbo" # use "gpt-4" if you have access
 
 # Settings related to Docker
-DOCKERIZED=1  # deprecated
-
+DOCKERIZED=1
 # set to 1 If using the pre-configured minio setup
 USE_MINIO=1
 
 # Nginx Configuration
 NGINX_PORT=80
+

.github/workflows/build-branch.yml

@@ -1,41 +1,33 @@
 
-name: Branch Build
+name: Docker Branch Build
 
 on:
-  pull_request:
-    types: 
-      - closed
-    branches: 
-      - master
-      - release
-      - qa
-      - develop
+  workflow_dispatch:
+    inputs:
+      logLevel:
+        description: 'Log level'     
+        required: true
+        default: 'warning'
+      tags:
+        description: 'Dev/QA Builds'
 
 env:
-  TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}
+  gh_branch: ${{ github.ref_name }}
+  img_tag: latest
 
 jobs:
   branch_build_and_push:
-    if: ${{ (github.event_name == 'pull_request' && github.event.action =='closed' && github.event.pull_request.merged == true) }}
     name: Build-Push Web/Space/API/Proxy Docker Image
     runs-on: ubuntu-20.04
 
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3.3.0
-        
-      # - name: Set Target Branch Name on PR close
-      #   if: ${{ github.event_name == 'pull_request' && github.event.action =='closed' }}
-      #   run: echo "TARGET_BRANCH=${{ github.event.pull_request.base.ref }}" >> $GITHUB_ENV
 
-      # - name: Set Target Branch Name on other than PR close
-      #   if: ${{ github.event_name == 'push' }}
-      #   run: echo "TARGET_BRANCH=${{ github.ref_name }}" >> $GITHUB_ENV
-      
       - uses: ASzc/change-string-case-action@v2
         id: gh_branch_upper_lower
         with:
-          string: ${{env.TARGET_BRANCH}}
+          string: ${{ env.gh_branch }}
 
       - uses: mad9000/actions-find-and-replace-string@2
         id: gh_branch_replace_slash
@@ -119,7 +111,7 @@ jobs:
         env:
           DOCKER_BUILDKIT: 1
           DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
+          DOCKET_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
 
   branch_build_push_space:
     runs-on: ubuntu-20.04
@@ -149,7 +141,7 @@ jobs:
         env:
           DOCKER_BUILDKIT: 1
           DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
+          DOCKET_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
 
   branch_build_push_backend:
     runs-on: ubuntu-20.04
@@ -179,7 +171,7 @@ jobs:
         env:
           DOCKER_BUILDKIT: 1
           DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
+          DOCKET_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
 
   branch_build_push_proxy:
     runs-on: ubuntu-20.04
@@ -210,4 +202,4 @@ jobs:
         env:
           DOCKER_BUILDKIT: 1
           DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
+          DOCKET_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}

.gitignore

@@ -79,4 +79,3 @@ pnpm-workspace.yaml
 tmp/
 ## packages
 dist
-.temp/

CONTRIBUTING.md

@@ -8,8 +8,8 @@ Before submitting a new issue, please search the [issues](https://github.com/mak
 
 While we want to fix all the [issues](https://github.com/makeplane/plane/issues), before fixing a bug we need to be able to reproduce and confirm it. Please provide us with a minimal reproduction scenario using a repository or [Gist](https://gist.github.com/). Having a live, reproducible scenario gives us the information without asking questions back & forth with additional questions like:
 
-- 3rd-party libraries being used and their versions
-- a use-case that fails
+-   3rd-party libraries being used and their versions
+-   a use-case that fails
 
 Without said minimal reproduction, we won't be able to investigate all [issues](https://github.com/makeplane/plane/issues), and the issue might not be resolved.
 
@@ -19,10 +19,10 @@ You can open a new issue with this [issue form](https://github.com/makeplane/pla
 
 ### Requirements
 
-- Node.js version v16.18.0
-- Python version 3.8+
-- Postgres version v14
-- Redis version v6.2.7
+-   Node.js version v16.18.0
+-   Python version 3.8+
+-   Postgres version v14
+-   Redis version v6.2.7
 
 ### Setup the project
 
@@ -81,8 +81,8 @@ If you would like to _implement_ it, an issue with your proposal must be submitt
 
 To ensure consistency throughout the source code, please keep these rules in mind as you are working:
 
-- All features or bug fixes must be tested by one or more specs (unit-tests).
-- We use [Eslint default rule guide](https://eslint.org/docs/rules/), with minor changes. An automated formatter is available using prettier.
+-   All features or bug fixes must be tested by one or more specs (unit-tests).
+-   We use [Eslint default rule guide](https://eslint.org/docs/rules/), with minor changes. An automated formatter is available using prettier.
 
 ## Need help? Questions and suggestions
 
@@ -90,11 +90,11 @@ Questions, suggestions, and thoughts are most welcome. We can also be reached in
 
 ## Ways to contribute
 
-- Try Plane Cloud and the self hosting platform and give feedback
-- Add new integrations
-- Help with open [issues](https://github.com/makeplane/plane/issues) or [create your own](https://github.com/makeplane/plane/issues/new/choose)
-- Share your thoughts and suggestions with us
-- Help create tutorials and blog posts
-- Request a feature by submitting a proposal
-- Report a bug
-- **Improve documentation** - fix incomplete or missing [docs](https://docs.plane.so/), bad wording, examples or explanations.
+-   Try Plane Cloud and the self hosting platform and give feedback
+-   Add new integrations
+-   Help with open [issues](https://github.com/makeplane/plane/issues) or [create your own](https://github.com/makeplane/plane/issues/new/choose)
+-   Share your thoughts and suggestions with us
+-   Help create tutorials and blog posts
+-   Request a feature by submitting a proposal
+-   Report a bug
+-   **Improve documentation** - fix incomplete or missing [docs](https://docs.plane.so/), bad wording, examples or explanations.

Dockerfile

@@ -43,6 +43,8 @@ FROM python:3.11.1-alpine3.17 AS backend
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 ENV PIP_DISABLE_PIP_VERSION_CHECK=1 
+ENV DJANGO_SETTINGS_MODULE plane.settings.production
+ENV DOCKERIZED 1
 
 WORKDIR /code
 

ENV_SETUP.md

@@ -1,10 +1,8 @@
 # Environment Variables
-
 ​
-Environment variables are distributed in various files. Please refer them carefully.
+Environment variables are distributed in various files. Please refer them carefully. 
 
 ## {PROJECT_FOLDER}/.env
-
 File is available in the project root folder​
 
 ```
@@ -31,52 +29,42 @@ AWS_S3_BUCKET_NAME="uploads"
 FILE_SIZE_LIMIT=5242880
 ​
 # GPT settings
-OPENAI_API_BASE="https://api.openai.com/v1" # deprecated
-OPENAI_API_KEY="sk-" # deprecated
-GPT_ENGINE="gpt-3.5-turbo" # deprecated
+OPENAI_API_BASE="https://api.openai.com/v1" # change if using a custom endpoint
+OPENAI_API_KEY="sk-" # add your openai key here
+GPT_ENGINE="gpt-3.5-turbo" # use "gpt-4" if you have access
 ​
+# Settings related to Docker
+DOCKERIZED=1
 # set to 1 If using the pre-configured minio setup
 USE_MINIO=1
 ​
 # Nginx Configuration
 NGINX_PORT=80
 ```
-
 ​
-
 ## {PROJECT_FOLDER}/web/.env.example
-
 ​
-
 ```
 # Enable/Disable OAUTH - default 0 for selfhosted instance
 NEXT_PUBLIC_ENABLE_OAUTH=0
 # Public boards deploy URL
 NEXT_PUBLIC_DEPLOY_URL="http://localhost/spaces"
 ```
-
 ​
-
 ## {PROJECT_FOLDER}/spaces/.env.example
-
 ​
-
 ```
 # Flag to toggle OAuth
 NEXT_PUBLIC_ENABLE_OAUTH=0
 ```
-
 ​
-
 ## {PROJECT_FOLDER}/apiserver/.env
-
 ​
-
 ```
 # Backend
 # Debug value for api server use it as 0 for production use
 DEBUG=0
-DJANGO_SETTINGS_MODULE="plane.settings.selfhosted" # deprecated
+DJANGO_SETTINGS_MODULE="plane.settings.selfhosted"
 ​
 # Error logs
 SENTRY_DSN=""
@@ -113,22 +101,24 @@ AWS_S3_BUCKET_NAME="uploads"
 FILE_SIZE_LIMIT=5242880
 ​
 # GPT settings
-OPENAI_API_BASE="https://api.openai.com/v1" # deprecated
-OPENAI_API_KEY="sk-" # deprecated
-GPT_ENGINE="gpt-3.5-turbo" # deprecated
+OPENAI_API_BASE="https://api.openai.com/v1" # change if using a custom endpoint
+OPENAI_API_KEY="sk-" # add your openai key here
+GPT_ENGINE="gpt-3.5-turbo" # use "gpt-4" if you have access
 ​
-# Settings related to Docker
-DOCKERIZED=1  # Deprecated
-
 # Github
 GITHUB_CLIENT_SECRET="" # For fetching release notes
 ​
+# Settings related to Docker
+DOCKERIZED=1
 # set to 1 If using the pre-configured minio setup
 USE_MINIO=1
 ​
 # Nginx Configuration
 NGINX_PORT=80
 ​
+# Default Creds
+DEFAULT_EMAIL="captain@plane.so"
+DEFAULT_PASSWORD="password123"
 ​
 # SignUps
 ENABLE_SIGNUP="1"
@@ -136,9 +126,7 @@ ENABLE_SIGNUP="1"
 # Email Redirection URL
 WEB_URL="http://localhost"
 ```
-
 ## Updates​
-
 - The environment variable NEXT_PUBLIC_API_BASE_URL has been removed from both the web and space projects.
 - The naming convention for containers and images has been updated.
 - The plane-worker image will no longer be maintained, as it has been merged with plane-backend.

apiserver/.env.example

@@ -1,11 +1,10 @@
 # Backend
 # Debug value for api server use it as 0 for production use
 DEBUG=0
-CORS_ALLOWED_ORIGINS=""
+DJANGO_SETTINGS_MODULE="plane.settings.production"
 
 # Error logs
 SENTRY_DSN=""
-SENTRY_ENVIRONMENT="development"
 
 # Database Settings
 PGUSER="plane"
@@ -19,6 +18,15 @@ REDIS_HOST="plane-redis"
 REDIS_PORT="6379"
 REDIS_URL="redis://${REDIS_HOST}:6379/"
 
+# Email Settings
+EMAIL_HOST=""
+EMAIL_HOST_USER=""
+EMAIL_HOST_PASSWORD=""
+EMAIL_PORT=587
+EMAIL_FROM="Team Plane <team@mailer.plane.so>"
+EMAIL_USE_TLS="1"
+EMAIL_USE_SSL="0"
+
 # AWS Settings
 AWS_REGION=""
 AWS_ACCESS_KEY_ID="access-key"
@@ -30,9 +38,9 @@ AWS_S3_BUCKET_NAME="uploads"
 FILE_SIZE_LIMIT=5242880
 
 # GPT settings
-OPENAI_API_BASE="https://api.openai.com/v1" # deprecated
-OPENAI_API_KEY="sk-" # deprecated
-GPT_ENGINE="gpt-3.5-turbo" # deprecated
+OPENAI_API_BASE="https://api.openai.com/v1" # change if using a custom endpoint
+OPENAI_API_KEY="sk-" # add your openai key here
+GPT_ENGINE="gpt-3.5-turbo" # use "gpt-4" if you have access
 
 # Github
 GITHUB_CLIENT_SECRET="" # For fetching release notes
@@ -45,6 +53,9 @@ USE_MINIO=1
 # Nginx Configuration
 NGINX_PORT=80
 
+# Default Creds
+DEFAULT_EMAIL="captain@plane.so"
+DEFAULT_PASSWORD="password123"
 
 # SignUps
 ENABLE_SIGNUP="1"
@@ -59,6 +70,3 @@ ENABLE_MAGIC_LINK_LOGIN="0"
 # Email redirections and minio domain settings
 WEB_URL="http://localhost"
 
-# Gunicorn Workers
-GUNICORN_WORKERS=2
-

apiserver/Dockerfile.api

@@ -43,7 +43,7 @@ USER captain
 COPY manage.py manage.py
 COPY plane plane/
 COPY templates templates/
-COPY package.json package.json
+
 COPY gunicorn.config.py ./
 USER root
 RUN apk --no-cache add "bash~=5.2"

apiserver/bin/takeoff

@@ -3,18 +3,7 @@ set -e
 python manage.py wait_for_db
 python manage.py migrate
 
-# Set default value for ENABLE_REGISTRATION
-ENABLE_REGISTRATION=${ENABLE_REGISTRATION:-1}
+# Create a Default User
+python bin/user_script.py
 
-# Check if ENABLE_REGISTRATION is not set to '0'
-if [ "$ENABLE_REGISTRATION" != "0" ]; then
-    # Register instance
-    python manage.py register_instance
-    # Load the configuration variable
-    python manage.py configure_instance
-fi
-
-# Create the default bucket
-python bin/bucket_script.py
-
-exec gunicorn -w $GUNICORN_WORKERS -k uvicorn.workers.UvicornWorker plane.asgi:application --bind 0.0.0.0:8000 --max-requests 1200 --max-requests-jitter 1000 --access-logfile -
+exec gunicorn -w 8 -k uvicorn.workers.UvicornWorker plane.asgi:application --bind 0.0.0.0:8000 --max-requests 1200 --max-requests-jitter 1000 --access-logfile -

apiserver/bin/user_script.py

@@ -0,0 +1,28 @@
+import os, sys
+import uuid
+
+sys.path.append("/code")
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "plane.settings.production")
+import django
+
+django.setup()
+
+from plane.db.models import User
+
+
+def populate():
+    default_email = os.environ.get("DEFAULT_EMAIL", "captain@plane.so")
+    default_password = os.environ.get("DEFAULT_PASSWORD", "password123")
+
+    if not User.objects.filter(email=default_email).exists():
+        user = User.objects.create(email=default_email, username=uuid.uuid4().hex)
+        user.set_password(default_password)
+        user.save()
+        print(f"User created with an email: {default_email}")
+    else:
+        print(f"User already exists with the default email: {default_email}")
+
+
+if __name__ == "__main__":
+    populate()

apiserver/package.json

@@ -1,4 +0,0 @@
-{
-    "name": "plane-api",
-    "version": "0.13.2"
-}

apiserver/plane/analytics/urls.py

@@ -1,8 +0,0 @@
-# from django.contrib import admin
-from django.urls import path
-
-from plane.analytics.views import EventTrackingEndpoint
-
-urlpatterns = [
-    path('track-event/', EventTrackingEndpoint.as_view(), name='event_tracking'),
-]

apiserver/plane/analytics/views/__init__.py

@@ -1 +0,0 @@
-from .event_tacking import EventTrackingEndpoint

apiserver/plane/analytics/views/event_tacking.py

@@ -1,52 +0,0 @@
-# Python imports
-import requests
-import json
-
-# Module imports
-from plane.app.views import BaseAPIView
-
-# Third party imports
-from rest_framework import status
-from rest_framework.response import Response
-from rest_framework.permissions import IsAuthenticated
-
-# Django imports
-from django.conf import settings
-from django.core.serializers.json import DjangoJSONEncoder
-
-
-class EventTrackingEndpoint(BaseAPIView):
-    permission_class = [
-        IsAuthenticated,
-    ]
-
-    def post(self, request):
-        event_name = request.data.get("event_name", None)
-        extra = request.data.get("extra", None)
-
-        if not event_name or not extra:
-            return Response(
-                {"error": "event name and extra are required"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        _ = requests.post(
-            settings.ANALYTICS_BASE_API,
-            params={"token": settings.ANALYTICS_SECRET_KEY},
-            json=json.dumps(
-                {
-                    "eventName": event_name,
-                    "extra": extra,
-                    "user": {
-                        "id": str(request.user.id),
-                        "email": str(request.user.email),
-                        "first_name": str(request.user.first_name),
-                        "last_name": str(request.user.last_name),
-                        "last_login_ip": str(request.META.get("REMOTE_ADDR")),
-                        "last_login_uagent": str(request.META.get("HTTP_USER_AGENT"))
-                    },
-                },
-                cls=DjangoJSONEncoder,
-            ),
-        )
-        return Response({"message": "success"}, status=status.HTTP_200_OK)

apiserver/plane/api/apps.py

@@ -2,4 +2,4 @@ from django.apps import AppConfig
 
 
 class ApiConfig(AppConfig):
-    name = "plane.authentication"
+    name = "plane.api"

apiserver/plane/api/permissions/__init__.py

@@ -0,0 +1,2 @@
+from .workspace import WorkSpaceBasePermission, WorkSpaceAdminPermission, WorkspaceEntityPermission, WorkspaceViewerPermission
+from .project import ProjectBasePermission, ProjectEntityPermission, ProjectMemberPermission, ProjectLitePermission

apiserver/plane/api/permissions/project.py

@@ -13,15 +13,14 @@ Guest = 5
 
 class ProjectBasePermission(BasePermission):
     def has_permission(self, request, view):
+
         if request.user.is_anonymous:
             return False
 
         ## Safe Methods -> Handle the filtering logic in queryset
         if request.method in SAFE_METHODS:
             return WorkspaceMember.objects.filter(
-                workspace__slug=view.workspace_slug,
-                member=request.user,
-                is_active=True,
+                workspace__slug=view.workspace_slug, member=request.user
             ).exists()
 
         ## Only workspace owners or admins can create the projects
@@ -30,7 +29,6 @@ class ProjectBasePermission(BasePermission):
                 workspace__slug=view.workspace_slug,
                 member=request.user,
                 role__in=[Admin, Member],
-                is_active=True,
             ).exists()
 
         ## Only Project Admins can update project attributes
@@ -39,21 +37,19 @@ class ProjectBasePermission(BasePermission):
             member=request.user,
             role=Admin,
             project_id=view.project_id,
-            is_active=True,
         ).exists()
 
 
 class ProjectMemberPermission(BasePermission):
     def has_permission(self, request, view):
+
         if request.user.is_anonymous:
             return False
 
         ## Safe Methods -> Handle the filtering logic in queryset
         if request.method in SAFE_METHODS:
             return ProjectMember.objects.filter(
-                workspace__slug=view.workspace_slug,
-                member=request.user,
-                is_active=True,
+                workspace__slug=view.workspace_slug, member=request.user
             ).exists()
         ## Only workspace owners or admins can create the projects
         if request.method == "POST":
@@ -61,7 +57,6 @@ class ProjectMemberPermission(BasePermission):
                 workspace__slug=view.workspace_slug,
                 member=request.user,
                 role__in=[Admin, Member],
-                is_active=True,
             ).exists()
 
         ## Only Project Admins can update project attributes
@@ -70,12 +65,12 @@ class ProjectMemberPermission(BasePermission):
             member=request.user,
             role__in=[Admin, Member],
             project_id=view.project_id,
-            is_active=True,
         ).exists()
 
 
 class ProjectEntityPermission(BasePermission):
     def has_permission(self, request, view):
+
         if request.user.is_anonymous:
             return False
 
@@ -85,7 +80,6 @@ class ProjectEntityPermission(BasePermission):
                 workspace__slug=view.workspace_slug,
                 member=request.user,
                 project_id=view.project_id,
-                is_active=True,
             ).exists()
 
         ## Only project members or admins can create and edit the project attributes
@@ -94,18 +88,17 @@ class ProjectEntityPermission(BasePermission):
             member=request.user,
             role__in=[Admin, Member],
             project_id=view.project_id,
-            is_active=True,
         ).exists()
 
 
 class ProjectLitePermission(BasePermission):
+
     def has_permission(self, request, view):
         if request.user.is_anonymous:
             return False
-
+        
         return ProjectMember.objects.filter(
             workspace__slug=view.workspace_slug,
             member=request.user,
             project_id=view.project_id,
-            is_active=True,
         ).exists()

apiserver/plane/api/permissions/workspace.py

@@ -32,31 +32,15 @@ class WorkSpaceBasePermission(BasePermission):
                 member=request.user,
                 workspace__slug=view.workspace_slug,
                 role__in=[Owner, Admin],
-                is_active=True,
             ).exists()
 
         # allow only owner to delete the workspace
         if request.method == "DELETE":
             return WorkspaceMember.objects.filter(
-                member=request.user,
-                workspace__slug=view.workspace_slug,
-                role=Owner,
-                is_active=True,
+                member=request.user, workspace__slug=view.workspace_slug, role=Owner
             ).exists()
 
 
-class WorkspaceOwnerPermission(BasePermission):
-    def has_permission(self, request, view):
-        if request.user.is_anonymous:
-            return False
-
-        return WorkspaceMember.objects.filter(
-            workspace__slug=view.workspace_slug,
-            member=request.user,
-            role=Owner,
-        ).exists()
-
-
 class WorkSpaceAdminPermission(BasePermission):
     def has_permission(self, request, view):
         if request.user.is_anonymous:
@@ -66,7 +50,6 @@ class WorkSpaceAdminPermission(BasePermission):
             member=request.user,
             workspace__slug=view.workspace_slug,
             role__in=[Owner, Admin],
-            is_active=True,
         ).exists()
 
 
@@ -80,14 +63,12 @@ class WorkspaceEntityPermission(BasePermission):
             return WorkspaceMember.objects.filter(
                 workspace__slug=view.workspace_slug,
                 member=request.user,
-                is_active=True,
             ).exists()
 
         return WorkspaceMember.objects.filter(
             member=request.user,
             workspace__slug=view.workspace_slug,
             role__in=[Owner, Admin],
-            is_active=True,
         ).exists()
 
 
@@ -97,20 +78,5 @@ class WorkspaceViewerPermission(BasePermission):
             return False
 
         return WorkspaceMember.objects.filter(
-            member=request.user,
-            workspace__slug=view.workspace_slug,
-            role__gte=10,
-            is_active=True,
-        ).exists()
-
-
-class WorkspaceUserPermission(BasePermission):
-    def has_permission(self, request, view):
-        if request.user.is_anonymous:
-            return False
-
-        return WorkspaceMember.objects.filter(
-            member=request.user,
-            workspace__slug=view.workspace_slug,
-            is_active=True,
+            member=request.user, workspace__slug=view.workspace_slug, role__gte=10
         ).exists()

apiserver/plane/api/serializers/__init__.py

@@ -71,7 +71,7 @@ from .module import (
     ModuleFavoriteSerializer,
 )
 
-from .api import APITokenSerializer, APITokenReadSerializer
+from .api_token import APITokenSerializer
 
 from .integration import (
     IntegrationSerializer,
@@ -85,7 +85,7 @@ from .integration import (
 
 from .importer import ImporterSerializer
 
-from .page import PageSerializer, PageLogSerializer, SubPageSerializer, PageFavoriteSerializer
+from .page import PageSerializer, PageBlockSerializer, PageFavoriteSerializer
 
 from .estimate import (
     EstimateSerializer,
@@ -100,5 +100,3 @@ from .analytic import AnalyticViewSerializer
 from .notification import NotificationSerializer
 
 from .exporter import ExporterHistorySerializer
-
-from .webhook import WebhookSerializer, WebhookLogSerializer

apiserver/plane/api/serializers/api_token.py

@@ -0,0 +1,14 @@
+from .base import BaseSerializer
+from plane.db.models import APIToken
+
+
+class APITokenSerializer(BaseSerializer):
+    class Meta:
+        model = APIToken
+        fields = [
+            "label",
+            "user",
+            "user_type",
+            "workspace",
+            "created_at",
+        ]

apiserver/plane/api/serializers/estimate.py

@@ -2,7 +2,7 @@
 from .base import BaseSerializer
 
 from plane.db.models import Estimate, EstimatePoint
-from plane.app.serializers import WorkspaceLiteSerializer, ProjectLiteSerializer
+from plane.api.serializers import WorkspaceLiteSerializer, ProjectLiteSerializer
 
 
 class EstimateSerializer(BaseSerializer):

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

@@ -1,5 +1,5 @@
 # Module imports
-from plane.app.serializers import BaseSerializer
+from plane.api.serializers import BaseSerializer
 from plane.db.models import Integration, WorkspaceIntegration
 
 

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

@@ -1,5 +1,5 @@
 # Module imports
-from plane.app.serializers import BaseSerializer
+from plane.api.serializers import BaseSerializer
 from plane.db.models import (
     GithubIssueSync,
     GithubRepository,

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

@@ -1,5 +1,5 @@
 # Module imports
-from plane.app.serializers import BaseSerializer
+from plane.api.serializers import BaseSerializer
 from plane.db.models import SlackProjectSync
 
 

apiserver/plane/api/serializers/issue.py

@@ -5,7 +5,7 @@ from django.utils import timezone
 from rest_framework import serializers
 
 # Module imports
-from .base import BaseSerializer, DynamicBaseSerializer
+from .base import BaseSerializer
 from .user import UserLiteSerializer
 from .state import StateSerializer, StateLiteSerializer
 from .project import ProjectLiteSerializer
@@ -505,7 +505,7 @@ class IssueStateFlatSerializer(BaseSerializer):
 
 
 # Issue Serializer with state details
-class IssueStateSerializer(DynamicBaseSerializer):
+class IssueStateSerializer(BaseSerializer):
     label_details = LabelLiteSerializer(read_only=True, source="labels", many=True)
     state_detail = StateLiteSerializer(read_only=True, source="state")
     project_detail = ProjectLiteSerializer(read_only=True, source="project")
@@ -548,7 +548,7 @@ class IssueSerializer(BaseSerializer):
         ]
 
 
-class IssueLiteSerializer(DynamicBaseSerializer):
+class IssueLiteSerializer(BaseSerializer):
     workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
     project_detail = ProjectLiteSerializer(read_only=True, source="project")
     state_detail = StateLiteSerializer(read_only=True, source="state")

apiserver/plane/api/serializers/page.py

@@ -6,7 +6,28 @@ from .base import BaseSerializer
 from .issue import IssueFlatSerializer, LabelLiteSerializer
 from .workspace import WorkspaceLiteSerializer
 from .project import ProjectLiteSerializer
-from plane.db.models import Page, PageLog, PageFavorite, PageLabel, Label, Issue, Module
+from plane.db.models import Page, PageBlock, PageFavorite, PageLabel, Label
+
+
+class PageBlockSerializer(BaseSerializer):
+    issue_detail = IssueFlatSerializer(source="issue", read_only=True)
+    project_detail = ProjectLiteSerializer(source="project", read_only=True)
+    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
+
+    class Meta:
+        model = PageBlock
+        fields = "__all__"
+        read_only_fields = [
+            "workspace",
+            "project",
+            "page",
+        ]
+
+class PageBlockLiteSerializer(BaseSerializer):
+
+    class Meta:
+        model = PageBlock
+        fields = "__all__"
 
 
 class PageSerializer(BaseSerializer):
@@ -17,6 +38,7 @@ class PageSerializer(BaseSerializer):
         write_only=True,
         required=False,
     )
+    blocks = PageBlockLiteSerializer(read_only=True, many=True)
     project_detail = ProjectLiteSerializer(source="project", read_only=True)
     workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
 
@@ -80,41 +102,6 @@ class PageSerializer(BaseSerializer):
         return super().update(instance, validated_data)
 
 
-class SubPageSerializer(BaseSerializer):
-    entity_details = serializers.SerializerMethodField()
-
-    class Meta:
-        model = PageLog
-        fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "project",
-            "page",
-        ]
-
-    def get_entity_details(self, obj):
-        entity_name = obj.entity_name
-        if entity_name == 'forward_link' or entity_name == 'back_link':
-            try:
-                page = Page.objects.get(pk=obj.entity_identifier)
-                return PageSerializer(page).data
-            except Page.DoesNotExist:
-                return None
-        return None
-
-
-class PageLogSerializer(BaseSerializer):
-
-    class Meta:
-        model = PageLog
-        fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "project",
-            "page",
-        ]
-
-
 class PageFavoriteSerializer(BaseSerializer):
     page_detail = PageSerializer(source="page", read_only=True)
 

apiserver/plane/api/serializers/project.py

@@ -3,8 +3,8 @@ from rest_framework import serializers
 
 # Module imports
 from .base import BaseSerializer, DynamicBaseSerializer
-from plane.app.serializers.workspace import WorkspaceLiteSerializer
-from plane.app.serializers.user import UserLiteSerializer, UserAdminLiteSerializer
+from plane.api.serializers.workspace import WorkSpaceSerializer, WorkspaceLiteSerializer
+from plane.api.serializers.user import UserLiteSerializer, UserAdminLiteSerializer
 from plane.db.models import (
     Project,
     ProjectMember,
@@ -103,16 +103,13 @@ class ProjectListSerializer(DynamicBaseSerializer):
     members = serializers.SerializerMethodField()
 
     def get_members(self, obj):
-        project_members = ProjectMember.objects.filter(
-            project_id=obj.id,
-            is_active=True,
-        ).values(
+        project_members = ProjectMember.objects.filter(project_id=obj.id).values(
             "id",
             "member_id",
             "member__display_name",
             "member__avatar",
         )
-        return list(project_members)
+        return project_members
 
     class Meta:
         model = Project

apiserver/plane/api/serializers/state.py

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

apiserver/plane/api/serializers/user.py

@@ -4,7 +4,6 @@ from rest_framework import serializers
 # Module import
 from .base import BaseSerializer
 from plane.db.models import User, Workspace, WorkspaceMemberInvite
-from plane.license.models import InstanceAdmin, Instance
 
 
 class UserSerializer(BaseSerializer):
@@ -87,9 +86,7 @@ class UserMeSettingsSerializer(BaseSerializer):
                 "last_workspace_id": obj.last_workspace_id,
                 "last_workspace_slug": workspace.slug if workspace is not None else "",
                 "fallback_workspace_id": obj.last_workspace_id,
-                "fallback_workspace_slug": workspace.slug
-                if workspace is not None
-                else "",
+                "fallback_workspace_slug": workspace.slug if workspace is not None else "",
                 "invites": workspace_invites,
             }
         else:

apiserver/plane/api/urls/__init__.py

@@ -4,7 +4,7 @@ from .authentication import urlpatterns as authentication_urls
 from .config import urlpatterns as configuration_urls
 from .cycle import urlpatterns as cycle_urls
 from .estimate import urlpatterns as estimate_urls
-from .external import urlpatterns as external_urls
+from .gpt import urlpatterns as gpt_urls
 from .importer import urlpatterns as importer_urls
 from .inbox import urlpatterns as inbox_urls
 from .integration import urlpatterns as integration_urls
@@ -13,13 +13,14 @@ from .module import urlpatterns as module_urls
 from .notification import urlpatterns as notification_urls
 from .page import urlpatterns as page_urls
 from .project import urlpatterns as project_urls
+from .public_board import urlpatterns as public_board_urls
+from .release_note import urlpatterns as release_note_urls
 from .search import urlpatterns as search_urls
 from .state import urlpatterns as state_urls
+from .unsplash import urlpatterns as unsplash_urls
 from .user import urlpatterns as user_urls
 from .views import urlpatterns as view_urls
 from .workspace import urlpatterns as workspace_urls
-from .api import urlpatterns as api_urls
-from .webhook import urlpatterns as webhook_urls
 
 
 urlpatterns = [
@@ -29,7 +30,7 @@ urlpatterns = [
     *configuration_urls,
     *cycle_urls,
     *estimate_urls,
-    *external_urls,
+    *gpt_urls,
     *importer_urls,
     *inbox_urls,
     *integration_urls,
@@ -38,11 +39,12 @@ urlpatterns = [
     *notification_urls,
     *page_urls,
     *project_urls,
+    *public_board_urls,
+    *release_note_urls,
     *search_urls,
     *state_urls,
+    *unsplash_urls,
     *user_urls,
     *view_urls,
     *workspace_urls,
-    *api_urls,
-    *webhook_urls,
 ]

apiserver/plane/api/urls/analytic.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.app.views import (
+from plane.api.views import (
     AnalyticsEndpoint,
     AnalyticViewViewset,
     SavedAnalyticEndpoint,

apiserver/plane/api/urls/asset.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.app.views import (
+from plane.api.views import (
     FileAssetEndpoint,
     UserAssetsEndpoint,
 )

apiserver/plane/api/urls/authentication.py

@@ -3,7 +3,7 @@ from django.urls import path
 from rest_framework_simplejwt.views import TokenRefreshView
 
 
-from plane.app.views import (
+from plane.api.views import (
     # Authentication
     SignUpEndpoint,
     SignInEndpoint,

apiserver/plane/api/urls/config.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.app.views import ConfigurationEndpoint
+from plane.api.views import ConfigurationEndpoint
 
 urlpatterns = [
     path(

apiserver/plane/api/urls/cycle.py

@@ -1,13 +1,12 @@
 from django.urls import path
 
 
-from plane.app.views import (
+from plane.api.views import (
     CycleViewSet,
     CycleIssueViewSet,
     CycleDateCheckEndpoint,
     CycleFavoriteViewSet,
     TransferCycleIssueEndpoint,
-    CycleIssueGroupedEndpoint,
 )
 
 
@@ -44,11 +43,6 @@ urlpatterns = [
         ),
         name="project-issue-cycle",
     ),
-    path(
-        "v3/workspaces/<str:slug>/projects/<uuid:project_id>/cycles/<uuid:cycle_id>/cycle-issues/",
-        CycleIssueGroupedEndpoint.as_view(),
-        name="project-issue-cycle",
-    ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/cycles/<uuid:cycle_id>/cycle-issues/<uuid:pk>/",
         CycleIssueViewSet.as_view(

apiserver/plane/api/urls/estimate.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.app.views import (
+from plane.api.views import (
     ProjectEstimatePointEndpoint,
     BulkEstimatePointEndpoint,
 )

apiserver/plane/api/urls/gpt.py

@@ -0,0 +1,13 @@
+from django.urls import path
+
+
+from plane.api.views import GPTIntegrationEndpoint
+
+
+urlpatterns = [
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/ai-assistant/",
+        GPTIntegrationEndpoint.as_view(),
+        name="importer",
+    ),
+]

apiserver/plane/api/urls/importer.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.app.views import (
+from plane.api.views import (
     ServiceIssueImportSummaryEndpoint,
     ImportServiceEndpoint,
     UpdateServiceImportStatusEndpoint,

apiserver/plane/api/urls/inbox.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.app.views import (
+from plane.api.views import (
     InboxViewSet,
     InboxIssueViewSet,
 )

apiserver/plane/api/urls/integration.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.app.views import (
+from plane.api.views import (
     IntegrationViewSet,
     WorkspaceIntegrationViewSet,
     GithubRepositoriesEndpoint,

apiserver/plane/api/urls/issue.py

@@ -1,10 +1,8 @@
 from django.urls import path
 
 
-from plane.app.views import (
+from plane.api.views import (
     IssueViewSet,
-    IssueListEndpoint,
-    IssueListGroupedEndpoint,
     LabelViewSet,
     BulkCreateIssueLabelsEndpoint,
     BulkDeleteIssuesEndpoint,
@@ -37,16 +35,6 @@ urlpatterns = [
         ),
         name="project-issue",
     ),
-    path(
-        "v2/workspaces/<str:slug>/projects/<uuid:project_id>/issues/",
-        IssueListEndpoint.as_view(),
-        name="project-issue",
-    ),
-    path(
-        "v3/workspaces/<str:slug>/projects/<uuid:project_id>/issues/",
-        IssueListGroupedEndpoint.as_view(),
-        name="project-issue",
-    ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:pk>/",
         IssueViewSet.as_view(

apiserver/plane/api/urls/module.py

@@ -1,13 +1,12 @@
 from django.urls import path
 
 
-from plane.app.views import (
+from plane.api.views import (
     ModuleViewSet,
     ModuleIssueViewSet,
     ModuleLinkViewSet,
     ModuleFavoriteViewSet,
     BulkImportModulesEndpoint,
-    ModuleIssueGroupedEndpoint,
 )
 
 
@@ -44,11 +43,6 @@ urlpatterns = [
         ),
         name="project-module-issues",
     ),
-    path(
-        "v3/workspaces/<str:slug>/projects/<uuid:project_id>/modules/<uuid:module_id>/module-issues/",
-        ModuleIssueGroupedEndpoint.as_view(),
-        name="project-issue-cycle",
-    ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/modules/<uuid:module_id>/module-issues/<uuid:pk>/",
         ModuleIssueViewSet.as_view(

apiserver/plane/api/urls/notification.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.app.views import (
+from plane.api.views import (
     NotificationViewSet,
     UnreadNotificationEndpoint,
     MarkAllReadNotificationViewSet,

apiserver/plane/api/urls/page.py

@@ -0,0 +1,79 @@
+from django.urls import path
+
+
+from plane.api.views import (
+    PageViewSet,
+    PageBlockViewSet,
+    PageFavoriteViewSet,
+    CreateIssueFromPageBlockEndpoint,
+)
+
+
+urlpatterns = [
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/",
+        PageViewSet.as_view(
+            {
+                "get": "list",
+                "post": "create",
+            }
+        ),
+        name="project-pages",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/",
+        PageViewSet.as_view(
+            {
+                "get": "retrieve",
+                "patch": "partial_update",
+                "delete": "destroy",
+            }
+        ),
+        name="project-pages",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/page-blocks/",
+        PageBlockViewSet.as_view(
+            {
+                "get": "list",
+                "post": "create",
+            }
+        ),
+        name="project-page-blocks",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/page-blocks/<uuid:pk>/",
+        PageBlockViewSet.as_view(
+            {
+                "get": "retrieve",
+                "patch": "partial_update",
+                "delete": "destroy",
+            }
+        ),
+        name="project-page-blocks",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/user-favorite-pages/",
+        PageFavoriteViewSet.as_view(
+            {
+                "get": "list",
+                "post": "create",
+            }
+        ),
+        name="user-favorite-pages",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/user-favorite-pages/<uuid:page_id>/",
+        PageFavoriteViewSet.as_view(
+            {
+                "delete": "destroy",
+            }
+        ),
+        name="user-favorite-pages",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/page-blocks/<uuid:page_block_id>/issues/",
+        CreateIssueFromPageBlockEndpoint.as_view(),
+        name="page-block-issues",
+    ),
+]

apiserver/plane/api/urls/project.py

@@ -1,18 +1,18 @@
 from django.urls import path
 
-from plane.app.views import (
+from plane.api.views import (
     ProjectViewSet,
-    ProjectInvitationsViewset,
+    InviteProjectEndpoint,
     ProjectMemberViewSet,
+    ProjectMemberInvitationsViewset,
     ProjectMemberUserEndpoint,
     ProjectJoinEndpoint,
     AddTeamToProjectEndpoint,
     ProjectUserViewsEndpoint,
     ProjectIdentifierEndpoint,
     ProjectFavoritesViewSet,
-    UserProjectInvitationsViewset,
+    LeaveProjectEndpoint,
     ProjectPublicCoverImagesEndpoint,
-    ProjectDeployBoardViewSet,
 )
 
 
@@ -45,48 +45,13 @@ urlpatterns = [
         name="project-identifiers",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/invitations/",
-        ProjectInvitationsViewset.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            },
-        ),
-        name="project-member-invite",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/invitations/<uuid:pk>/",
-        ProjectInvitationsViewset.as_view(
-            {
-                "get": "retrieve",
-                "delete": "destroy",
-            }
-        ),
-        name="project-member-invite",
-    ),
-    path(
-        "users/me/invitations/projects/",
-        UserProjectInvitationsViewset.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            },
-        ),
-        name="user-project-invitations",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/join/",
-        ProjectJoinEndpoint.as_view(),
-        name="project-join",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/invite/",
+        InviteProjectEndpoint.as_view(),
+        name="invite-project",
     ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/members/",
-        ProjectMemberViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
+        ProjectMemberViewSet.as_view({"get": "list", "post": "create"}),
         name="project-member",
     ),
     path(
@@ -101,19 +66,30 @@ urlpatterns = [
         name="project-member",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/members/leave/",
-        ProjectMemberViewSet.as_view(
-            {
-                "post": "leave",
-            }
-        ),
-        name="project-member",
+        "workspaces/<str:slug>/projects/join/",
+        ProjectJoinEndpoint.as_view(),
+        name="project-join",
     ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/team-invite/",
         AddTeamToProjectEndpoint.as_view(),
         name="projects",
     ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/invitations/",
+        ProjectMemberInvitationsViewset.as_view({"get": "list"}),
+        name="project-member-invite",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/invitations/<uuid:pk>/",
+        ProjectMemberInvitationsViewset.as_view(
+            {
+                "get": "retrieve",
+                "delete": "destroy",
+            }
+        ),
+        name="project-member-invite",
+    ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/project-views/",
         ProjectUserViewsEndpoint.as_view(),
@@ -143,30 +119,14 @@ urlpatterns = [
         ),
         name="project-favorite",
     ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/members/leave/",
+        LeaveProjectEndpoint.as_view(),
+        name="leave-project",
+    ),
     path(
         "project-covers/",
         ProjectPublicCoverImagesEndpoint.as_view(),
         name="project-covers",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/project-deploy-boards/",
-        ProjectDeployBoardViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
-        name="project-deploy-board",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/project-deploy-boards/<uuid:pk>/",
-        ProjectDeployBoardViewSet.as_view(
-            {
-                "get": "retrieve",
-                "patch": "partial_update",
-                "delete": "destroy",
-            }
-        ),
-        name="project-deploy-board",
-    ),
 ]

apiserver/plane/api/urls/public_board.py

@@ -0,0 +1,151 @@
+from django.urls import path
+
+
+from plane.api.views import (
+    ProjectDeployBoardViewSet,
+    ProjectDeployBoardPublicSettingsEndpoint,
+    ProjectIssuesPublicEndpoint,
+    IssueRetrievePublicEndpoint,
+    IssueCommentPublicViewSet,
+    IssueReactionPublicViewSet,
+    CommentReactionPublicViewSet,
+    InboxIssuePublicViewSet,
+    IssueVotePublicViewSet,
+    WorkspaceProjectDeployBoardEndpoint,
+)
+
+
+urlpatterns = [
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/project-deploy-boards/",
+        ProjectDeployBoardViewSet.as_view(
+            {
+                "get": "list",
+                "post": "create",
+            }
+        ),
+        name="project-deploy-board",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/project-deploy-boards/<uuid:pk>/",
+        ProjectDeployBoardViewSet.as_view(
+            {
+                "get": "retrieve",
+                "patch": "partial_update",
+                "delete": "destroy",
+            }
+        ),
+        name="project-deploy-board",
+    ),
+    path(
+        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/settings/",
+        ProjectDeployBoardPublicSettingsEndpoint.as_view(),
+        name="project-deploy-board-settings",
+    ),
+    path(
+        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/",
+        ProjectIssuesPublicEndpoint.as_view(),
+        name="project-deploy-board",
+    ),
+    path(
+        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/",
+        IssueRetrievePublicEndpoint.as_view(),
+        name="workspace-project-boards",
+    ),
+    path(
+        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/comments/",
+        IssueCommentPublicViewSet.as_view(
+            {
+                "get": "list",
+                "post": "create",
+            }
+        ),
+        name="issue-comments-project-board",
+    ),
+    path(
+        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/comments/<uuid:pk>/",
+        IssueCommentPublicViewSet.as_view(
+            {
+                "get": "retrieve",
+                "patch": "partial_update",
+                "delete": "destroy",
+            }
+        ),
+        name="issue-comments-project-board",
+    ),
+    path(
+        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/reactions/",
+        IssueReactionPublicViewSet.as_view(
+            {
+                "get": "list",
+                "post": "create",
+            }
+        ),
+        name="issue-reactions-project-board",
+    ),
+    path(
+        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/reactions/<str:reaction_code>/",
+        IssueReactionPublicViewSet.as_view(
+            {
+                "delete": "destroy",
+            }
+        ),
+        name="issue-reactions-project-board",
+    ),
+    path(
+        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/comments/<uuid:comment_id>/reactions/",
+        CommentReactionPublicViewSet.as_view(
+            {
+                "get": "list",
+                "post": "create",
+            }
+        ),
+        name="comment-reactions-project-board",
+    ),
+    path(
+        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/comments/<uuid:comment_id>/reactions/<str:reaction_code>/",
+        CommentReactionPublicViewSet.as_view(
+            {
+                "delete": "destroy",
+            }
+        ),
+        name="comment-reactions-project-board",
+    ),
+    path(
+        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/inboxes/<uuid:inbox_id>/inbox-issues/",
+        InboxIssuePublicViewSet.as_view(
+            {
+                "get": "list",
+                "post": "create",
+            }
+        ),
+        name="inbox-issue",
+    ),
+    path(
+        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/inboxes/<uuid:inbox_id>/inbox-issues/<uuid:pk>/",
+        InboxIssuePublicViewSet.as_view(
+            {
+                "get": "retrieve",
+                "patch": "partial_update",
+                "delete": "destroy",
+            }
+        ),
+        name="inbox-issue",
+    ),
+    path(
+        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/votes/",
+        IssueVotePublicViewSet.as_view(
+            {
+                "get": "list",
+                "post": "create",
+                "delete": "destroy",
+            }
+        ),
+        name="issue-vote-project-board",
+    ),
+    path(
+        "public/workspaces/<str:slug>/project-boards/",
+        WorkspaceProjectDeployBoardEndpoint.as_view(),
+        name="workspace-project-boards",
+    ),
+]

apiserver/plane/api/urls/release_note.py

@@ -0,0 +1,13 @@
+from django.urls import path
+
+
+from plane.api.views import ReleaseNotesEndpoint
+
+
+urlpatterns = [
+    path(
+        "release-notes/",
+        ReleaseNotesEndpoint.as_view(),
+        name="release-notes",
+    ),
+]

apiserver/plane/api/urls/search.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.app.views import (
+from plane.api.views import (
     GlobalSearchEndpoint,
     IssueSearchEndpoint,
 )

apiserver/plane/api/urls/state.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.app.views import StateViewSet
+from plane.api.views import StateViewSet
 
 
 urlpatterns = [
@@ -20,19 +20,11 @@ urlpatterns = [
         StateViewSet.as_view(
             {
                 "get": "retrieve",
+                "put": "update",
                 "patch": "partial_update",
                 "delete": "destroy",
             }
         ),
         name="project-state",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/states/<uuid:pk>/mark-default/",
-        StateViewSet.as_view(
-            {
-                "post": "mark_as_default",
-            }
-        ),
-        name="project-state",
-    ),
 ]

apiserver/plane/api/urls/unsplash.py

@@ -0,0 +1,13 @@
+from django.urls import path
+
+
+from plane.api.views import UnsplashEndpoint
+
+
+urlpatterns = [
+    path(
+        "unsplash/",
+        UnsplashEndpoint.as_view(),
+        name="unsplash",
+    ),
+]

apiserver/plane/api/urls/user.py

@@ -1,6 +1,6 @@
 from django.urls import path
 
-from plane.app.views import (
+from plane.api.views import (
     ## User
     UserEndpoint,
     UpdateUserOnBoardedEndpoint,
@@ -9,10 +9,15 @@ from plane.app.views import (
     ChangePasswordEndpoint,
     ## End User
     ## Workspaces
+    UserWorkspaceInvitationsEndpoint,
     UserWorkSpacesEndpoint,
+    JoinWorkspaceEndpoint,
+    UserWorkspaceInvitationsEndpoint,
+    UserWorkspaceInvitationEndpoint,
     UserActivityGraphEndpoint,
     UserIssueCompletedGraphEndpoint,
     UserWorkspaceDashboardEndpoint,
+    UserProjectInvitationsViewset,
     ## End Workspaces
 )
 
@@ -21,11 +26,7 @@ urlpatterns = [
     path(
         "users/me/",
         UserEndpoint.as_view(
-            {
-                "get": "retrieve",
-                "patch": "partial_update",
-                "delete": "deactivate",
-            }
+            {"get": "retrieve", "patch": "partial_update", "delete": "destroy"}
         ),
         name="users",
     ),
@@ -38,15 +39,6 @@ urlpatterns = [
         ),
         name="users",
     ),
-    path(
-        "users/me/instance-admin/",
-        UserEndpoint.as_view(
-            {
-                "get": "retrieve_instance_admin",
-            }
-        ),
-        name="users",
-    ),
     path(
         "users/me/change-password/",
         ChangePasswordEndpoint.as_view(),
@@ -73,6 +65,23 @@ urlpatterns = [
         UserWorkSpacesEndpoint.as_view(),
         name="user-workspace",
     ),
+    # user workspace invitations
+    path(
+        "users/me/invitations/workspaces/",
+        UserWorkspaceInvitationsEndpoint.as_view({"get": "list", "post": "create"}),
+        name="user-workspace-invitations",
+    ),
+    # user workspace invitation
+    path(
+        "users/me/invitations/<uuid:pk>/",
+        UserWorkspaceInvitationEndpoint.as_view(
+            {
+                "get": "retrieve",
+            }
+        ),
+        name="user-workspace-invitation",
+    ),
+    # user join workspace
     # User Graphs
     path(
         "users/me/workspaces/<str:slug>/activity-graph/",
@@ -90,4 +99,15 @@ urlpatterns = [
         name="user-workspace-dashboard",
     ),
     ## End User Graph
+    path(
+        "users/me/invitations/workspaces/<str:slug>/<uuid:pk>/join/",
+        JoinWorkspaceEndpoint.as_view(),
+        name="user-join-workspace",
+    ),
+    # user project invitations
+    path(
+        "users/me/invitations/projects/",
+        UserProjectInvitationsViewset.as_view({"get": "list", "post": "create"}),
+        name="user-project-invitations",
+    ),
 ]

apiserver/plane/api/urls/views.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 
-from plane.app.views import (
+from plane.api.views import (
     IssueViewViewSet,
     GlobalViewViewSet,
     GlobalViewIssuesViewSet,

apiserver/plane/api/urls/workspace.py

@@ -1,10 +1,9 @@
 from django.urls import path
 
 
-from plane.app.views import (
-    UserWorkspaceInvitationsViewSet,
+from plane.api.views import (
     WorkSpaceViewSet,
-    WorkspaceJoinEndpoint,
+    InviteWorkspaceEndpoint,
     WorkSpaceMemberViewSet,
     WorkspaceInvitationsViewset,
     WorkspaceMemberUserEndpoint,
@@ -18,6 +17,7 @@ from plane.app.views import (
     WorkspaceUserProfileEndpoint,
     WorkspaceUserProfileIssuesEndpoint,
     WorkspaceLabelsEndpoint,
+    LeaveWorkspaceEndpoint,
 )
 
 
@@ -49,14 +49,14 @@ urlpatterns = [
         ),
         name="workspace",
     ),
+    path(
+        "workspaces/<str:slug>/invite/",
+        InviteWorkspaceEndpoint.as_view(),
+        name="invite-workspace",
+    ),
     path(
         "workspaces/<str:slug>/invitations/",
-        WorkspaceInvitationsViewset.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            },
-        ),
+        WorkspaceInvitationsViewset.as_view({"get": "list"}),
         name="workspace-invitations",
     ),
     path(
@@ -69,23 +69,6 @@ urlpatterns = [
         ),
         name="workspace-invitations",
     ),
-    # user workspace invitations
-    path(
-        "users/me/workspaces/invitations/",
-        UserWorkspaceInvitationsViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            },
-        ),
-        name="user-workspace-invitations",
-    ),
-    path(
-        "workspaces/<str:slug>/invitations/<uuid:pk>/join/",
-        WorkspaceJoinEndpoint.as_view(),
-        name="workspace-join",
-    ),
-    # user join workspace
     path(
         "workspaces/<str:slug>/members/",
         WorkSpaceMemberViewSet.as_view({"get": "list"}),
@@ -102,15 +85,6 @@ urlpatterns = [
         ),
         name="workspace-member",
     ),
-    path(
-        "workspaces/<str:slug>/members/leave/",
-        WorkSpaceMemberViewSet.as_view(
-            {
-                "post": "leave",
-            },
-        ),
-        name="leave-workspace-members",
-    ),
     path(
         "workspaces/<str:slug>/teams/",
         TeamMemberViewSet.as_view(
@@ -194,4 +168,9 @@ urlpatterns = [
         WorkspaceLabelsEndpoint.as_view(),
         name="workspace-labels",
     ),
+    path(
+        "workspaces/<str:slug>/members/leave/",
+        LeaveWorkspaceEndpoint.as_view(),
+        name="leave-workspace-members",
+    ),
 ]

apiserver/plane/api/urls_deprecated.py

@@ -4,7 +4,7 @@ from rest_framework_simplejwt.views import TokenRefreshView
 
 # Create your urls here.
 
-from plane.app.views import (
+from plane.api.views import (
     # Authentication
     SignUpEndpoint,
     SignInEndpoint,
@@ -124,10 +124,9 @@ from plane.app.views import (
     ## End Modules
     # Pages
     PageViewSet,
-    PageLogEndpoint,
-    SubPagesEndpoint,
+    PageBlockViewSet,
     PageFavoriteViewSet,
-    CreateIssueFromBlockEndpoint,
+    CreateIssueFromPageBlockEndpoint,
     ## End Pages
     # Api Tokens
     ApiTokenEndpoint,
@@ -1223,81 +1222,25 @@ urlpatterns = [
         name="project-pages",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/archive/",
-        PageViewSet.as_view(
-            {
-                "post": "archive",
-            }
-        ),
-        name="project-page-archive",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/unarchive/",
-        PageViewSet.as_view(
-            {
-                "post": "unarchive",
-            }
-        ),
-        name="project-page-unarchive"
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/archived-pages/",
-        PageViewSet.as_view(
-            {
-                "get": "archive_list",
-            }
-        ),
-        name="project-pages",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/lock/",
-        PageViewSet.as_view(
-            {
-                "post": "lock",
-            }
-        ),
-        name="project-pages",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/unlock/",
-        PageViewSet.as_view(
-            {
-                "post": "unlock",
-            }
-        )
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/transactions/",
-        PageLogEndpoint.as_view(), name="page-transactions"
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/transactions/<uuid:transaction>/",
-        PageLogEndpoint.as_view(), name="page-transactions"
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/sub-pages/",
-          SubPagesEndpoint.as_view(), name="sub-page"
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/estimates/",
-        BulkEstimatePointEndpoint.as_view(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/page-blocks/",
+        PageBlockViewSet.as_view(
             {
                 "get": "list",
                 "post": "create",
             }
         ),
-        name="bulk-create-estimate-points",
+        name="project-page-blocks",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/estimates/<uuid:estimate_id>/",
-        BulkEstimatePointEndpoint.as_view(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/page-blocks/<uuid:pk>/",
+        PageBlockViewSet.as_view(
             {
                 "get": "retrieve",
                 "patch": "partial_update",
                 "delete": "destroy",
             }
         ),
-        name="bulk-create-estimate-points",
+        name="project-page-blocks",
     ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/user-favorite-pages/",
@@ -1320,7 +1263,7 @@ urlpatterns = [
     ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/page-blocks/<uuid:page_block_id>/issues/",
-        CreateIssueFromBlockEndpoint.as_view(),
+        CreateIssueFromPageBlockEndpoint.as_view(),
         name="page-block-issues",
     ),
     ## End Pages

apiserver/plane/api/views/__init__.py

@@ -2,15 +2,20 @@ from .project import (
     ProjectViewSet,
     ProjectMemberViewSet,
     UserProjectInvitationsViewset,
-    ProjectInvitationsViewset,
+    InviteProjectEndpoint,
     AddTeamToProjectEndpoint,
+    ProjectMemberInvitationsViewset,
+    ProjectMemberInviteDetailViewSet,
     ProjectIdentifierEndpoint,
     ProjectJoinEndpoint,
     ProjectUserViewsEndpoint,
     ProjectMemberUserEndpoint,
     ProjectFavoritesViewSet,
-    ProjectPublicCoverImagesEndpoint,
     ProjectDeployBoardViewSet,
+    ProjectDeployBoardPublicSettingsEndpoint,
+    WorkspaceProjectDeployBoardEndpoint,
+    LeaveProjectEndpoint,
+    ProjectPublicCoverImagesEndpoint,
 )
 from .user import (
     UserEndpoint,
@@ -21,17 +26,19 @@ from .user import (
 
 from .oauth import OauthEndpoint
 
-from .base import BaseAPIView, BaseViewSet, WebhookMixin
+from .base import BaseAPIView, BaseViewSet
 
 from .workspace import (
     WorkSpaceViewSet,
     UserWorkSpacesEndpoint,
     WorkSpaceAvailabilityCheckEndpoint,
-    WorkspaceJoinEndpoint,
+    InviteWorkspaceEndpoint,
+    JoinWorkspaceEndpoint,
     WorkSpaceMemberViewSet,
     TeamMemberViewSet,
     WorkspaceInvitationsViewset,
-    UserWorkspaceInvitationsViewSet,
+    UserWorkspaceInvitationsEndpoint,
+    UserWorkspaceInvitationEndpoint,
     UserLastProjectWithWorkspaceEndpoint,
     WorkspaceMemberUserEndpoint,
     WorkspaceMemberUserViewsEndpoint,
@@ -44,27 +51,20 @@ from .workspace import (
     WorkspaceUserProfileEndpoint,
     WorkspaceUserProfileIssuesEndpoint,
     WorkspaceLabelsEndpoint,
+    LeaveWorkspaceEndpoint,
 )
 from .state import StateViewSet
-from .view import (
-    GlobalViewViewSet,
-    GlobalViewIssuesViewSet,
-    IssueViewViewSet,
-    IssueViewFavoriteViewSet,
-)
+from .view import GlobalViewViewSet, GlobalViewIssuesViewSet, IssueViewViewSet, IssueViewFavoriteViewSet
 from .cycle import (
     CycleViewSet,
     CycleIssueViewSet,
     CycleDateCheckEndpoint,
     CycleFavoriteViewSet,
     TransferCycleIssueEndpoint,
-    CycleIssueGroupedEndpoint,
 )
 from .asset import FileAssetEndpoint, UserAssetsEndpoint
 from .issue import (
     IssueViewSet,
-    IssueListEndpoint,
-    IssueListGroupedEndpoint,
     WorkSpaceIssuesEndpoint,
     IssueActivityEndpoint,
     IssueCommentViewSet,
@@ -78,9 +78,15 @@ from .issue import (
     IssueAttachmentEndpoint,
     IssueArchiveViewSet,
     IssueSubscriberViewSet,
+    IssueCommentPublicViewSet,
     CommentReactionViewSet,
     IssueReactionViewSet,
+    IssueReactionPublicViewSet,
+    CommentReactionPublicViewSet,
+    IssueVotePublicViewSet,
     IssueRelationViewSet,
+    IssueRetrievePublicEndpoint,
+    ProjectIssuesPublicEndpoint,
     IssueDraftViewSet,
 )
 
@@ -106,10 +112,9 @@ from .module import (
     ModuleIssueViewSet,
     ModuleLinkViewSet,
     ModuleFavoriteViewSet,
-    ModuleIssueGroupedEndpoint,
 )
 
-from .api import ApiTokenEndpoint
+from .api_token import ApiTokenEndpoint
 
 from .integration import (
     WorkspaceIntegrationViewSet,
@@ -132,10 +137,9 @@ from .importer import (
 
 from .page import (
     PageViewSet,
+    PageBlockViewSet,
     PageFavoriteViewSet,
-    PageLogEndpoint,
-    SubPagesEndpoint,
-    CreateIssueFromBlockEndpoint,
+    CreateIssueFromPageBlockEndpoint,
 )
 
 from .search import GlobalSearchEndpoint, IssueSearchEndpoint
@@ -148,7 +152,7 @@ from .estimate import (
     BulkEstimatePointEndpoint,
 )
 
-from .inbox import InboxViewSet, InboxIssueViewSet
+from .inbox import InboxViewSet, InboxIssueViewSet, InboxIssuePublicViewSet
 
 from .analytic import (
     AnalyticsEndpoint,
@@ -158,14 +162,8 @@ from .analytic import (
     DefaultAnalyticsEndpoint,
 )
 
-from .notification import (
-    NotificationViewSet,
-    UnreadNotificationEndpoint,
-    MarkAllReadNotificationViewSet,
-)
+from .notification import NotificationViewSet, UnreadNotificationEndpoint, MarkAllReadNotificationViewSet
 
 from .exporter import ExportIssuesEndpoint
 
 from .config import ConfigurationEndpoint
-
-from .webhook import WebhookEndpoint, WebhookLogsEndpoint, WebhookSecretRegenerateEndpoint

apiserver/plane/api/views/analytic.py

@@ -5,12 +5,13 @@ from django.db.models.functions import ExtractMonth
 # Third party imports
 from rest_framework import status
 from rest_framework.response import Response
+from sentry_sdk import capture_exception
 
 # Module imports
-from plane.app.views import BaseAPIView, BaseViewSet
-from plane.app.permissions import WorkSpaceAdminPermission
+from plane.api.views import BaseAPIView, BaseViewSet
+from plane.api.permissions import WorkSpaceAdminPermission
 from plane.db.models import Issue, AnalyticView, Workspace, State, Label
-from plane.app.serializers import AnalyticViewSerializer
+from plane.api.serializers import AnalyticViewSerializer
 from plane.utils.analytics_plot import build_graph_plot
 from plane.bgtasks.analytic_plot_export import analytic_export_task
 from plane.utils.issue_filters import issue_filters

apiserver/plane/api/views/api_token.py

@@ -0,0 +1,47 @@
+# Python import
+from uuid import uuid4
+
+# Third party
+from rest_framework.response import Response
+from rest_framework import status
+from sentry_sdk import capture_exception
+
+# Module import
+from .base import BaseAPIView
+from plane.db.models import APIToken
+from plane.api.serializers import APITokenSerializer
+
+
+class ApiTokenEndpoint(BaseAPIView):
+    def post(self, request):
+        label = request.data.get("label", str(uuid4().hex))
+        workspace = request.data.get("workspace", False)
+
+        if not workspace:
+            return Response(
+                {"error": "Workspace is required"}, status=status.HTTP_200_OK
+            )
+
+        api_token = APIToken.objects.create(
+            label=label, user=request.user, workspace_id=workspace
+        )
+
+        serializer = APITokenSerializer(api_token)
+        # Token will be only vissible while creating
+        return Response(
+            {"api_token": serializer.data, "token": api_token.token},
+            status=status.HTTP_201_CREATED,
+        )
+
+
+    def get(self, request):
+        api_tokens = APIToken.objects.filter(user=request.user)
+        serializer = APITokenSerializer(api_tokens, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+
+    def delete(self, request, pk):
+        api_token = APIToken.objects.get(pk=pk)
+        api_token.delete()
+        return Response(status=status.HTTP_204_NO_CONTENT)
+

apiserver/plane/api/views/asset.py

@@ -2,11 +2,12 @@
 from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.parsers import MultiPartParser, FormParser
-
+from sentry_sdk import capture_exception
+from django.conf import settings
 # Module imports
 from .base import BaseAPIView
 from plane.db.models import FileAsset, Workspace
-from plane.app.serializers import FileAssetSerializer
+from plane.api.serializers import FileAssetSerializer
 
 
 class FileAssetEndpoint(BaseAPIView):

apiserver/plane/api/views/auth_extended.py

@@ -21,7 +21,7 @@ from sentry_sdk import capture_exception
 
 ## Module imports
 from . import BaseAPIView
-from plane.app.serializers import (
+from plane.api.serializers import (
     ChangePasswordSerializer,
     ResetPasswordSerializer,
 )
@@ -33,7 +33,7 @@ from plane.bgtasks.forgot_password_task import forgot_password
 class RequestEmailVerificationEndpoint(BaseAPIView):
     def get(self, request):
         token = RefreshToken.for_user(request.user).access_token
-        current_site = request.META.get('HTTP_ORIGIN')
+        current_site = settings.WEB_URL
         email_verification.delay(
             request.user.first_name, request.user.email, token, current_site
         )
@@ -76,7 +76,7 @@ class ForgotPasswordEndpoint(BaseAPIView):
             uidb64 = urlsafe_base64_encode(smart_bytes(user.id))
             token = PasswordResetTokenGenerator().make_token(user)
 
-            current_site = request.META.get('HTTP_ORIGIN')
+            current_site = settings.WEB_URL
 
             forgot_password.delay(
                 user.first_name, user.email, uidb64, token, current_site

apiserver/plane/api/views/authentication.py

@@ -0,0 +1,397 @@
+# Python imports
+import uuid
+import random
+import string
+import json
+import requests
+
+# Django imports
+from django.utils import timezone
+from django.core.exceptions import ValidationError
+from django.core.validators import validate_email
+from django.conf import settings
+from django.contrib.auth.hashers import make_password
+
+# Third party imports
+from rest_framework.response import Response
+from rest_framework.permissions import AllowAny
+from rest_framework import status
+from rest_framework_simplejwt.tokens import RefreshToken
+
+from sentry_sdk import capture_exception, capture_message
+
+# Module imports
+from . import BaseAPIView
+from plane.db.models import User
+from plane.api.serializers import UserSerializer
+from plane.settings.redis import redis_instance
+from plane.bgtasks.magic_link_code_task import magic_link
+
+
+def get_tokens_for_user(user):
+    refresh = RefreshToken.for_user(user)
+    return (
+        str(refresh.access_token),
+        str(refresh),
+    )
+
+
+class SignUpEndpoint(BaseAPIView):
+    permission_classes = (AllowAny,)
+
+    def post(self, request):
+        if not settings.ENABLE_SIGNUP:
+            return Response(
+                {
+                    "error": "New account creation is disabled. Please contact your site administrator"
+                },
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        email = request.data.get("email", False)
+        password = request.data.get("password", False)
+
+        ## Raise exception if any of the above are missing
+        if not email or not password:
+            return Response(
+                {"error": "Both email and password are required"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        email = email.strip().lower()
+
+        try:
+            validate_email(email)
+        except ValidationError as e:
+            return Response(
+                {"error": "Please provide a valid email address."},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        # Check if the user already exists
+        if User.objects.filter(email=email).exists():
+            return Response(
+                {"error": "User with this email already exists"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        user = User.objects.create(email=email, username=uuid.uuid4().hex)
+        user.set_password(password)
+
+        # settings last actives for the user
+        user.last_active = timezone.now()
+        user.last_login_time = timezone.now()
+        user.last_login_ip = request.META.get("REMOTE_ADDR")
+        user.last_login_uagent = request.META.get("HTTP_USER_AGENT")
+        user.token_updated_at = timezone.now()
+        user.save()
+
+        access_token, refresh_token = get_tokens_for_user(user)
+
+        data = {
+            "access_token": access_token,
+            "refresh_token": refresh_token,
+        }
+
+        # Send Analytics
+        if settings.ANALYTICS_BASE_API:
+            _ = requests.post(
+                settings.ANALYTICS_BASE_API,
+                headers={
+                    "Content-Type": "application/json",
+                    "X-Auth-Token": settings.ANALYTICS_SECRET_KEY,
+                },
+                json={
+                    "event_id": uuid.uuid4().hex,
+                    "event_data": {
+                        "medium": "email",
+                    },
+                    "user": {"email": email, "id": str(user.id)},
+                    "device_ctx": {
+                        "ip": request.META.get("REMOTE_ADDR"),
+                        "user_agent": request.META.get("HTTP_USER_AGENT"),
+                    },
+                    "event_type": "SIGN_UP",
+                },
+            )
+
+        return Response(data, status=status.HTTP_200_OK)
+
+
+class SignInEndpoint(BaseAPIView):
+    permission_classes = (AllowAny,)
+
+    def post(self, request):
+        email = request.data.get("email", False)
+        password = request.data.get("password", False)
+
+        ## Raise exception if any of the above are missing
+        if not email or not password:
+            return Response(
+                {"error": "Both email and password are required"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        email = email.strip().lower()
+
+        try:
+            validate_email(email)
+        except ValidationError as e:
+            return Response(
+                {"error": "Please provide a valid email address."},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        user = User.objects.filter(email=email).first()
+
+        if user is None:
+            return Response(
+                {
+                    "error": "Sorry, we could not find a user with the provided credentials. Please try again."
+                },
+                status=status.HTTP_403_FORBIDDEN,
+            )
+
+        # Sign up Process
+        if not user.check_password(password):
+            return Response(
+                {
+                    "error": "Sorry, we could not find a user with the provided credentials. Please try again."
+                },
+                status=status.HTTP_403_FORBIDDEN,
+            )
+        if not user.is_active:
+            return Response(
+                {
+                    "error": "Your account has been deactivated. Please contact your site administrator."
+                },
+                status=status.HTTP_403_FORBIDDEN,
+            )
+
+        # settings last active for the user
+        user.last_active = timezone.now()
+        user.last_login_time = timezone.now()
+        user.last_login_ip = request.META.get("REMOTE_ADDR")
+        user.last_login_uagent = request.META.get("HTTP_USER_AGENT")
+        user.token_updated_at = timezone.now()
+        user.save()
+
+        access_token, refresh_token = get_tokens_for_user(user)
+        # Send Analytics
+        if settings.ANALYTICS_BASE_API:
+            _ = requests.post(
+                settings.ANALYTICS_BASE_API,
+                headers={
+                    "Content-Type": "application/json",
+                    "X-Auth-Token": settings.ANALYTICS_SECRET_KEY,
+                },
+                json={
+                    "event_id": uuid.uuid4().hex,
+                    "event_data": {
+                        "medium": "email",
+                    },
+                    "user": {"email": email, "id": str(user.id)},
+                    "device_ctx": {
+                        "ip": request.META.get("REMOTE_ADDR"),
+                        "user_agent": request.META.get("HTTP_USER_AGENT"),
+                    },
+                    "event_type": "SIGN_IN",
+                },
+            )
+        data = {
+            "access_token": access_token,
+            "refresh_token": refresh_token,
+        }
+
+        return Response(data, status=status.HTTP_200_OK)
+
+
+class SignOutEndpoint(BaseAPIView):
+    def post(self, request):
+        refresh_token = request.data.get("refresh_token", False)
+
+        if not refresh_token:
+            capture_message("No refresh token provided")
+            return Response(
+                {"error": "No refresh token provided"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        user = User.objects.get(pk=request.user.id)
+
+        user.last_logout_time = timezone.now()
+        user.last_logout_ip = request.META.get("REMOTE_ADDR")
+
+        user.save()
+
+        token = RefreshToken(refresh_token)
+        token.blacklist()
+        return Response({"message": "success"}, status=status.HTTP_200_OK)
+
+
+class MagicSignInGenerateEndpoint(BaseAPIView):
+    permission_classes = [
+        AllowAny,
+    ]
+
+    def post(self, request):
+        email = request.data.get("email", False)
+
+        if not email:
+            return Response(
+                {"error": "Please provide a valid email address"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        # Clean up
+        email = email.strip().lower()
+        validate_email(email)
+
+        ## Generate a random token
+        token = (
+            "".join(random.choices(string.ascii_lowercase, k=4))
+            + "-"
+            + "".join(random.choices(string.ascii_lowercase, k=4))
+            + "-"
+            + "".join(random.choices(string.ascii_lowercase, k=4))
+        )
+
+        ri = redis_instance()
+
+        key = "magic_" + str(email)
+
+        # Check if the key already exists in python
+        if ri.exists(key):
+            data = json.loads(ri.get(key))
+
+            current_attempt = data["current_attempt"] + 1
+
+            if data["current_attempt"] > 2:
+                return Response(
+                    {"error": "Max attempts exhausted. Please try again later."},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
+            value = {
+                "current_attempt": current_attempt,
+                "email": email,
+                "token": token,
+            }
+            expiry = 600
+
+            ri.set(key, json.dumps(value), ex=expiry)
+
+        else:
+            value = {"current_attempt": 0, "email": email, "token": token}
+            expiry = 600
+
+            ri.set(key, json.dumps(value), ex=expiry)
+
+        current_site = settings.WEB_URL
+        magic_link.delay(email, key, token, current_site)
+
+        return Response({"key": key}, status=status.HTTP_200_OK)
+
+
+class MagicSignInEndpoint(BaseAPIView):
+    permission_classes = [
+        AllowAny,
+    ]
+
+    def post(self, request):
+        user_token = request.data.get("token", "").strip()
+        key = request.data.get("key", False).strip().lower()
+
+        if not key or user_token == "":
+            return Response(
+                {"error": "User token and key are required"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        ri = redis_instance()
+
+        if ri.exists(key):
+            data = json.loads(ri.get(key))
+
+            token = data["token"]
+            email = data["email"]
+
+            if str(token) == str(user_token):
+                if User.objects.filter(email=email).exists():
+                    user = User.objects.get(email=email)
+                    # Send event to Jitsu for tracking
+                    if settings.ANALYTICS_BASE_API:
+                        _ = requests.post(
+                            settings.ANALYTICS_BASE_API,
+                            headers={
+                                "Content-Type": "application/json",
+                                "X-Auth-Token": settings.ANALYTICS_SECRET_KEY,
+                            },
+                            json={
+                                "event_id": uuid.uuid4().hex,
+                                "event_data": {
+                                    "medium": "code",
+                                },
+                                "user": {"email": email, "id": str(user.id)},
+                                "device_ctx": {
+                                    "ip": request.META.get("REMOTE_ADDR"),
+                                    "user_agent": request.META.get("HTTP_USER_AGENT"),
+                                },
+                                "event_type": "SIGN_IN",
+                            },
+                        )
+                else:
+                    user = User.objects.create(
+                        email=email,
+                        username=uuid.uuid4().hex,
+                        password=make_password(uuid.uuid4().hex),
+                        is_password_autoset=True,
+                    )
+                    # Send event to Jitsu for tracking
+                    if settings.ANALYTICS_BASE_API:
+                        _ = requests.post(
+                            settings.ANALYTICS_BASE_API,
+                            headers={
+                                "Content-Type": "application/json",
+                                "X-Auth-Token": settings.ANALYTICS_SECRET_KEY,
+                            },
+                            json={
+                                "event_id": uuid.uuid4().hex,
+                                "event_data": {
+                                    "medium": "code",
+                                },
+                                "user": {"email": email, "id": str(user.id)},
+                                "device_ctx": {
+                                    "ip": request.META.get("REMOTE_ADDR"),
+                                    "user_agent": request.META.get("HTTP_USER_AGENT"),
+                                },
+                                "event_type": "SIGN_UP",
+                            },
+                        )
+
+                user.last_active = timezone.now()
+                user.last_login_time = timezone.now()
+                user.last_login_ip = request.META.get("REMOTE_ADDR")
+                user.last_login_uagent = request.META.get("HTTP_USER_AGENT")
+                user.token_updated_at = timezone.now()
+                user.save()
+
+                access_token, refresh_token = get_tokens_for_user(user)
+                data = {
+                    "access_token": access_token,
+                    "refresh_token": refresh_token,
+                }
+
+                return Response(data, status=status.HTTP_200_OK)
+
+            else:
+                return Response(
+                    {"error": "Your login code was incorrect. Please try again."},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
+        else:
+            return Response(
+                {"error": "The magic code/link has expired please try again"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )

apiserver/plane/api/views/base.py

@@ -29,7 +29,6 @@ class TimezoneMixin:
     This enables timezone conversion according
     to the user set timezone
     """
-
     def initial(self, request, *args, **kwargs):
         super().initial(request, *args, **kwargs)
         if request.user.is_authenticated:
@@ -39,6 +38,7 @@ class TimezoneMixin:
 
 
 class BaseViewSet(TimezoneMixin, ModelViewSet, BasePaginator):
+
     model = None
 
     permission_classes = [
@@ -60,7 +60,7 @@ class BaseViewSet(TimezoneMixin, ModelViewSet, BasePaginator):
         except Exception as e:
             capture_exception(e)
             raise APIException("Please check the view", status.HTTP_400_BAD_REQUEST)
-
+        
     def handle_exception(self, exc):
         """
         Handle any exception that occurs, by returning an appropriate response,
@@ -71,30 +71,18 @@ class BaseViewSet(TimezoneMixin, ModelViewSet, BasePaginator):
             return response
         except Exception as e:
             if isinstance(e, IntegrityError):
-                return Response(
-                    {"error": "The payload is not valid"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
+                return Response({"error": "The payload is not valid"}, status=status.HTTP_400_BAD_REQUEST)
+            
             if isinstance(e, ValidationError):
-                return Response(
-                    {"error": "Please provide valid detail"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
+                return Response({"error": "Please provide valid detail"}, status=status.HTTP_400_BAD_REQUEST)
+            
             if isinstance(e, ObjectDoesNotExist):
                 model_name = str(exc).split(" matching query does not exist.")[0]
-                return Response(
-                    {"error": f"{model_name} does not exist."},
-                    status=status.HTTP_404_NOT_FOUND,
-                )
-
+                return Response({"error": f"{model_name} does not exist."}, status=status.HTTP_404_NOT_FOUND)
+            
             if isinstance(e, KeyError):
                 capture_exception(e)
-                return Response(
-                    {"error": f"key {e} does not exist"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
+                return Response({"error": f"key {e} does not exist"}, status=status.HTTP_400_BAD_REQUEST)
             
             print(e) if settings.DEBUG else print("Server Error")
             capture_exception(e)
@@ -111,8 +99,8 @@ class BaseViewSet(TimezoneMixin, ModelViewSet, BasePaginator):
                 print(
                     f"{request.method} - {request.get_full_path()} of Queries: {len(connection.queries)}"
                 )
-
             return response
+
         except Exception as exc:
             response = self.handle_exception(exc)
             return exc
@@ -132,6 +120,7 @@ class BaseViewSet(TimezoneMixin, ModelViewSet, BasePaginator):
 
 
 class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
+
     permission_classes = [
         IsAuthenticated,
     ]
@@ -150,6 +139,7 @@ class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
             queryset = backend().filter_queryset(self.request, queryset, self)
         return queryset
 
+
     def handle_exception(self, exc):
         """
         Handle any exception that occurs, by returning an appropriate response,
@@ -160,29 +150,19 @@ class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
             return response
         except Exception as e:
             if isinstance(e, IntegrityError):
-                return Response(
-                    {"error": "The payload is not valid"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
+                return Response({"error": "The payload is not valid"}, status=status.HTTP_400_BAD_REQUEST)
+            
             if isinstance(e, ValidationError):
-                return Response(
-                    {"error": "Please provide valid detail"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
+                return Response({"error": "Please provide valid detail"}, status=status.HTTP_400_BAD_REQUEST)
+            
             if isinstance(e, ObjectDoesNotExist):
                 model_name = str(exc).split(" matching query does not exist.")[0]
-                return Response(
-                    {"error": f"{model_name} does not exist."},
-                    status=status.HTTP_404_NOT_FOUND,
-                )
+                return Response({"error": f"{model_name} does not exist."}, status=status.HTTP_404_NOT_FOUND)
             
             if isinstance(e, KeyError):
                 return Response({"error": f"key {e} does not exist"}, status=status.HTTP_400_BAD_REQUEST)
-
-            if settings.DEBUG:
-                print(e)
+            
+            print(e) if settings.DEBUG else print("Server Error")
             capture_exception(e)
             return Response({"error": "Something went wrong please try again later"}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
 

apiserver/plane/api/views/config.py

@@ -0,0 +1,34 @@
+# Python imports
+import os
+
+# Django imports
+from django.conf import settings
+
+# Third party imports
+from rest_framework.permissions import AllowAny
+from rest_framework import status
+from rest_framework.response import Response
+from sentry_sdk import capture_exception
+
+# Module imports
+from .base import BaseAPIView
+
+
+class ConfigurationEndpoint(BaseAPIView):
+    permission_classes = [
+        AllowAny,
+    ]
+
+    def get(self, request):
+        data = {}
+        data["google"] = os.environ.get("GOOGLE_CLIENT_ID", None)
+        data["github"] = os.environ.get("GITHUB_CLIENT_ID", None)
+        data["github_app_name"] = os.environ.get("GITHUB_APP_NAME", None)
+        data["magic_login"] = (
+            bool(settings.EMAIL_HOST_USER) and bool(settings.EMAIL_HOST_PASSWORD)
+        ) and os.environ.get("ENABLE_MAGIC_LINK_LOGIN", "0") == "1"
+        data["email_password_login"] = (
+            os.environ.get("ENABLE_EMAIL_PASSWORD", "0") == "1"
+        )
+        data["slack"] = os.environ.get("SLACK_CLIENT_ID", None)
+        return Response(data, status=status.HTTP_200_OK)

apiserver/plane/api/views/cycle.py

@@ -20,17 +20,18 @@ from django.views.decorators.gzip import gzip_page
 # Third party imports
 from rest_framework.response import Response
 from rest_framework import status
+from sentry_sdk import capture_exception
 
 # Module imports
-from . import BaseViewSet, BaseAPIView, WebhookMixin
-from plane.app.serializers import (
+from . import BaseViewSet, BaseAPIView
+from plane.api.serializers import (
     CycleSerializer,
     CycleIssueSerializer,
     CycleFavoriteSerializer,
     IssueStateSerializer,
     CycleWriteSerializer,
 )
-from plane.app.permissions import ProjectEntityPermission
+from plane.api.permissions import ProjectEntityPermission
 from plane.db.models import (
     User,
     Cycle,
@@ -47,10 +48,9 @@ from plane.utils.issue_filters import issue_filters
 from plane.utils.analytics_plot import burndown_plot
 
 
-class CycleViewSet(WebhookMixin, BaseViewSet):
+class CycleViewSet(BaseViewSet):
     serializer_class = CycleSerializer
     model = Cycle
-    webhook_event = "cycle"
     permission_classes = [
         ProjectEntityPermission,
     ]
@@ -176,8 +176,9 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
     def list(self, request, slug, project_id):
         queryset = self.get_queryset()
         cycle_view = request.GET.get("cycle_view", "all")
+        order_by = request.GET.get("order_by", "sort_order")
 
-        queryset = queryset.order_by("-is_favorite","-created_at")
+        queryset = queryset.order_by(order_by)
 
         # Current Cycle
         if cycle_view == "current":
@@ -478,13 +479,13 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
             )
         )
         cycle = Cycle.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)
-
+        # Delete the cycle
+        cycle.delete()
         issue_activity.delay(
             type="cycle.activity.deleted",
             requested_data=json.dumps(
                 {
                     "cycle_id": str(pk),
-                    "cycle_name": str(cycle.name),
                     "issues": [str(issue_id) for issue_id in cycle_issues],
                 }
             ),
@@ -494,15 +495,13 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
             current_instance=None,
             epoch=int(timezone.now().timestamp()),
         )
-        # Delete the cycle
-        cycle.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
-class CycleIssueViewSet(WebhookMixin, BaseViewSet):
+class CycleIssueViewSet(BaseViewSet):
     serializer_class = CycleIssueSerializer
     model = CycleIssue
-    webhook_event = "cycle"
+
     permission_classes = [
         ProjectEntityPermission,
     ]
@@ -512,6 +511,12 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
         "issue__assignees__id",
     ]
 
+    def perform_create(self, serializer):
+        serializer.save(
+            project_id=self.kwargs.get("project_id"),
+            cycle_id=self.kwargs.get("cycle_id"),
+        )
+
     def get_queryset(self):
         return self.filter_queryset(
             super()
@@ -664,7 +669,7 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
             type="cycle.activity.created",
             requested_data=json.dumps({"cycles_list": issues}),
             actor_id=str(self.request.user.id),
-            issue_id=None,
+            issue_id=str(self.kwargs.get("pk", None)),
             project_id=str(self.kwargs.get("project_id", None)),
             current_instance=json.dumps(
                 {
@@ -706,56 +711,6 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
-class CycleIssueGroupedEndpoint(BaseAPIView):
-
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-
-    def get(self, request, slug, project_id, cycle_id):
-        filters = issue_filters(request.query_params, "GET")
-        fields = [field for field in request.GET.get("fields", "").split(",") if field]
-
-        issues = (
-            Issue.issue_objects.filter(issue_cycle__cycle_id=cycle_id)
-            .annotate(
-                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .annotate(bridge_id=F("issue_cycle__id"))
-            .filter(project_id=project_id)
-            .filter(workspace__slug=slug)
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("state")
-            .select_related("parent")
-            .prefetch_related("assignees")
-            .prefetch_related("labels")
-            .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 = IssueStateSerializer(issues, many=True, fields=fields if fields else None).data
-        issue_dict = {str(issue["id"]): issue for issue in issues}
-        return Response(
-            issue_dict,
-            status=status.HTTP_200_OK,
-        )
-
-
 class CycleDateCheckEndpoint(BaseAPIView):
     permission_classes = [
         ProjectEntityPermission,

apiserver/plane/api/views/estimate.py

@@ -1,12 +1,13 @@
 # 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.app.permissions import ProjectEntityPermission
+from plane.api.permissions import ProjectEntityPermission
 from plane.db.models import Project, Estimate, EstimatePoint
-from plane.app.serializers import (
+from plane.api.serializers import (
     EstimateSerializer,
     EstimatePointSerializer,
     EstimateReadSerializer,

apiserver/plane/api/views/exporter.py

@@ -1,14 +1,15 @@
 # Third Party imports
 from rest_framework.response import Response
 from rest_framework import status
+from sentry_sdk import capture_exception
 
 # Module imports
 from . import BaseAPIView
-from plane.app.permissions import WorkSpaceAdminPermission
+from plane.api.permissions import WorkSpaceAdminPermission
 from plane.bgtasks.export_task import issue_export_task
 from plane.db.models import Project, ExporterHistory, Workspace
 
-from plane.app.serializers import ExporterHistorySerializer
+from plane.api.serializers import ExporterHistorySerializer
 
 
 class ExportIssuesEndpoint(BaseAPIView):

apiserver/plane/api/views/external.py

@@ -2,21 +2,22 @@
 import requests
 
 # Third party imports
-from openai import OpenAI
+import openai
 from rest_framework.response import Response
 from rest_framework import status
+from rest_framework.permissions import AllowAny
+from sentry_sdk import capture_exception
 
 # Django imports
 from django.conf import settings
 
 # Module imports
 from .base import BaseAPIView
-from plane.app.permissions import ProjectEntityPermission
+from plane.api.permissions import ProjectEntityPermission
 from plane.db.models import Workspace, Project
-from plane.app.serializers import ProjectLiteSerializer, WorkspaceLiteSerializer
+from plane.api.serializers import ProjectLiteSerializer, WorkspaceLiteSerializer
 from plane.utils.integrations.github import get_release_notes
-from plane.license.models import InstanceConfiguration
-from plane.license.utils.instance_value import get_configuration_value
+
 
 class GPTIntegrationEndpoint(BaseAPIView):
     permission_classes = [
@@ -24,14 +25,7 @@ class GPTIntegrationEndpoint(BaseAPIView):
     ]
 
     def post(self, request, slug, project_id):
-
-        # Get the configuration value
-        instance_configuration = InstanceConfiguration.objects.values("key", "value")
-        api_key = get_configuration_value(instance_configuration, "OPENAI_API_KEY")
-        gpt_engine = get_configuration_value(instance_configuration, "GPT_ENGINE")
-
-        # Check the keys
-        if not api_key or not gpt_engine:
+        if not settings.OPENAI_API_KEY or not settings.GPT_ENGINE:
             return Response(
                 {"error": "OpenAI API key and engine is required"},
                 status=status.HTTP_400_BAD_REQUEST,
@@ -47,17 +41,12 @@ class GPTIntegrationEndpoint(BaseAPIView):
 
         final_text = task + "\n" + prompt
 
-        instance_configuration = InstanceConfiguration.objects.values("key", "value")
-        
-        gpt_engine = get_configuration_value(instance_configuration, "GPT_ENGINE")
-
-        client = OpenAI(
-            api_key=api_key,
-        )
-
-        response = client.chat.completions.create(
-            model=gpt_engine,
+        openai.api_key = settings.OPENAI_API_KEY
+        response = openai.ChatCompletion.create(
+            model=settings.GPT_ENGINE,
             messages=[{"role": "user", "content": final_text}],
+            temperature=0.7,
+            max_tokens=1024,
         )
 
         workspace = Workspace.objects.get(slug=slug)
@@ -100,4 +89,4 @@ class UnsplashEndpoint(BaseAPIView):
         }
 
         resp = requests.get(url=url, headers=headers)
-        return Response(resp.json(), status=resp.status_code)
+        return Response(resp.json(), status=status.HTTP_200_OK)

apiserver/plane/api/views/importer.py

@@ -4,12 +4,13 @@ import uuid
 # Third party imports
 from rest_framework import status
 from rest_framework.response import Response
+from sentry_sdk import capture_exception
 
 # Django imports
 from django.db.models import Max, Q
 
 # Module imports
-from plane.app.views import BaseAPIView
+from plane.api.views import BaseAPIView
 from plane.db.models import (
     WorkspaceIntegration,
     Importer,
@@ -29,7 +30,7 @@ from plane.db.models import (
     ModuleIssue,
     Label,
 )
-from plane.app.serializers import (
+from plane.api.serializers import (
     ImporterSerializer,
     IssueFlatSerializer,
     ModuleSerializer,
@@ -38,7 +39,7 @@ from plane.utils.integrations.github import get_github_repo_details
 from plane.utils.importers.jira import jira_project_issue_summary
 from plane.bgtasks.importer_task import service_importer
 from plane.utils.html_processor import strip_tags
-from plane.app.permissions import WorkSpaceAdminPermission
+from plane.api.permissions import WorkSpaceAdminPermission
 
 
 class ServiceIssueImportSummaryEndpoint(BaseAPIView):

apiserver/plane/api/views/inbox.py

@@ -9,10 +9,11 @@ from django.core.serializers.json import DjangoJSONEncoder
 # Third party imports
 from rest_framework import status
 from rest_framework.response import Response
+from sentry_sdk import capture_exception
 
 # Module imports
 from .base import BaseViewSet
-from plane.app.permissions import ProjectBasePermission, ProjectLitePermission
+from plane.api.permissions import ProjectBasePermission, ProjectLitePermission
 from plane.db.models import (
     Inbox,
     InboxIssue,
@@ -21,8 +22,9 @@ from plane.db.models import (
     IssueLink,
     IssueAttachment,
     ProjectMember,
+    ProjectDeployBoard,
 )
-from plane.app.serializers import (
+from plane.api.serializers import (
     IssueSerializer,
     InboxSerializer,
     InboxIssueSerializer,
@@ -62,7 +64,9 @@ class InboxViewSet(BaseViewSet):
         serializer.save(project_id=self.kwargs.get("project_id"))
 
     def destroy(self, request, slug, project_id, pk):
-        inbox = Inbox.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)
+        inbox = Inbox.objects.get(
+            workspace__slug=slug, project_id=project_id, pk=pk
+        )
         # Handle default inbox delete
         if inbox.is_default:
             return Response(
@@ -124,7 +128,9 @@ class InboxIssueViewSet(BaseViewSet):
                 .values("count")
             )
             .annotate(
-                attachment_count=IssueAttachment.objects.filter(issue=OuterRef("id"))
+                attachment_count=IssueAttachment.objects.filter(
+                    issue=OuterRef("id")
+                )
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
@@ -144,6 +150,7 @@ class InboxIssueViewSet(BaseViewSet):
             status=status.HTTP_200_OK,
         )
 
+
     def create(self, request, slug, project_id, inbox_id):
         if not request.data.get("issue", {}).get("name", False):
             return Response(
@@ -191,7 +198,7 @@ class InboxIssueViewSet(BaseViewSet):
             issue_id=str(issue.id),
             project_id=str(project_id),
             current_instance=None,
-            epoch=int(timezone.now().timestamp()),
+            epoch=int(timezone.now().timestamp())
         )
         # create an inbox issue
         InboxIssue.objects.create(
@@ -209,20 +216,10 @@ class InboxIssueViewSet(BaseViewSet):
             pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
         )
         # Get the project member
-        project_member = ProjectMember.objects.get(
-            workspace__slug=slug,
-            project_id=project_id,
-            member=request.user,
-            is_active=True,
-        )
+        project_member = ProjectMember.objects.get(workspace__slug=slug, project_id=project_id, member=request.user)
         # Only project members admins and created_by users can access this endpoint
-        if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(
-            request.user.id
-        ):
-            return Response(
-                {"error": "You cannot edit inbox issues"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
+        if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(request.user.id):
+            return Response({"error": "You cannot edit inbox issues"}, status=status.HTTP_400_BAD_REQUEST)
 
         # Get issue data
         issue_data = request.data.pop("issue", False)
@@ -233,13 +230,11 @@ class InboxIssueViewSet(BaseViewSet):
             )
             # Only allow guests and viewers to edit name and description
             if project_member.role <= 10:
-                # viewers and guests since only viewers and guests
+                # viewers and guests since only viewers and guests 
                 issue_data = {
                     "name": issue_data.get("name", issue.name),
-                    "description_html": issue_data.get(
-                        "description_html", issue.description_html
-                    ),
-                    "description": issue_data.get("description", issue.description),
+                    "description_html": issue_data.get("description_html", issue.description_html),
+                    "description": issue_data.get("description", issue.description)
                 }
 
             issue_serializer = IssueCreateSerializer(
@@ -261,7 +256,7 @@ class InboxIssueViewSet(BaseViewSet):
                             IssueSerializer(current_instance).data,
                             cls=DjangoJSONEncoder,
                         ),
-                        epoch=int(timezone.now().timestamp()),
+                        epoch=int(timezone.now().timestamp())
                     )
                 issue_serializer.save()
             else:
@@ -312,9 +307,7 @@ class InboxIssueViewSet(BaseViewSet):
                 return Response(serializer.data, status=status.HTTP_200_OK)
             return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
         else:
-            return Response(
-                InboxIssueSerializer(inbox_issue).data, status=status.HTTP_200_OK
-            )
+            return Response(InboxIssueSerializer(inbox_issue).data, status=status.HTTP_200_OK)
 
     def retrieve(self, request, slug, project_id, inbox_id, pk):
         inbox_issue = InboxIssue.objects.get(
@@ -331,29 +324,236 @@ class InboxIssueViewSet(BaseViewSet):
             pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
         )
         # Get the project member
-        project_member = ProjectMember.objects.get(
-            workspace__slug=slug,
-            project_id=project_id,
-            member=request.user,
-            is_active=True,
-        )
+        project_member = ProjectMember.objects.get(workspace__slug=slug, project_id=project_id, member=request.user)
 
-        if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(
-            request.user.id
-        ):
-            return Response(
-                {"error": "You cannot delete inbox issue"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
+        if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(request.user.id):
+            return Response({"error": "You cannot delete inbox issue"}, status=status.HTTP_400_BAD_REQUEST)
 
         # Check the issue status
         if inbox_issue.status in [-2, -1, 0, 2]:
             # Delete the issue also
-            Issue.objects.filter(
-                workspace__slug=slug, project_id=project_id, pk=inbox_issue.issue_id
-            ).delete()
+            Issue.objects.filter(workspace__slug=slug, project_id=project_id, pk=inbox_issue.issue_id).delete() 
 
         inbox_issue.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
+class InboxIssuePublicViewSet(BaseViewSet):
+    serializer_class = InboxIssueSerializer
+    model = InboxIssue
+
+    filterset_fields = [
+        "status",
+    ]
+
+    def get_queryset(self):
+        project_deploy_board = ProjectDeployBoard.objects.get(workspace__slug=self.kwargs.get("slug"), project_id=self.kwargs.get("project_id"))
+        if project_deploy_board is not None:
+            return self.filter_queryset(
+                super()
+                .get_queryset()
+                .filter(
+                    Q(snoozed_till__gte=timezone.now()) | Q(snoozed_till__isnull=True),
+                    project_id=self.kwargs.get("project_id"),
+                    workspace__slug=self.kwargs.get("slug"),
+                    inbox_id=self.kwargs.get("inbox_id"),
+                )
+                .select_related("issue", "workspace", "project")
+            )
+        return InboxIssue.objects.none()
+
+    def list(self, request, slug, project_id, inbox_id):
+        project_deploy_board = ProjectDeployBoard.objects.get(workspace__slug=slug, project_id=project_id)
+        if project_deploy_board.inbox is None:
+            return Response({"error": "Inbox is not enabled for this Project Board"}, status=status.HTTP_400_BAD_REQUEST)
+
+        filters = issue_filters(request.query_params, "GET")
+        issues = (
+            Issue.objects.filter(
+                issue_inbox__inbox_id=inbox_id,
+                workspace__slug=slug,
+                project_id=project_id,
+            )
+            .filter(**filters)
+            .annotate(bridge_id=F("issue_inbox__id"))
+            .select_related("workspace", "project", "state", "parent")
+            .prefetch_related("assignees", "labels")
+            .order_by("issue_inbox__snoozed_till", "issue_inbox__status")
+            .annotate(
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(
+                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(
+                attachment_count=IssueAttachment.objects.filter(
+                    issue=OuterRef("id")
+                )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .prefetch_related(
+                Prefetch(
+                    "issue_inbox",
+                    queryset=InboxIssue.objects.only(
+                        "status", "duplicate_to", "snoozed_till", "source"
+                    ),
+                )
+            )
+        )
+        issues_data = IssueStateInboxSerializer(issues, many=True).data
+        return Response(
+            issues_data,
+            status=status.HTTP_200_OK,
+        )
+
+    def create(self, request, slug, project_id, inbox_id):
+        project_deploy_board = ProjectDeployBoard.objects.get(workspace__slug=slug, project_id=project_id)
+        if project_deploy_board.inbox is None:
+            return Response({"error": "Inbox is not enabled for this Project Board"}, status=status.HTTP_400_BAD_REQUEST)
+
+        if not request.data.get("issue", {}).get("name", False):
+            return Response(
+                {"error": "Name is required"}, status=status.HTTP_400_BAD_REQUEST
+            )
+
+        # Check for valid priority
+        if not request.data.get("issue", {}).get("priority", "none") in [
+            "low",
+            "medium",
+            "high",
+            "urgent",
+            "none",
+        ]:
+            return Response(
+                {"error": "Invalid priority"}, status=status.HTTP_400_BAD_REQUEST
+            )
+
+        # Create or get state
+        state, _ = State.objects.get_or_create(
+            name="Triage",
+            group="backlog",
+            description="Default state for managing all Inbox Issues",
+            project_id=project_id,
+            color="#ff7700",
+        )
+
+        # create an issue
+        issue = Issue.objects.create(
+            name=request.data.get("issue", {}).get("name"),
+            description=request.data.get("issue", {}).get("description", {}),
+            description_html=request.data.get("issue", {}).get(
+                "description_html", "<p></p>"
+            ),
+            priority=request.data.get("issue", {}).get("priority", "low"),
+            project_id=project_id,
+            state=state,
+        )
+
+        # Create an Issue Activity
+        issue_activity.delay(
+            type="issue.activity.created",
+            requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
+            actor_id=str(request.user.id),
+            issue_id=str(issue.id),
+            project_id=str(project_id),
+            current_instance=None,
+            epoch=int(timezone.now().timestamp())
+        )
+        # create an inbox issue
+        InboxIssue.objects.create(
+            inbox_id=inbox_id,
+            project_id=project_id,
+            issue=issue,
+            source=request.data.get("source", "in-app"),
+        )
+
+        serializer = IssueStateInboxSerializer(issue)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+    def partial_update(self, request, slug, project_id, inbox_id, pk):
+        project_deploy_board = ProjectDeployBoard.objects.get(workspace__slug=slug, project_id=project_id)
+        if project_deploy_board.inbox is None:
+            return Response({"error": "Inbox is not enabled for this Project Board"}, status=status.HTTP_400_BAD_REQUEST)
+
+        inbox_issue = InboxIssue.objects.get(
+            pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
+        )
+        # Get the project member
+        if str(inbox_issue.created_by_id) != str(request.user.id):
+            return Response({"error": "You cannot edit inbox issues"}, status=status.HTTP_400_BAD_REQUEST)
+
+        # Get issue data
+        issue_data = request.data.pop("issue", False)
+
+
+        issue = Issue.objects.get(
+            pk=inbox_issue.issue_id, workspace__slug=slug, project_id=project_id
+        )
+        # viewers and guests since only viewers and guests 
+        issue_data = {
+            "name": issue_data.get("name", issue.name),
+            "description_html": issue_data.get("description_html", issue.description_html),
+            "description": issue_data.get("description", issue.description)
+        }
+
+        issue_serializer = IssueCreateSerializer(
+            issue, data=issue_data, partial=True
+        )
+
+        if issue_serializer.is_valid():
+            current_instance = issue
+            # Log all the updates
+            requested_data = json.dumps(issue_data, cls=DjangoJSONEncoder)
+            if issue is not None:
+                issue_activity.delay(
+                    type="issue.activity.updated",
+                    requested_data=requested_data,
+                    actor_id=str(request.user.id),
+                    issue_id=str(issue.id),
+                    project_id=str(project_id),
+                    current_instance=json.dumps(
+                        IssueSerializer(current_instance).data,
+                        cls=DjangoJSONEncoder,
+                    ),
+                    epoch=int(timezone.now().timestamp())
+                )
+            issue_serializer.save()
+            return Response(issue_serializer.data, status=status.HTTP_200_OK)
+        return Response(issue_serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def retrieve(self, request, slug, project_id, inbox_id, pk):
+        project_deploy_board = ProjectDeployBoard.objects.get(workspace__slug=slug, project_id=project_id)
+        if project_deploy_board.inbox is None:
+            return Response({"error": "Inbox is not enabled for this Project Board"}, status=status.HTTP_400_BAD_REQUEST)
+    
+        inbox_issue = InboxIssue.objects.get(
+            pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
+        )
+        issue = Issue.objects.get(
+            pk=inbox_issue.issue_id, workspace__slug=slug, project_id=project_id
+        )
+        serializer = IssueStateInboxSerializer(issue)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+    def destroy(self, request, slug, project_id, inbox_id, pk):
+        project_deploy_board = ProjectDeployBoard.objects.get(workspace__slug=slug, project_id=project_id)
+        if project_deploy_board.inbox is None:
+            return Response({"error": "Inbox is not enabled for this Project Board"}, status=status.HTTP_400_BAD_REQUEST)
+
+        inbox_issue = InboxIssue.objects.get(
+            pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
+        )
+
+        if str(inbox_issue.created_by_id) != str(request.user.id):
+            return Response({"error": "You cannot delete inbox issue"}, status=status.HTTP_400_BAD_REQUEST)
+
+        inbox_issue.delete()
+        return Response(status=status.HTTP_204_NO_CONTENT)

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

@@ -7,10 +7,10 @@ from django.contrib.auth.hashers import make_password
 # Third party imports
 from rest_framework.response import Response
 from rest_framework import status
-from sentry_sdk import capture_exception
+from sentry_sdk import capture_exception, capture_message
 
 # Module imports
-from plane.app.views import BaseViewSet
+from plane.api.views import BaseViewSet
 from plane.db.models import (
     Integration,
     WorkspaceIntegration,
@@ -19,12 +19,12 @@ from plane.db.models import (
     WorkspaceMember,
     APIToken,
 )
-from plane.app.serializers import IntegrationSerializer, WorkspaceIntegrationSerializer
+from plane.api.serializers import IntegrationSerializer, WorkspaceIntegrationSerializer
 from plane.utils.integrations.github import (
     get_github_metadata,
     delete_github_installation,
 )
-from plane.app.permissions import WorkSpaceAdminPermission
+from plane.api.permissions import WorkSpaceAdminPermission
 from plane.utils.integrations.slack import slack_oauth
 
 class IntegrationViewSet(BaseViewSet):
@@ -109,6 +109,7 @@ class WorkspaceIntegrationViewSet(BaseViewSet):
             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:
+                capture_message(slack_response)
                 return Response(
                     {"error": "Slack could not be installed. Please try again later"},
                     status=status.HTTP_400_BAD_REQUEST,
@@ -133,6 +134,7 @@ class WorkspaceIntegrationViewSet(BaseViewSet):
             user=bot_user,
             user_type=1,  # bot user
             workspace=workspace,
+            description="",
         )
 
         workspace_integration = WorkspaceIntegration.objects.create(

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

@@ -4,7 +4,7 @@ from rest_framework.response import Response
 from sentry_sdk import capture_exception
 
 # Module imports
-from plane.app.views import BaseViewSet, BaseAPIView
+from plane.api.views import BaseViewSet, BaseAPIView
 from plane.db.models import (
     GithubIssueSync,
     GithubRepositorySync,
@@ -15,13 +15,13 @@ from plane.db.models import (
     GithubCommentSync,
     Project,
 )
-from plane.app.serializers import (
+from plane.api.serializers import (
     GithubIssueSyncSerializer,
     GithubRepositorySyncSerializer,
     GithubCommentSyncSerializer,
 )
 from plane.utils.integrations.github import get_github_repos
-from plane.app.permissions import ProjectBasePermission, ProjectEntityPermission
+from plane.api.permissions import ProjectBasePermission, ProjectEntityPermission
 
 
 class GithubRepositoriesEndpoint(BaseAPIView):

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

@@ -7,10 +7,10 @@ from rest_framework.response import Response
 from sentry_sdk import capture_exception
 
 # Module imports
-from plane.app.views import BaseViewSet, BaseAPIView
+from plane.api.views import BaseViewSet, BaseAPIView
 from plane.db.models import SlackProjectSync, WorkspaceIntegration, ProjectMember
-from plane.app.serializers import SlackProjectSyncSerializer
-from plane.app.permissions import ProjectBasePermission, ProjectEntityPermission
+from plane.api.serializers import SlackProjectSyncSerializer
+from plane.api.permissions import ProjectBasePermission, ProjectEntityPermission
 from plane.utils.integrations.slack import slack_oauth
 
 
@@ -59,7 +59,6 @@ class SlackProjectSyncViewSet(BaseViewSet):
                 team_id=slack_response.get("team", {}).get("id"),
                 team_name=slack_response.get("team", {}).get("name"),
                 workspace_integration=workspace_integration,
-                project_id=project_id,
             )
             _ = ProjectMember.objects.get_or_create(
                 member=workspace_integration.actor, role=20, project_id=project_id

apiserver/plane/api/views/issue.py

@@ -29,10 +29,12 @@ from django.db import IntegrityError
 from rest_framework.response import Response
 from rest_framework import status
 from rest_framework.parsers import MultiPartParser, FormParser
+from rest_framework.permissions import AllowAny, IsAuthenticated
+from sentry_sdk import capture_exception
 
 # Module imports
-from . import BaseViewSet, BaseAPIView, WebhookMixin
-from plane.app.serializers import (
+from . import BaseViewSet, BaseAPIView
+from plane.api.serializers import (
     IssueCreateSerializer,
     IssueActivitySerializer,
     IssueCommentSerializer,
@@ -52,7 +54,7 @@ from plane.app.serializers import (
     RelatedIssueSerializer,
     IssuePublicSerializer,
 )
-from plane.app.permissions import (
+from plane.api.permissions import (
     ProjectEntityPermission,
     WorkSpaceAdminPermission,
     ProjectMemberPermission,
@@ -82,7 +84,7 @@ from plane.utils.grouper import group_results
 from plane.utils.issue_filters import issue_filters
 
 
-class IssueViewSet(WebhookMixin, BaseViewSet):
+class IssueViewSet(BaseViewSet):
     def get_serializer_class(self):
         return (
             IssueCreateSerializer
@@ -91,7 +93,6 @@ class IssueViewSet(WebhookMixin, BaseViewSet):
         )
 
     model = Issue
-    webhook_event = "issue"
     permission_classes = [
         ProjectEntityPermission,
     ]
@@ -311,104 +312,6 @@ class IssueViewSet(WebhookMixin, BaseViewSet):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
-class IssueListEndpoint(BaseAPIView):
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-
-    def get(self, request, slug, project_id):
-        fields = [field for field in request.GET.get("fields", "").split(",") if field]
-        filters = issue_filters(request.query_params, "GET")
-
-        issue_queryset = (
-            Issue.objects.filter(workspace__slug=slug, project_id=project_id)
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("state")
-            .select_related("parent")
-            .prefetch_related("assignees")
-            .prefetch_related("labels")
-            .prefetch_related(
-                Prefetch(
-                    "issue_reactions",
-                    queryset=IssueReaction.objects.select_related("actor"),
-                )
-            )
-            .filter(**filters)
-            .annotate(cycle_id=F("issue_cycle__cycle_id"))
-            .annotate(module_id=F("issue_module__module_id"))
-            .annotate(
-                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .annotate(
-                attachment_count=IssueAttachment.objects.filter(issue=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .distinct()
-        )
-
-        serializer = IssueLiteSerializer(
-            issue_queryset, many=True, fields=fields if fields else None
-        )
-
-        return Response(serializer.data, status=status.HTTP_200_OK)
-
-
-class IssueListGroupedEndpoint(BaseAPIView):
-
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-
-    def get(self, request, slug, project_id):
-        filters = issue_filters(request.query_params, "GET")
-        fields = [field for field in request.GET.get("fields", "").split(",") if field]
-
-        issue_queryset = (
-            Issue.objects.filter(workspace__slug=slug, project_id=project_id)
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("state")
-            .select_related("parent")
-            .prefetch_related("assignees")
-            .prefetch_related("labels")
-            .prefetch_related(
-                Prefetch(
-                    "issue_reactions",
-                    queryset=IssueReaction.objects.select_related("actor"),
-                )
-            )
-            .filter(**filters)
-            .annotate(cycle_id=F("issue_cycle__cycle_id"))
-            .annotate(module_id=F("issue_module__module_id"))
-            .annotate(
-                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .annotate(
-                attachment_count=IssueAttachment.objects.filter(issue=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .distinct()
-        )
-
-        issues = IssueLiteSerializer(issue_queryset, many=True, fields=fields if fields else None).data
-        issue_dict = {str(issue["id"]): issue for issue in issues}
-        return Response(
-            issue_dict,
-            status=status.HTTP_200_OK,
-        )
-
-
 class UserWorkSpaceIssues(BaseAPIView):
     @method_decorator(gzip_page)
     def get(self, request, slug):
@@ -593,10 +496,9 @@ class IssueActivityEndpoint(BaseAPIView):
         return Response(result_list, status=status.HTTP_200_OK)
 
 
-class IssueCommentViewSet(WebhookMixin, BaseViewSet):
+class IssueCommentViewSet(BaseViewSet):
     serializer_class = IssueCommentSerializer
     model = IssueComment
-    webhook_event = "issue-comment"
     permission_classes = [
         ProjectLitePermission,
     ]
@@ -623,7 +525,6 @@ class IssueCommentViewSet(WebhookMixin, BaseViewSet):
                         workspace__slug=self.kwargs.get("slug"),
                         project_id=self.kwargs.get("project_id"),
                         member_id=self.request.user.id,
-                        is_active=True,
                     )
                 )
             )
@@ -754,8 +655,8 @@ class LabelViewSet(BaseViewSet):
             .select_related("project")
             .select_related("workspace")
             .select_related("parent")
+            .order_by("name")
             .distinct()
-            .order_by("sort_order")
         )
 
 
@@ -1255,11 +1156,7 @@ class IssueSubscriberViewSet(BaseViewSet):
 
     def list(self, request, slug, project_id, issue_id):
         members = (
-            ProjectMember.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                is_active=True,
-            )
+            ProjectMember.objects.filter(workspace__slug=slug, project_id=project_id)
             .annotate(
                 is_subscribed=Exists(
                     IssueSubscriber.objects.filter(
@@ -1460,6 +1357,425 @@ class CommentReactionViewSet(BaseViewSet):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
+class IssueCommentPublicViewSet(BaseViewSet):
+    serializer_class = IssueCommentSerializer
+    model = IssueComment
+
+    filterset_fields = [
+        "issue__id",
+        "workspace__id",
+    ]
+
+    def get_permissions(self):
+        if self.action in ["list", "retrieve"]:
+            self.permission_classes = [
+                AllowAny,
+            ]
+        else:
+            self.permission_classes = [
+                IsAuthenticated,
+            ]
+
+        return super(IssueCommentPublicViewSet, self).get_permissions()
+
+    def get_queryset(self):
+        try:
+            project_deploy_board = ProjectDeployBoard.objects.get(
+                workspace__slug=self.kwargs.get("slug"),
+                project_id=self.kwargs.get("project_id"),
+            )
+            if project_deploy_board.comments:
+                return self.filter_queryset(
+                    super()
+                    .get_queryset()
+                    .filter(workspace__slug=self.kwargs.get("slug"))
+                    .filter(issue_id=self.kwargs.get("issue_id"))
+                    .filter(access="EXTERNAL")
+                    .select_related("project")
+                    .select_related("workspace")
+                    .select_related("issue")
+                    .annotate(
+                        is_member=Exists(
+                            ProjectMember.objects.filter(
+                                workspace__slug=self.kwargs.get("slug"),
+                                project_id=self.kwargs.get("project_id"),
+                                member_id=self.request.user.id,
+                            )
+                        )
+                    )
+                    .distinct()
+                ).order_by("created_at")
+            return IssueComment.objects.none()
+        except ProjectDeployBoard.DoesNotExist:
+            return IssueComment.objects.none()
+
+    def create(self, request, slug, project_id, issue_id):
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=slug, project_id=project_id
+        )
+
+        if not project_deploy_board.comments:
+            return Response(
+                {"error": "Comments are not enabled for this project"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        serializer = IssueCommentSerializer(data=request.data)
+        if serializer.is_valid():
+            serializer.save(
+                project_id=project_id,
+                issue_id=issue_id,
+                actor=request.user,
+                access="EXTERNAL",
+            )
+            issue_activity.delay(
+                type="comment.activity.created",
+                requested_data=json.dumps(serializer.data, cls=DjangoJSONEncoder),
+                actor_id=str(request.user.id),
+                issue_id=str(issue_id),
+                project_id=str(project_id),
+                current_instance=None,
+                epoch=int(timezone.now().timestamp()),
+            )
+            if not ProjectMember.objects.filter(
+                project_id=project_id,
+                member=request.user,
+            ).exists():
+                # Add the user for workspace tracking
+                _ = ProjectPublicMember.objects.get_or_create(
+                    project_id=project_id,
+                    member=request.user,
+                )
+
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def partial_update(self, request, slug, project_id, issue_id, pk):
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=slug, project_id=project_id
+        )
+
+        if not project_deploy_board.comments:
+            return Response(
+                {"error": "Comments are not enabled for this project"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        comment = IssueComment.objects.get(
+            workspace__slug=slug, pk=pk, actor=request.user
+        )
+        serializer = IssueCommentSerializer(comment, data=request.data, partial=True)
+        if serializer.is_valid():
+            serializer.save()
+            issue_activity.delay(
+                type="comment.activity.updated",
+                requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
+                actor_id=str(request.user.id),
+                issue_id=str(issue_id),
+                project_id=str(project_id),
+                current_instance=json.dumps(
+                    IssueCommentSerializer(comment).data,
+                    cls=DjangoJSONEncoder,
+                ),
+                epoch=int(timezone.now().timestamp()),
+            )
+            return Response(serializer.data, status=status.HTTP_200_OK)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def destroy(self, request, slug, project_id, issue_id, pk):
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=slug, project_id=project_id
+        )
+
+        if not project_deploy_board.comments:
+            return Response(
+                {"error": "Comments are not enabled for this project"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        comment = IssueComment.objects.get(
+            workspace__slug=slug, pk=pk, project_id=project_id, actor=request.user
+        )
+        issue_activity.delay(
+            type="comment.activity.deleted",
+            requested_data=json.dumps({"comment_id": str(pk)}),
+            actor_id=str(request.user.id),
+            issue_id=str(issue_id),
+            project_id=str(project_id),
+            current_instance=json.dumps(
+                IssueCommentSerializer(comment).data,
+                cls=DjangoJSONEncoder,
+            ),
+            epoch=int(timezone.now().timestamp()),
+        )
+        comment.delete()
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+
+class IssueReactionPublicViewSet(BaseViewSet):
+    serializer_class = IssueReactionSerializer
+    model = IssueReaction
+
+    def get_queryset(self):
+        try:
+            project_deploy_board = ProjectDeployBoard.objects.get(
+                workspace__slug=self.kwargs.get("slug"),
+                project_id=self.kwargs.get("project_id"),
+            )
+            if project_deploy_board.reactions:
+                return (
+                    super()
+                    .get_queryset()
+                    .filter(workspace__slug=self.kwargs.get("slug"))
+                    .filter(project_id=self.kwargs.get("project_id"))
+                    .filter(issue_id=self.kwargs.get("issue_id"))
+                    .order_by("-created_at")
+                    .distinct()
+                )
+            return IssueReaction.objects.none()
+        except ProjectDeployBoard.DoesNotExist:
+            return IssueReaction.objects.none()
+
+    def create(self, request, slug, project_id, issue_id):
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=slug, project_id=project_id
+        )
+
+        if not project_deploy_board.reactions:
+            return Response(
+                {"error": "Reactions are not enabled for this project board"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        serializer = IssueReactionSerializer(data=request.data)
+        if serializer.is_valid():
+            serializer.save(
+                project_id=project_id, issue_id=issue_id, actor=request.user
+            )
+            if not ProjectMember.objects.filter(
+                project_id=project_id,
+                member=request.user,
+            ).exists():
+                # Add the user for workspace tracking
+                _ = ProjectPublicMember.objects.get_or_create(
+                    project_id=project_id,
+                    member=request.user,
+                )
+            issue_activity.delay(
+                type="issue_reaction.activity.created",
+                requested_data=json.dumps(self.request.data, cls=DjangoJSONEncoder),
+                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,
+                epoch=int(timezone.now().timestamp()),
+            )
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def destroy(self, request, slug, project_id, issue_id, reaction_code):
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=slug, project_id=project_id
+        )
+
+        if not project_deploy_board.reactions:
+            return Response(
+                {"error": "Reactions are not enabled for this project board"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        issue_reaction = IssueReaction.objects.get(
+            workspace__slug=slug,
+            issue_id=issue_id,
+            reaction=reaction_code,
+            actor=request.user,
+        )
+        issue_activity.delay(
+            type="issue_reaction.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=json.dumps(
+                {
+                    "reaction": str(reaction_code),
+                    "identifier": str(issue_reaction.id),
+                }
+            ),
+            epoch=int(timezone.now().timestamp()),
+        )
+        issue_reaction.delete()
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+
+class CommentReactionPublicViewSet(BaseViewSet):
+    serializer_class = CommentReactionSerializer
+    model = CommentReaction
+
+    def get_queryset(self):
+        try:
+            project_deploy_board = ProjectDeployBoard.objects.get(
+                workspace__slug=self.kwargs.get("slug"),
+                project_id=self.kwargs.get("project_id"),
+            )
+            if project_deploy_board.reactions:
+                return (
+                    super()
+                    .get_queryset()
+                    .filter(workspace__slug=self.kwargs.get("slug"))
+                    .filter(project_id=self.kwargs.get("project_id"))
+                    .filter(comment_id=self.kwargs.get("comment_id"))
+                    .order_by("-created_at")
+                    .distinct()
+                )
+            return CommentReaction.objects.none()
+        except ProjectDeployBoard.DoesNotExist:
+            return CommentReaction.objects.none()
+
+    def create(self, request, slug, project_id, comment_id):
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=slug, project_id=project_id
+        )
+
+        if not project_deploy_board.reactions:
+            return Response(
+                {"error": "Reactions are not enabled for this board"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        serializer = CommentReactionSerializer(data=request.data)
+        if serializer.is_valid():
+            serializer.save(
+                project_id=project_id, comment_id=comment_id, actor=request.user
+            )
+            if not ProjectMember.objects.filter(
+                project_id=project_id, member=request.user
+            ).exists():
+                # Add the user for workspace tracking
+                _ = ProjectPublicMember.objects.get_or_create(
+                    project_id=project_id,
+                    member=request.user,
+                )
+            issue_activity.delay(
+                type="comment_reaction.activity.created",
+                requested_data=json.dumps(self.request.data, cls=DjangoJSONEncoder),
+                actor_id=str(self.request.user.id),
+                issue_id=None,
+                project_id=str(self.kwargs.get("project_id", None)),
+                current_instance=None,
+                epoch=int(timezone.now().timestamp()),
+            )
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def destroy(self, request, slug, project_id, comment_id, reaction_code):
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=slug, project_id=project_id
+        )
+        if not project_deploy_board.reactions:
+            return Response(
+                {"error": "Reactions are not enabled for this board"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        comment_reaction = CommentReaction.objects.get(
+            project_id=project_id,
+            workspace__slug=slug,
+            comment_id=comment_id,
+            reaction=reaction_code,
+            actor=request.user,
+        )
+        issue_activity.delay(
+            type="comment_reaction.activity.deleted",
+            requested_data=None,
+            actor_id=str(self.request.user.id),
+            issue_id=None,
+            project_id=str(self.kwargs.get("project_id", None)),
+            current_instance=json.dumps(
+                {
+                    "reaction": str(reaction_code),
+                    "identifier": str(comment_reaction.id),
+                    "comment_id": str(comment_id),
+                }
+            ),
+            epoch=int(timezone.now().timestamp()),
+        )
+        comment_reaction.delete()
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+
+class IssueVotePublicViewSet(BaseViewSet):
+    model = IssueVote
+    serializer_class = IssueVoteSerializer
+
+    def get_queryset(self):
+        try:
+            project_deploy_board = ProjectDeployBoard.objects.get(
+                workspace__slug=self.kwargs.get("slug"),
+                project_id=self.kwargs.get("project_id"),
+            )
+            if project_deploy_board.votes:
+                return (
+                    super()
+                    .get_queryset()
+                    .filter(issue_id=self.kwargs.get("issue_id"))
+                    .filter(workspace__slug=self.kwargs.get("slug"))
+                    .filter(project_id=self.kwargs.get("project_id"))
+                )
+            return IssueVote.objects.none()
+        except ProjectDeployBoard.DoesNotExist:
+            return IssueVote.objects.none()
+
+    def create(self, request, slug, project_id, issue_id):
+        issue_vote, _ = IssueVote.objects.get_or_create(
+            actor_id=request.user.id,
+            project_id=project_id,
+            issue_id=issue_id,
+        )
+        # Add the user for workspace tracking
+        if not ProjectMember.objects.filter(
+            project_id=project_id, member=request.user
+        ).exists():
+            _ = ProjectPublicMember.objects.get_or_create(
+                project_id=project_id,
+                member=request.user,
+            )
+        issue_vote.vote = request.data.get("vote", 1)
+        issue_vote.save()
+        issue_activity.delay(
+            type="issue_vote.activity.created",
+            requested_data=json.dumps(self.request.data, cls=DjangoJSONEncoder),
+            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,
+            epoch=int(timezone.now().timestamp()),
+        )
+        serializer = IssueVoteSerializer(issue_vote)
+        return Response(serializer.data, status=status.HTTP_201_CREATED)
+
+    def destroy(self, request, slug, project_id, issue_id):
+        issue_vote = IssueVote.objects.get(
+            workspace__slug=slug,
+            project_id=project_id,
+            issue_id=issue_id,
+            actor_id=request.user.id,
+        )
+        issue_activity.delay(
+            type="issue_vote.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=json.dumps(
+                {
+                    "vote": str(issue_vote.vote),
+                    "identifier": str(issue_vote.id),
+                }
+            ),
+            epoch=int(timezone.now().timestamp()),
+        )
+        issue_vote.delete()
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+
 class IssueRelationViewSet(BaseViewSet):
     serializer_class = IssueRelationSerializer
     model = IssueRelation
@@ -1545,6 +1861,182 @@ class IssueRelationViewSet(BaseViewSet):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
+class IssueRetrievePublicEndpoint(BaseAPIView):
+    permission_classes = [
+        AllowAny,
+    ]
+
+    def get(self, request, slug, project_id, issue_id):
+        issue = Issue.objects.get(
+            workspace__slug=slug, project_id=project_id, pk=issue_id
+        )
+        serializer = IssuePublicSerializer(issue)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+
+class ProjectIssuesPublicEndpoint(BaseAPIView):
+    permission_classes = [
+        AllowAny,
+    ]
+
+    def get(self, request, slug, project_id):
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=slug, project_id=project_id
+        )
+
+        filters = issue_filters(request.query_params, "GET")
+
+        # Custom ordering for priority and state
+        priority_order = ["urgent", "high", "medium", "low", "none"]
+        state_order = ["backlog", "unstarted", "started", "completed", "cancelled"]
+
+        order_by_param = request.GET.get("order_by", "-created_at")
+
+        issue_queryset = (
+            Issue.issue_objects.annotate(
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .filter(project_id=project_id)
+            .filter(workspace__slug=slug)
+            .select_related("project", "workspace", "state", "parent")
+            .prefetch_related("assignees", "labels")
+            .prefetch_related(
+                Prefetch(
+                    "issue_reactions",
+                    queryset=IssueReaction.objects.select_related("actor"),
+                )
+            )
+            .prefetch_related(
+                Prefetch(
+                    "votes",
+                    queryset=IssueVote.objects.select_related("actor"),
+                )
+            )
+            .filter(**filters)
+            .annotate(cycle_id=F("issue_cycle__cycle_id"))
+            .annotate(module_id=F("issue_module__module_id"))
+            .annotate(
+                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(
+                attachment_count=IssueAttachment.objects.filter(issue=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+        )
+
+        # Priority Ordering
+        if order_by_param == "priority" or order_by_param == "-priority":
+            priority_order = (
+                priority_order if order_by_param == "priority" else priority_order[::-1]
+            )
+            issue_queryset = issue_queryset.annotate(
+                priority_order=Case(
+                    *[
+                        When(priority=p, then=Value(i))
+                        for i, p in enumerate(priority_order)
+                    ],
+                    output_field=CharField(),
+                )
+            ).order_by("priority_order")
+
+        # State Ordering
+        elif order_by_param in [
+            "state__name",
+            "state__group",
+            "-state__name",
+            "-state__group",
+        ]:
+            state_order = (
+                state_order
+                if order_by_param in ["state__name", "state__group"]
+                else state_order[::-1]
+            )
+            issue_queryset = issue_queryset.annotate(
+                state_order=Case(
+                    *[
+                        When(state__group=state_group, then=Value(i))
+                        for i, state_group in enumerate(state_order)
+                    ],
+                    default=Value(len(state_order)),
+                    output_field=CharField(),
+                )
+            ).order_by("state_order")
+        # assignee and label ordering
+        elif order_by_param in [
+            "labels__name",
+            "-labels__name",
+            "assignees__first_name",
+            "-assignees__first_name",
+        ]:
+            issue_queryset = issue_queryset.annotate(
+                max_values=Max(
+                    order_by_param[1::]
+                    if order_by_param.startswith("-")
+                    else order_by_param
+                )
+            ).order_by(
+                "-max_values" if order_by_param.startswith("-") else "max_values"
+            )
+        else:
+            issue_queryset = issue_queryset.order_by(order_by_param)
+
+        issues = IssuePublicSerializer(issue_queryset, many=True).data
+
+        state_group_order = [
+            "backlog",
+            "unstarted",
+            "started",
+            "completed",
+            "cancelled",
+        ]
+
+        states = (
+            State.objects.filter(
+                ~Q(name="Triage"),
+                workspace__slug=slug,
+                project_id=project_id,
+            )
+            .annotate(
+                custom_order=Case(
+                    *[
+                        When(group=value, then=Value(index))
+                        for index, value in enumerate(state_group_order)
+                    ],
+                    default=Value(len(state_group_order)),
+                    output_field=IntegerField(),
+                ),
+            )
+            .values("name", "group", "color", "id")
+            .order_by("custom_order", "sequence")
+        )
+
+        labels = Label.objects.filter(
+            workspace__slug=slug, project_id=project_id
+        ).values("id", "name", "color", "parent")
+
+        ## Grouping the results
+        group_by = request.GET.get("group_by", False)
+        if group_by:
+            issues = group_results(issues, group_by)
+
+        return Response(
+            {
+                "issues": issues,
+                "states": states,
+                "labels": labels,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+
 class IssueDraftViewSet(BaseViewSet):
     permission_classes = [
         ProjectEntityPermission,
@@ -1738,7 +2230,7 @@ class IssueDraftViewSet(BaseViewSet):
     def destroy(self, request, slug, project_id, pk=None):
         issue = Issue.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)
         current_instance = json.dumps(
-            IssueSerializer(issue).data, cls=DjangoJSONEncoder
+            IssueSerializer(current_instance).data, cls=DjangoJSONEncoder
         )
         issue.delete()
         issue_activity.delay(

apiserver/plane/api/views/module.py

@@ -3,6 +3,7 @@ import json
 
 # Django Imports
 from django.utils import timezone
+from django.db import IntegrityError
 from django.db.models import Prefetch, F, OuterRef, Func, Exists, Count, Q
 from django.core import serializers
 from django.utils.decorators import method_decorator
@@ -11,10 +12,11 @@ from django.views.decorators.gzip import gzip_page
 # Third party imports
 from rest_framework.response import Response
 from rest_framework import status
+from sentry_sdk import capture_exception
 
 # Module imports
-from . import BaseViewSet, BaseAPIView, WebhookMixin
-from plane.app.serializers import (
+from . import BaseViewSet
+from plane.api.serializers import (
     ModuleWriteSerializer,
     ModuleSerializer,
     ModuleIssueSerializer,
@@ -22,7 +24,7 @@ from plane.app.serializers import (
     ModuleFavoriteSerializer,
     IssueStateSerializer,
 )
-from plane.app.permissions import ProjectEntityPermission
+from plane.api.permissions import ProjectEntityPermission
 from plane.db.models import (
     Module,
     ModuleIssue,
@@ -39,12 +41,11 @@ from plane.utils.issue_filters import issue_filters
 from plane.utils.analytics_plot import burndown_plot
 
 
-class ModuleViewSet(WebhookMixin, BaseViewSet):
+class ModuleViewSet(BaseViewSet):
     model = Module
     permission_classes = [
         ProjectEntityPermission,
     ]
-    webhook_event = "module"
 
     def get_serializer_class(self):
         return (
@@ -54,6 +55,7 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
         )
 
     def get_queryset(self):
+        order_by = self.request.GET.get("order_by", "sort_order")
 
         subquery = ModuleFavorite.objects.filter(
             user=self.request.user,
@@ -136,7 +138,7 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
                     ),
                 )
             )
-            .order_by("-is_favorite","-created_at")
+            .order_by(order_by, "name")
         )
 
     def create(self, request, slug, project_id):
@@ -264,12 +266,12 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
         module_issues = list(
             ModuleIssue.objects.filter(module_id=pk).values_list("issue", flat=True)
         )
+        module.delete()
         issue_activity.delay(
             type="module.activity.deleted",
             requested_data=json.dumps(
                 {
                     "module_id": str(pk),
-                    "module_name": str(module.name),
                     "issues": [str(issue_id) for issue_id in module_issues],
                 }
             ),
@@ -279,7 +281,6 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
             current_instance=None,
             epoch=int(timezone.now().timestamp()),
         )
-        module.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
@@ -296,6 +297,12 @@ class ModuleIssueViewSet(BaseViewSet):
         ProjectEntityPermission,
     ]
 
+    def perform_create(self, serializer):
+        serializer.save(
+            project_id=self.kwargs.get("project_id"),
+            module_id=self.kwargs.get("module_id"),
+        )
+
     def get_queryset(self):
         return self.filter_queryset(
             super()
@@ -439,7 +446,7 @@ class ModuleIssueViewSet(BaseViewSet):
             type="module.activity.created",
             requested_data=json.dumps({"modules_list": issues}),
             actor_id=str(self.request.user.id),
-            issue_id=None,
+            issue_id=str(self.kwargs.get("pk", None)),
             project_id=str(self.kwargs.get("project_id", None)),
             current_instance=json.dumps(
                 {
@@ -479,55 +486,6 @@ class ModuleIssueViewSet(BaseViewSet):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
-class ModuleIssueGroupedEndpoint(BaseAPIView):
-
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-
-    def get(self, request, slug, project_id, module_id):
-        filters = issue_filters(request.query_params, "GET")
-        fields = [field for field in request.GET.get("fields", "").split(",") if field]
-
-        issues = (
-            Issue.issue_objects.filter(issue_module__module_id=module_id)
-            .annotate(
-                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .annotate(bridge_id=F("issue_module__id"))
-            .filter(project_id=project_id)
-            .filter(workspace__slug=slug)
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("state")
-            .select_related("parent")
-            .prefetch_related("assignees")
-            .prefetch_related("labels")
-            .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 = IssueStateSerializer(issues, many=True, fields=fields if fields else None).data
-        issue_dict = {str(issue["id"]): issue for issue in issues}
-        return Response(
-            issue_dict,
-            status=status.HTTP_200_OK,
-        )
-
 class ModuleLinkViewSet(BaseViewSet):
     permission_classes = [
         ProjectEntityPermission,

apiserver/plane/api/views/notification.py

@@ -5,6 +5,7 @@ from django.utils import timezone
 # Third party imports
 from rest_framework import status
 from rest_framework.response import Response
+from sentry_sdk import capture_exception
 from plane.utils.paginator import BasePaginator
 
 # Module imports
@@ -16,7 +17,7 @@ from plane.db.models import (
     Issue,
     WorkspaceMember,
 )
-from plane.app.serializers import NotificationSerializer
+from plane.api.serializers import NotificationSerializer
 
 
 class NotificationViewSet(BaseViewSet, BasePaginator):
@@ -84,10 +85,7 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
         # Created issues
         if type == "created":
             if WorkspaceMember.objects.filter(
-                workspace__slug=slug,
-                member=request.user,
-                role__lt=15,
-                is_active=True,
+                workspace__slug=slug, member=request.user, role__lt=15
             ).exists():
                 notifications = Notification.objects.none()
             else:
@@ -257,10 +255,7 @@ class MarkAllReadNotificationViewSet(BaseViewSet):
         # Created issues
         if type == "created":
             if WorkspaceMember.objects.filter(
-                workspace__slug=slug,
-                member=request.user,
-                role__lt=15,
-                is_active=True,
+                workspace__slug=slug, member=request.user, role__lt=15
             ).exists():
                 notifications = Notification.objects.none()
             else:

apiserver/plane/api/views/oauth.py

@@ -2,7 +2,6 @@
 import uuid
 import requests
 import os
-from requests.exceptions import RequestException
 
 # Django imports
 from django.utils import timezone
@@ -21,14 +20,8 @@ from google.oauth2 import id_token
 from google.auth.transport import requests as google_auth_request
 
 # Module imports
-from plane.db.models import (
-    SocialLoginConnection,
-    User,
-    WorkspaceMemberInvite,
-    WorkspaceMember,
-    ProjectMemberInvite,
-    ProjectMember,
-)
+from plane.db.models import SocialLoginConnection, User
+from plane.api.serializers import UserSerializer
 from .base import BaseAPIView
 
 
@@ -175,6 +168,7 @@ class OauthEndpoint(BaseAPIView):
                 )
 
             ## Login Case
+
             if not user.is_active:
                 return Response(
                     {
@@ -191,61 +185,12 @@ class OauthEndpoint(BaseAPIView):
             user.is_email_verified = email_verified
             user.save()
 
-            # Check if user has any accepted invites for workspace and add them to workspace
-            workspace_member_invites = WorkspaceMemberInvite.objects.filter(
-                email=user.email, accepted=True
-            )
+            access_token, refresh_token = get_tokens_for_user(user)
 
-            WorkspaceMember.objects.bulk_create(
-                [
-                    WorkspaceMember(
-                        workspace_id=workspace_member_invite.workspace_id,
-                        member=user,
-                        role=workspace_member_invite.role,
-                    )
-                    for workspace_member_invite in workspace_member_invites
-                ],
-                ignore_conflicts=True,
-            )
-
-            # Check if user has any project invites
-            project_member_invites = ProjectMemberInvite.objects.filter(
-                email=user.email, accepted=True
-            )
-
-            # Add user to workspace
-            WorkspaceMember.objects.bulk_create(
-                [
-                    WorkspaceMember(
-                        workspace_id=project_member_invite.workspace_id,
-                        role=project_member_invite.role
-                        if project_member_invite.role in [5, 10, 15]
-                        else 15,
-                        member=user,
-                        created_by_id=project_member_invite.created_by_id,
-                    )
-                    for project_member_invite in project_member_invites
-                ],
-                ignore_conflicts=True,
-            )
-
-            # Now add the users to project
-            ProjectMember.objects.bulk_create(
-                [
-                    ProjectMember(
-                        workspace_id=project_member_invite.workspace_id,
-                        role=project_member_invite.role
-                        if project_member_invite.role in [5, 10, 15]
-                        else 15,
-                        member=user,
-                        created_by_id=project_member_invite.created_by_id,
-                    ) for project_member_invite in project_member_invites
-                ],
-                ignore_conflicts=True,
-            )
-            # Delete all the invites
-            workspace_member_invites.delete()
-            project_member_invites.delete()
+            data = {
+                "access_token": access_token,
+                "refresh_token": refresh_token,
+            }
 
             SocialLoginConnection.objects.update_or_create(
                 medium=medium,
@@ -256,36 +201,26 @@ class OauthEndpoint(BaseAPIView):
                     "last_login_at": timezone.now(),
                 },
             )
-            try:
-                if settings.ANALYTICS_BASE_API:
-                    _ = requests.post(
-                        settings.ANALYTICS_BASE_API,
-                        headers={
-                            "Content-Type": "application/json",
-                            "X-Auth-Token": settings.ANALYTICS_SECRET_KEY,
+            if settings.ANALYTICS_BASE_API:
+                _ = requests.post(
+                    settings.ANALYTICS_BASE_API,
+                    headers={
+                        "Content-Type": "application/json",
+                        "X-Auth-Token": settings.ANALYTICS_SECRET_KEY,
+                    },
+                    json={
+                        "event_id": uuid.uuid4().hex,
+                        "event_data": {
+                            "medium": f"oauth-{medium}",
                         },
-                        json={
-                            "event_id": uuid.uuid4().hex,
-                            "event_data": {
-                                "medium": f"oauth-{medium}",
-                            },
-                            "user": {"email": email, "id": str(user.id)},
-                            "device_ctx": {
-                                "ip": request.META.get("REMOTE_ADDR"),
-                                "user_agent": request.META.get("HTTP_USER_AGENT"),
-                            },
-                            "event_type": "SIGN_IN",
+                        "user": {"email": email, "id": str(user.id)},
+                        "device_ctx": {
+                            "ip": request.META.get("REMOTE_ADDR"),
+                            "user_agent": request.META.get("HTTP_USER_AGENT"),
                         },
-                    )
-            except RequestException as e:
-                capture_exception(e)
-
-            access_token, refresh_token = get_tokens_for_user(user)
-
-            data = {
-                "access_token": access_token,
-                "refresh_token": refresh_token,
-            }
+                        "event_type": "SIGN_IN",
+                    },
+                )
             return Response(data, status=status.HTTP_200_OK)
 
         except User.DoesNotExist:
@@ -325,85 +260,31 @@ class OauthEndpoint(BaseAPIView):
             user.token_updated_at = timezone.now()
             user.save()
 
-            # Check if user has any accepted invites for workspace and add them to workspace
-            workspace_member_invites = WorkspaceMemberInvite.objects.filter(
-                email=user.email, accepted=True
-            )
-
-            WorkspaceMember.objects.bulk_create(
-                [
-                    WorkspaceMember(
-                        workspace_id=workspace_member_invite.workspace_id,
-                        member=user,
-                        role=workspace_member_invite.role,
-                    )
-                    for workspace_member_invite in workspace_member_invites
-                ],
-                ignore_conflicts=True,
-            )
-
-            # Check if user has any project invites
-            project_member_invites = ProjectMemberInvite.objects.filter(
-                email=user.email, accepted=True
-            )
-
-            # Add user to workspace
-            WorkspaceMember.objects.bulk_create(
-                [
-                    WorkspaceMember(
-                        workspace_id=project_member_invite.workspace_id,
-                        role=project_member_invite.role
-                        if project_member_invite.role in [5, 10, 15]
-                        else 15,
-                        member=user,
-                        created_by_id=project_member_invite.created_by_id,
-                    )
-                    for project_member_invite in project_member_invites
-                ],
-                ignore_conflicts=True,
-            )
-
-            # Now add the users to project
-            ProjectMember.objects.bulk_create(
-                [
-                    ProjectMember(
-                        workspace_id=project_member_invite.workspace_id,
-                        role=project_member_invite.role
-                        if project_member_invite.role in [5, 10, 15]
-                        else 15,
-                        member=user,
-                        created_by_id=project_member_invite.created_by_id,
-                    ) for project_member_invite in project_member_invites
-                ],
-                ignore_conflicts=True,
-            )
-            # Delete all the invites
-            workspace_member_invites.delete()
-            project_member_invites.delete()
-
-            try:
-                if settings.ANALYTICS_BASE_API:
-                    _ = requests.post(
-                        settings.ANALYTICS_BASE_API,
-                        headers={
-                            "Content-Type": "application/json",
-                            "X-Auth-Token": settings.ANALYTICS_SECRET_KEY,
+            access_token, refresh_token = get_tokens_for_user(user)
+            data = {
+                "access_token": access_token,
+                "refresh_token": refresh_token,
+            }
+            if settings.ANALYTICS_BASE_API:
+                _ = requests.post(
+                    settings.ANALYTICS_BASE_API,
+                    headers={
+                        "Content-Type": "application/json",
+                        "X-Auth-Token": settings.ANALYTICS_SECRET_KEY,
+                    },
+                    json={
+                        "event_id": uuid.uuid4().hex,
+                        "event_data": {
+                            "medium": f"oauth-{medium}",
                         },
-                        json={
-                            "event_id": uuid.uuid4().hex,
-                            "event_data": {
-                                "medium": f"oauth-{medium}",
-                            },
-                            "user": {"email": email, "id": str(user.id)},
-                            "device_ctx": {
-                                "ip": request.META.get("REMOTE_ADDR"),
-                                "user_agent": request.META.get("HTTP_USER_AGENT"),
-                            },
-                            "event_type": "SIGN_UP",
+                        "user": {"email": email, "id": str(user.id)},
+                        "device_ctx": {
+                            "ip": request.META.get("REMOTE_ADDR"),
+                            "user_agent": request.META.get("HTTP_USER_AGENT"),
                         },
-                    )
-            except RequestException as e:
-                capture_exception(e)
+                        "event_type": "SIGN_UP",
+                    },
+                )
 
             SocialLoginConnection.objects.update_or_create(
                 medium=medium,
@@ -414,10 +295,4 @@ class OauthEndpoint(BaseAPIView):
                     "last_login_at": timezone.now(),
                 },
             )
-
-            access_token, refresh_token = get_tokens_for_user(user)
-            data = {
-                "access_token": access_token,
-                "refresh_token": refresh_token,
-            }
             return Response(data, status=status.HTTP_201_CREATED)

apiserver/plane/api/views/page.py

@@ -0,0 +1,255 @@
+# Python imports
+from datetime import timedelta, date
+
+# Django imports
+from django.db.models import Exists, OuterRef, Q, Prefetch
+from django.utils import timezone
+
+# Third party imports
+from rest_framework import status
+from rest_framework.response import Response
+from sentry_sdk import capture_exception
+
+# Module imports
+from .base import BaseViewSet, BaseAPIView
+from plane.api.permissions import ProjectEntityPermission
+from plane.db.models import (
+    Page,
+    PageBlock,
+    PageFavorite,
+    Issue,
+    IssueAssignee,
+    IssueActivity,
+)
+from plane.api.serializers import (
+    PageSerializer,
+    PageBlockSerializer,
+    PageFavoriteSerializer,
+    IssueLiteSerializer,
+)
+
+
+class PageViewSet(BaseViewSet):
+    serializer_class = PageSerializer
+    model = Page
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+    search_fields = [
+        "name",
+    ]
+
+    def get_queryset(self):
+        subquery = PageFavorite.objects.filter(
+            user=self.request.user,
+            page_id=OuterRef("pk"),
+            project_id=self.kwargs.get("project_id"),
+            workspace__slug=self.kwargs.get("slug"),
+        )
+        return self.filter_queryset(
+            super()
+            .get_queryset()
+            .filter(workspace__slug=self.kwargs.get("slug"))
+            .filter(project_id=self.kwargs.get("project_id"))
+            .filter(project__project_projectmember__member=self.request.user)
+            .filter(Q(owned_by=self.request.user) | Q(access=0))
+            .select_related("project")
+            .select_related("workspace")
+            .select_related("owned_by")
+            .annotate(is_favorite=Exists(subquery))
+            .order_by(self.request.GET.get("order_by", "-created_at"))
+            .prefetch_related("labels")
+            .order_by("name", "-is_favorite")
+            .prefetch_related(
+                Prefetch(
+                    "blocks",
+                    queryset=PageBlock.objects.select_related(
+                        "page", "issue", "workspace", "project"
+                    ),
+                )
+            )
+            .distinct()
+        )
+
+    def perform_create(self, serializer):
+        serializer.save(
+            project_id=self.kwargs.get("project_id"), owned_by=self.request.user
+        )
+
+    def create(self, request, slug, project_id):
+        serializer = PageSerializer(
+            data=request.data,
+            context={"project_id": project_id, "owned_by_id": request.user.id},
+        )
+
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def partial_update(self, request, slug, project_id, pk):
+        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)
+        
+    def list(self, request, slug, project_id):
+        queryset = self.get_queryset()
+        page_view = request.GET.get("page_view", False)
+
+        if not page_view:
+            return Response({"error": "Page View parameter is required"}, status=status.HTTP_400_BAD_REQUEST)
+
+        # All Pages
+        if page_view == "all":
+            return Response(PageSerializer(queryset, many=True).data, status=status.HTTP_200_OK)
+
+        # Recent pages
+        if page_view == "recent":
+            current_time = date.today()
+            day_before = current_time - timedelta(days=1)
+            todays_pages = queryset.filter(updated_at__date=date.today())
+            yesterdays_pages = queryset.filter(updated_at__date=day_before)
+            earlier_this_week = queryset.filter(                    updated_at__date__range=(
+                    (timezone.now() - timedelta(days=7)),
+                    (timezone.now() - timedelta(days=2)),
+                ))
+            return Response(
+            {
+                "today": PageSerializer(todays_pages, many=True).data,
+                "yesterday": PageSerializer(yesterdays_pages, many=True).data,
+                "earlier_this_week": PageSerializer(earlier_this_week, many=True).data,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+        # Favorite Pages
+        if page_view == "favorite":
+            queryset = queryset.filter(is_favorite=True)
+            return Response(PageSerializer(queryset, many=True).data, status=status.HTTP_200_OK)
+        
+        # My pages
+        if page_view == "created_by_me":
+            queryset = queryset.filter(owned_by=request.user)
+            return Response(PageSerializer(queryset, many=True).data, status=status.HTTP_200_OK)
+
+        # Created by other Pages
+        if page_view == "created_by_other":
+            queryset = queryset.filter(~Q(owned_by=request.user),  access=0)
+            return Response(PageSerializer(queryset, many=True).data, status=status.HTTP_200_OK)
+
+        return Response({"error": "No matching view found"}, status=status.HTTP_400_BAD_REQUEST)
+
+
+class PageBlockViewSet(BaseViewSet):
+    serializer_class = PageBlockSerializer
+    model = PageBlock
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
+    def get_queryset(self):
+        return self.filter_queryset(
+            super()
+            .get_queryset()
+            .filter(workspace__slug=self.kwargs.get("slug"))
+            .filter(project_id=self.kwargs.get("project_id"))
+            .filter(page_id=self.kwargs.get("page_id"))
+            .filter(project__project_projectmember__member=self.request.user)
+            .select_related("project")
+            .select_related("workspace")
+            .select_related("page")
+            .select_related("issue")
+            .order_by("sort_order")
+            .distinct()
+        )
+
+    def perform_create(self, serializer):
+        serializer.save(
+            project_id=self.kwargs.get("project_id"),
+            page_id=self.kwargs.get("page_id"),
+        )
+
+
+class PageFavoriteViewSet(BaseViewSet):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
+    serializer_class = PageFavoriteSerializer
+    model = PageFavorite
+
+    def get_queryset(self):
+        return self.filter_queryset(
+            super()
+            .get_queryset()
+            .filter(workspace__slug=self.kwargs.get("slug"))
+            .filter(user=self.request.user)
+            .select_related("page", "page__owned_by")
+        )
+
+    def create(self, request, slug, project_id):
+        serializer = PageFavoriteSerializer(data=request.data)
+        if serializer.is_valid():
+            serializer.save(user=request.user, project_id=project_id)
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def destroy(self, request, slug, project_id, page_id):
+        page_favorite = PageFavorite.objects.get(
+            project=project_id,
+            user=request.user,
+            workspace__slug=slug,
+            page_id=page_id,
+        )
+        page_favorite.delete()
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+class CreateIssueFromPageBlockEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
+    def post(self, request, slug, project_id, page_id, page_block_id):
+        page_block = PageBlock.objects.get(
+            pk=page_block_id,
+            workspace__slug=slug,
+            project_id=project_id,
+            page_id=page_id,
+        )
+        issue = Issue.objects.create(
+            name=page_block.name,
+            project_id=project_id,
+            description=page_block.description,
+            description_html=page_block.description_html,
+            description_stripped=page_block.description_stripped,
+        )
+        _ = IssueAssignee.objects.create(
+            issue=issue, assignee=request.user, project_id=project_id
+        )
+
+        _ = IssueActivity.objects.create(
+            issue=issue,
+            actor=request.user,
+            project_id=project_id,
+            comment=f"created the issue from {page_block.name} block",
+            verb="created",
+        )
+
+        page_block.issue = issue
+        page_block.save()
+
+        return Response(IssueLiteSerializer(issue).data, status=status.HTTP_200_OK)

apiserver/plane/api/views/project.py

@@ -17,17 +17,17 @@ from django.db.models import (
 )
 from django.core.validators import validate_email
 from django.conf import settings
-from django.utils import timezone
 
 # Third Party imports
 from rest_framework.response import Response
 from rest_framework import status
 from rest_framework import serializers
 from rest_framework.permissions import AllowAny
+from sentry_sdk import capture_exception
 
 # Module imports
-from .base import BaseViewSet, BaseAPIView, WebhookMixin, AnalyticsMixin
-from plane.app.serializers import (
+from .base import BaseViewSet, BaseAPIView
+from plane.api.serializers import (
     ProjectSerializer,
     ProjectListSerializer,
     ProjectMemberSerializer,
@@ -38,9 +38,11 @@ from plane.app.serializers import (
     ProjectMemberAdminSerializer,
 )
 
-from plane.app.permissions import (
+from plane.api.permissions import (
     ProjectBasePermission,
+    ProjectEntityPermission,
     ProjectMemberPermission,
+    ProjectLitePermission,
 )
 
 from plane.db.models import (
@@ -56,6 +58,13 @@ from plane.db.models import (
     ProjectIdentifier,
     Module,
     Cycle,
+    CycleFavorite,
+    ModuleFavorite,
+    PageFavorite,
+    IssueViewFavorite,
+    Page,
+    IssueAssignee,
+    ModuleMember,
     Inbox,
     ProjectDeployBoard,
     IssueProperty,
@@ -64,11 +73,9 @@ from plane.db.models import (
 from plane.bgtasks.project_invitation_task import project_invitation
 
 
-class ProjectViewSet(WebhookMixin, AnalyticsMixin, BaseViewSet):
+class ProjectViewSet(BaseViewSet):
     serializer_class = ProjectSerializer
     model = Project
-    webhook_event = "project"
-    analytic_event = "project"
 
     permission_classes = [
         ProjectBasePermission,
@@ -103,15 +110,12 @@ class ProjectViewSet(WebhookMixin, AnalyticsMixin, BaseViewSet):
                         member=self.request.user,
                         project_id=OuterRef("pk"),
                         workspace__slug=self.kwargs.get("slug"),
-                        is_active=True,
                     )
                 )
             )
             .annotate(
                 total_members=ProjectMember.objects.filter(
-                    project_id=OuterRef("id"),
-                    member__is_bot=False,
-                    is_active=True,
+                    project_id=OuterRef("id"), member__is_bot=False
                 )
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))
@@ -133,7 +137,6 @@ class ProjectViewSet(WebhookMixin, AnalyticsMixin, BaseViewSet):
                 member_role=ProjectMember.objects.filter(
                     project_id=OuterRef("pk"),
                     member_id=self.request.user.id,
-                    is_active=True,
                 ).values("role")
             )
             .annotate(
@@ -154,7 +157,6 @@ class ProjectViewSet(WebhookMixin, AnalyticsMixin, BaseViewSet):
             member=request.user,
             project_id=OuterRef("pk"),
             workspace__slug=self.kwargs.get("slug"),
-            is_active=True,
         ).values("sort_order")
         projects = (
             self.get_queryset()
@@ -164,7 +166,6 @@ class ProjectViewSet(WebhookMixin, AnalyticsMixin, BaseViewSet):
                     "project_projectmember",
                     queryset=ProjectMember.objects.filter(
                         workspace__slug=slug,
-                        is_active=True,
                     ).select_related("member"),
                 )
             )
@@ -344,104 +345,66 @@ class ProjectViewSet(WebhookMixin, AnalyticsMixin, BaseViewSet):
             )
 
 
-class ProjectInvitationsViewset(BaseViewSet):
-    serializer_class = ProjectMemberInviteSerializer
-    model = ProjectMemberInvite
-
-    search_fields = []
-
+class InviteProjectEndpoint(BaseAPIView):
     permission_classes = [
         ProjectBasePermission,
     ]
 
-    def get_queryset(self):
-        return self.filter_queryset(
-            super()
-            .get_queryset()
-            .filter(workspace__slug=self.kwargs.get("slug"))
-            .filter(project_id=self.kwargs.get("project_id"))
-            .select_related("project")
-            .select_related("workspace", "workspace__owner")
-        )
-
-    def create(self, request, slug, project_id):
-        emails = request.data.get("emails", [])
+    def post(self, request, slug, project_id):
+        email = request.data.get("email", False)
+        role = request.data.get("role", False)
 
         # Check if email is provided
-        if not emails:
+        if not email:
             return Response(
-                {"error": "Emails are required"}, status=status.HTTP_400_BAD_REQUEST
+                {"error": "Email is required"}, status=status.HTTP_400_BAD_REQUEST
             )
 
-        requesting_user = ProjectMember.objects.get(
-            workspace__slug=slug, project_id=project_id, member_id=request.user.id
-        )
-
-        # Check if any invited user has an higher role
-        if len(
-            [
-                email
-                for email in emails
-                if int(email.get("role", 10)) > requesting_user.role
-            ]
-        ):
+        validate_email(email)
+        # Check if user is already a member of workspace
+        if ProjectMember.objects.filter(
+            project_id=project_id,
+            member__email=email,
+            member__is_bot=False,
+        ).exists():
             return Response(
-                {"error": "You cannot invite a user with higher role"},
+                {"error": "User is already member of workspace"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
-        
-        workspace = Workspace.objects.get(slug=slug)
 
-        project_invitations = []
-        for email in emails:
-            try:
-                validate_email(email.get("email"))
-                project_invitations.append(
-                    ProjectMemberInvite(
-                        email=email.get("email").strip().lower(),
-                        project_id=project_id,
-                        workspace_id=workspace.id,
-                        token=jwt.encode(
-                            {
-                                "email": email,
-                                "timestamp": datetime.now().timestamp(),
-                            },
-                            settings.SECRET_KEY,
-                            algorithm="HS256",
-                        ),
-                        role=email.get("role", 10),
-                        created_by=request.user,
-                    )
-                )
-            except ValidationError:
-                return Response(
-                    {
-                        "error": f"Invalid email - {email} provided a valid email address is required to send the invite"
-                    },
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
+        user = User.objects.filter(email=email).first()
 
-        # Create workspace member invite
-        project_invitations = ProjectMemberInvite.objects.bulk_create(
-            project_invitations, batch_size=10, ignore_conflicts=True
-        )
-        current_site = request.META.get('HTTP_ORIGIN')
+        if user is None:
+            token = jwt.encode(
+                {"email": email, "timestamp": datetime.now().timestamp()},
+                settings.SECRET_KEY,
+                algorithm="HS256",
+            )
+            project_invitation_obj = ProjectMemberInvite.objects.create(
+                email=email.strip().lower(),
+                project_id=project_id,
+                token=token,
+                role=role,
+            )
+            domain = settings.WEB_URL
+            project_invitation.delay(email, project_id, token, domain)
 
-        # Send invitations
-        for invitation in project_invitations:
-            project_invitations.delay(
-                invitation.email,
-                project_id,
-                invitation.token,
-                current_site,
-                request.user.email,
+            return Response(
+                {
+                    "message": "Email sent successfully",
+                    "id": project_invitation_obj.id,
+                },
+                status=status.HTTP_200_OK,
             )
 
+        project_member = ProjectMember.objects.create(
+            member=user, project_id=project_id, role=role
+        )
+
+        _ = IssueProperty.objects.create(user=user, project_id=project_id)
+
         return Response(
-            {
-                "message": "Email sent successfully",
-            },
-            status=status.HTTP_200_OK,
+            ProjectMemberSerializer(project_member).data, status=status.HTTP_200_OK
         )
 
 
@@ -457,134 +420,40 @@ class UserProjectInvitationsViewset(BaseViewSet):
             .select_related("workspace", "workspace__owner", "project")
         )
 
-    def create(self, request, slug):
-        project_ids = request.data.get("project_ids", [])
-
-        # Get the workspace user role
-        workspace_member = WorkspaceMember.objects.get(
-            member=request.user,
-            workspace__slug=slug,
-            is_active=True,
+    def create(self, request):
+        invitations = request.data.get("invitations")
+        project_invitations = ProjectMemberInvite.objects.filter(
+            pk__in=invitations, accepted=True
         )
-
-        workspace_role = workspace_member.role
-        workspace = workspace_member.workspace
-
         ProjectMember.objects.bulk_create(
             [
                 ProjectMember(
-                    project_id=project_id,
+                    project=invitation.project,
+                    workspace=invitation.project.workspace,
                     member=request.user,
-                    role=15 if workspace_role >= 15 else 10,
-                    workspace=workspace,
+                    role=invitation.role,
                     created_by=request.user,
                 )
-                for project_id in project_ids
-            ],
-            ignore_conflicts=True,
+                for invitation in project_invitations
+            ]
         )
 
         IssueProperty.objects.bulk_create(
             [
-                IssueProperty(
-                    project_id=project_id,
+                ProjectMember(
+                    project=invitation.project,
+                    workspace=invitation.project.workspace,
                     user=request.user,
-                    workspace=workspace,
                     created_by=request.user,
                 )
-                for project_id in project_ids
-            ],
-            ignore_conflicts=True,
+                for invitation in project_invitations
+            ]
         )
 
-        return Response(
-            {"message": "Projects joined successfully"},
-            status=status.HTTP_201_CREATED,
-        )
+        # Delete joined project invites
+        project_invitations.delete()
 
-
-class ProjectJoinEndpoint(BaseAPIView):
-    permission_classes = [
-        AllowAny,
-    ]
-
-    def post(self, request, slug, project_id, pk):
-        project_invite = ProjectMemberInvite.objects.get(
-            pk=pk,
-            project_id=project_id,
-            workspace__slug=slug,
-        )
-
-        email = request.data.get("email", "")
-
-        if email == "" or project_invite.email != email:
-            return Response(
-                {"error": "You do not have permission to join the project"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
-        if project_invite.responded_at is None:
-            project_invite.accepted = request.data.get("accepted", False)
-            project_invite.responded_at = timezone.now()
-            project_invite.save()
-
-            if project_invite.accepted:
-                # Check if the user account exists
-                user = User.objects.filter(email=email).first()
-
-                # Check if user is a part of workspace
-                workspace_member = WorkspaceMember.objects.filter(
-                    workspace__slug=slug, member=user
-                ).first()
-                # Add him to workspace
-                if workspace_member is None:
-                    _ = WorkspaceMember.objects.create(
-                        workspace_id=project_invite.workspace_id,
-                        member=user,
-                        role=15 if project_invite.role >= 15 else project_invite.role,
-                    )
-                else:
-                    # Else make him active
-                    workspace_member.is_active = True
-                    workspace_member.save()
-
-                # Check if the user was already a member of project then activate the user
-                project_member = ProjectMember.objects.filter(
-                    workspace_id=project_invite.workspace_id, member=user
-                ).first()
-                if project_member is None:
-                    # Create a Project Member
-                    _ = ProjectMember.objects.create(
-                        workspace_id=project_invite.workspace_id,
-                        member=user,
-                        role=project_invite.role,
-                    )
-                else:
-                    project_member.is_active = True
-                    project_member.role = project_member.role
-                    project_member.save()
-
-                return Response(
-                    {"message": "Project Invitation Accepted"},
-                    status=status.HTTP_200_OK,
-                )
-
-            return Response(
-                {"message": "Project Invitation was not accepted"},
-                status=status.HTTP_200_OK,
-            )
-
-        return Response(
-            {"error": "You have already responded to the invitation request"},
-            status=status.HTTP_400_BAD_REQUEST,
-        )
-
-    def get(self, request, slug, project_id, pk):
-        project_invitation = ProjectMemberInvite.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=pk
-        )
-        serializer = ProjectMemberInviteSerializer(project_invitation)
-        return Response(serializer.data, status=status.HTTP_200_OK)
+        return Response(status=status.HTTP_204_NO_CONTENT)
 
 
 class ProjectMemberViewSet(BaseViewSet):
@@ -606,7 +475,6 @@ class ProjectMemberViewSet(BaseViewSet):
             .filter(workspace__slug=self.kwargs.get("slug"))
             .filter(project_id=self.kwargs.get("project_id"))
             .filter(member__is_bot=False)
-            .filter()
             .select_related("project")
             .select_related("member")
             .select_related("workspace", "workspace__owner")
@@ -674,17 +542,13 @@ class ProjectMemberViewSet(BaseViewSet):
 
     def list(self, request, slug, project_id):
         project_member = ProjectMember.objects.get(
-            member=request.user,
-            workspace__slug=slug,
-            project_id=project_id,
-            is_active=True,
+            member=request.user, workspace__slug=slug, project_id=project_id
         )
 
         project_members = ProjectMember.objects.filter(
             project_id=project_id,
             workspace__slug=slug,
             member__is_bot=False,
-            is_active=True,
         ).select_related("project", "member", "workspace")
 
         if project_member.role > 10:
@@ -695,10 +559,7 @@ class ProjectMemberViewSet(BaseViewSet):
 
     def partial_update(self, request, slug, project_id, pk):
         project_member = ProjectMember.objects.get(
-            pk=pk,
-            workspace__slug=slug,
-            project_id=project_id,
-            is_active=True,
+            pk=pk, workspace__slug=slug, project_id=project_id
         )
         if request.user.id == project_member.member_id:
             return Response(
@@ -707,10 +568,7 @@ class ProjectMemberViewSet(BaseViewSet):
             )
         # Check while updating user roles
         requested_project_member = ProjectMember.objects.get(
-            project_id=project_id,
-            workspace__slug=slug,
-            member=request.user,
-            is_active=True,
+            project_id=project_id, workspace__slug=slug, member=request.user
         )
         if (
             "role" in request.data
@@ -733,66 +591,54 @@ class ProjectMemberViewSet(BaseViewSet):
 
     def destroy(self, request, slug, project_id, pk):
         project_member = ProjectMember.objects.get(
-            workspace__slug=slug,
-            project_id=project_id,
-            pk=pk,
-            member__is_bot=False,
-            is_active=True,
+            workspace__slug=slug, project_id=project_id, pk=pk
         )
         # check requesting user role
         requesting_project_member = ProjectMember.objects.get(
-            workspace__slug=slug,
-            member=request.user,
-            project_id=project_id,
-            is_active=True,
+            workspace__slug=slug, member=request.user, project_id=project_id
         )
-        # User cannot remove himself
-        if str(project_member.id) == str(requesting_project_member.id):
-            return Response(
-                {
-                    "error": "You cannot remove yourself from the workspace. Please use leave workspace"
-                },
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        # User cannot deactivate higher role
         if requesting_project_member.role < project_member.role:
             return Response(
-                {"error": "You cannot remove a user having role higher than you"},
+                {"error": "You cannot remove a user having role higher than yourself"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        project_member.is_active = False
-        project_member.save()
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-    def leave(self, request, slug, project_id):
-        project_member = ProjectMember.objects.get(
+        # Remove all favorites
+        ProjectFavorite.objects.filter(
+            workspace__slug=slug, project_id=project_id, user=project_member.member
+        ).delete()
+        CycleFavorite.objects.filter(
+            workspace__slug=slug, project_id=project_id, user=project_member.member
+        ).delete()
+        ModuleFavorite.objects.filter(
+            workspace__slug=slug, project_id=project_id, user=project_member.member
+        ).delete()
+        PageFavorite.objects.filter(
+            workspace__slug=slug, project_id=project_id, user=project_member.member
+        ).delete()
+        IssueViewFavorite.objects.filter(
+            workspace__slug=slug, project_id=project_id, user=project_member.member
+        ).delete()
+        # Also remove issue from issue assigned
+        IssueAssignee.objects.filter(
             workspace__slug=slug,
             project_id=project_id,
-            member=request.user,
-            is_active=True,
-        )
+            assignee=project_member.member,
+        ).delete()
 
-        # Check if the leaving user is the only admin of the project
-        if (
-            project_member.role == 20
-            and not ProjectMember.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                role=20,
-                is_active=True,
-            ).count()
-            > 1
-        ):
-            return Response(
-                {
-                    "error": "You cannot leave the project as your the only admin of the project you will have to either delete the project or create an another admin",
-                },
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        # Deactivate the user
-        project_member.is_active = False
-        project_member.save()
+        # Remove if module member
+        ModuleMember.objects.filter(
+            workspace__slug=slug,
+            project_id=project_id,
+            member=project_member.member,
+        ).delete()
+        # Delete owned Pages
+        Page.objects.filter(
+            workspace__slug=slug,
+            project_id=project_id,
+            owned_by=project_member.member,
+        ).delete()
+        project_member.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
@@ -845,6 +691,46 @@ class AddTeamToProjectEndpoint(BaseAPIView):
         return Response(serializer.data, status=status.HTTP_201_CREATED)
 
 
+class ProjectMemberInvitationsViewset(BaseViewSet):
+    serializer_class = ProjectMemberInviteSerializer
+    model = ProjectMemberInvite
+
+    search_fields = []
+
+    permission_classes = [
+        ProjectBasePermission,
+    ]
+
+    def get_queryset(self):
+        return self.filter_queryset(
+            super()
+            .get_queryset()
+            .filter(workspace__slug=self.kwargs.get("slug"))
+            .filter(project_id=self.kwargs.get("project_id"))
+            .select_related("project")
+            .select_related("workspace", "workspace__owner")
+        )
+
+
+class ProjectMemberInviteDetailViewSet(BaseViewSet):
+    serializer_class = ProjectMemberInviteSerializer
+    model = ProjectMemberInvite
+
+    search_fields = []
+
+    permission_classes = [
+        ProjectBasePermission,
+    ]
+
+    def get_queryset(self):
+        return self.filter_queryset(
+            super()
+            .get_queryset()
+            .select_related("project")
+            .select_related("workspace", "workspace__owner")
+        )
+
+
 class ProjectIdentifierEndpoint(BaseAPIView):
     permission_classes = [
         ProjectBasePermission,
@@ -888,14 +774,59 @@ class ProjectIdentifierEndpoint(BaseAPIView):
         )
 
 
+class ProjectJoinEndpoint(BaseAPIView):
+    def post(self, request, slug):
+        project_ids = request.data.get("project_ids", [])
+
+        # Get the workspace user role
+        workspace_member = WorkspaceMember.objects.get(
+            member=request.user, workspace__slug=slug
+        )
+
+        workspace_role = workspace_member.role
+        workspace = workspace_member.workspace
+
+        ProjectMember.objects.bulk_create(
+            [
+                ProjectMember(
+                    project_id=project_id,
+                    member=request.user,
+                    role=20
+                    if workspace_role >= 15
+                    else (15 if workspace_role == 10 else workspace_role),
+                    workspace=workspace,
+                    created_by=request.user,
+                )
+                for project_id in project_ids
+            ],
+            ignore_conflicts=True,
+        )
+
+        IssueProperty.objects.bulk_create(
+            [
+                IssueProperty(
+                    project_id=project_id,
+                    user=request.user,
+                    workspace=workspace,
+                    created_by=request.user,
+                )
+                for project_id in project_ids
+            ],
+            ignore_conflicts=True,
+        )
+
+        return Response(
+            {"message": "Projects joined successfully"},
+            status=status.HTTP_201_CREATED,
+        )
+
+
 class ProjectUserViewsEndpoint(BaseAPIView):
     def post(self, request, slug, project_id):
         project = Project.objects.get(pk=project_id, workspace__slug=slug)
 
         project_member = ProjectMember.objects.filter(
-            member=request.user,
-            project=project,
-            is_active=True,
+            member=request.user, project=project
         ).first()
 
         if project_member is None:
@@ -919,10 +850,7 @@ class ProjectUserViewsEndpoint(BaseAPIView):
 class ProjectMemberUserEndpoint(BaseAPIView):
     def get(self, request, slug, project_id):
         project_member = ProjectMember.objects.get(
-            project_id=project_id,
-            workspace__slug=slug,
-            member=request.user,
-            is_active=True,
+            project_id=project_id, workspace__slug=slug, member=request.user
         )
         serializer = ProjectMemberSerializer(project_member)
 
@@ -963,37 +891,6 @@ class ProjectFavoritesViewSet(BaseViewSet):
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
-class ProjectPublicCoverImagesEndpoint(BaseAPIView):
-    permission_classes = [
-        AllowAny,
-    ]
-
-    def get(self, request):
-        files = []
-        s3 = boto3.client(
-            "s3",
-            aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
-            aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY,
-        )
-        params = {
-            "Bucket": settings.AWS_S3_BUCKET_NAME,
-            "Prefix": "static/project-cover/",
-        }
-
-        response = s3.list_objects_v2(**params)
-        # Extracting file keys from the response
-        if "Contents" in response:
-            for content in response["Contents"]:
-                if not content["Key"].endswith(
-                    "/"
-                ):  # This line ensures we're only getting files, not "sub-folders"
-                    files.append(
-                        f"https://{settings.AWS_S3_BUCKET_NAME}.s3.{settings.AWS_REGION}.amazonaws.com/{content['Key']}"
-                    )
-
-        return Response(files, status=status.HTTP_200_OK)
-
-
 class ProjectDeployBoardViewSet(BaseViewSet):
     permission_classes = [
         ProjectMemberPermission,
@@ -1041,4 +938,110 @@ class ProjectDeployBoardViewSet(BaseViewSet):
         project_deploy_board.save()
 
         serializer = ProjectDeployBoardSerializer(project_deploy_board)
-        return Response(serializer.data, status=status.HTTP_200_OK)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+
+class ProjectDeployBoardPublicSettingsEndpoint(BaseAPIView):
+    permission_classes = [
+        AllowAny,
+    ]
+
+    def get(self, request, slug, project_id):
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=slug, project_id=project_id
+        )
+        serializer = ProjectDeployBoardSerializer(project_deploy_board)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+
+class WorkspaceProjectDeployBoardEndpoint(BaseAPIView):
+    permission_classes = [
+        AllowAny,
+    ]
+
+    def get(self, request, slug):
+        projects = (
+            Project.objects.filter(workspace__slug=slug)
+            .annotate(
+                is_public=Exists(
+                    ProjectDeployBoard.objects.filter(
+                        workspace__slug=slug, project_id=OuterRef("pk")
+                    )
+                )
+            )
+            .filter(is_public=True)
+        ).values(
+            "id",
+            "identifier",
+            "name",
+            "description",
+            "emoji",
+            "icon_prop",
+            "cover_image",
+        )
+
+        return Response(projects, status=status.HTTP_200_OK)
+
+
+class LeaveProjectEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectLitePermission,
+    ]
+
+    def delete(self, request, slug, project_id):
+        project_member = ProjectMember.objects.get(
+            workspace__slug=slug,
+            member=request.user,
+            project_id=project_id,
+        )
+
+        # Only Admin case
+        if (
+            project_member.role == 20
+            and ProjectMember.objects.filter(
+                workspace__slug=slug,
+                role=20,
+                project_id=project_id,
+            ).count()
+            == 1
+        ):
+            return Response(
+                {
+                    "error": "You cannot leave the project since you are the only admin of the project you should delete the project"
+                },
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        # Delete the member from workspace
+        project_member.delete()
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+
+class ProjectPublicCoverImagesEndpoint(BaseAPIView):
+    permission_classes = [
+        AllowAny,
+    ]
+
+    def get(self, request):
+        files = []
+        s3 = boto3.client(
+            "s3",
+            aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
+            aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY,
+        )
+        params = {
+            "Bucket": settings.AWS_S3_BUCKET_NAME,
+            "Prefix": "static/project-cover/",
+        }
+
+        response = s3.list_objects_v2(**params)
+        # Extracting file keys from the response
+        if "Contents" in response:
+            for content in response["Contents"]:
+                if not content["Key"].endswith(
+                    "/"
+                ):  # This line ensures we're only getting files, not "sub-folders"
+                    files.append(
+                        f"https://{settings.AWS_S3_BUCKET_NAME}.s3.{settings.AWS_REGION}.amazonaws.com/{content['Key']}"
+                    )
+
+        return Response(files, status=status.HTTP_200_OK)

apiserver/plane/api/views/search.py

@@ -7,6 +7,7 @@ from django.db.models import Q
 # Third party imports
 from rest_framework import status
 from rest_framework.response import Response
+from sentry_sdk import capture_exception
 
 # Module imports
 from .base import BaseAPIView

apiserver/plane/api/views/state.py

@@ -7,11 +7,12 @@ from django.db.models import Q
 # Third party imports
 from rest_framework.response import Response
 from rest_framework import status
+from sentry_sdk import capture_exception
 
 # Module imports
-from . import BaseViewSet
-from plane.app.serializers import StateSerializer
-from plane.app.permissions import ProjectEntityPermission
+from . import BaseViewSet, BaseAPIView
+from plane.api.serializers import StateSerializer
+from plane.api.permissions import ProjectEntityPermission
 from plane.db.models import State, Issue
 
 
@@ -46,45 +47,36 @@ class StateViewSet(BaseViewSet):
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     def list(self, request, slug, project_id):
+        state_dict = dict()
         states = StateSerializer(self.get_queryset(), many=True).data
-        grouped = request.GET.get("grouped", False)
-        if grouped == "true":
-            state_dict = {}
-            for key, value in groupby(
-                sorted(states, key=lambda state: state["group"]),
-                lambda state: state.get("group"),
-            ):
-                state_dict[str(key)] = list(value)
-            return Response(state_dict, status=status.HTTP_200_OK)
-        return Response(states, status=status.HTTP_200_OK)
 
-    def mark_as_default(self, request, slug, project_id, pk):
-        # Select all the states which are marked as default
-        _ = State.objects.filter(
-            workspace__slug=slug, project_id=project_id, default=True
-        ).update(default=False)
-        _ = State.objects.filter(
-            workspace__slug=slug, project_id=project_id, pk=pk
-        ).update(default=True)
-        return Response(status=status.HTTP_204_NO_CONTENT)
+        for key, value in groupby(
+            sorted(states, key=lambda state: state["group"]),
+            lambda state: state.get("group"),
+        ):
+            state_dict[str(key)] = list(value)
+
+        return Response(state_dict, status=status.HTTP_200_OK)
 
     def destroy(self, request, slug, project_id, pk):
         state = State.objects.get(
             ~Q(name="Triage"),
-            pk=pk,
-            project_id=project_id,
-            workspace__slug=slug,
+            pk=pk, project_id=project_id, workspace__slug=slug,
         )
 
         if state.default:
-            return Response({"error": "Default state cannot be deleted"}, status=False)
+            return Response(
+                {"error": "Default state cannot be deleted"}, status=False
+            )
 
         # Check for any issues in the state
         issue_exist = Issue.issue_objects.filter(state=pk).exists()
 
         if issue_exist:
             return Response(
-                {"error": "The state is not empty, only empty states can be deleted"},
+                {
+                    "error": "The state is not empty, only empty states can be deleted"
+                },
                 status=status.HTTP_400_BAD_REQUEST,
             )
 

apiserver/plane/api/views/user.py

@@ -2,18 +2,24 @@
 from rest_framework.response import Response
 from rest_framework import status
 
+from sentry_sdk import capture_exception
 
 # Module imports
-from plane.app.serializers import (
+from plane.api.serializers import (
     UserSerializer,
     IssueActivitySerializer,
     UserMeSerializer,
     UserMeSettingsSerializer,
 )
 
-from plane.app.views.base import BaseViewSet, BaseAPIView
-from plane.db.models import User, IssueActivity, WorkspaceMember
-from plane.license.models import Instance, InstanceAdmin
+from plane.api.views.base import BaseViewSet, BaseAPIView
+from plane.db.models import (
+    User,
+    Workspace,
+    WorkspaceMemberInvite,
+    Issue,
+    IssueActivity,
+)
 from plane.utils.paginator import BasePaginator
 
 
@@ -35,33 +41,10 @@ class UserEndpoint(BaseViewSet):
         serialized_data = UserMeSettingsSerializer(request.user).data
         return Response(serialized_data, status=status.HTTP_200_OK)
 
-    def retrieve_instance_admin(self, request):
-        instance = Instance.objects.first()
-        is_admin = InstanceAdmin.objects.filter(
-            instance=instance, user=request.user
-        ).exists()
-        return Response({"is_instance_admin": is_admin}, status=status.HTTP_200_OK)
-
-    def deactivate(self, request):
-        # Check all workspace user is active
-        user = self.get_object()
-        if WorkspaceMember.objects.filter(member=request.user, is_active=True).exists():
-            return Response(
-                {
-                    "error": "User cannot deactivate account as user is active in some workspaces"
-                },
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        # Deactivate the user
-        user.is_active = False
-        user.save()
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
 
 class UpdateUserOnBoardedEndpoint(BaseAPIView):
     def patch(self, request):
-        user = User.objects.get(pk=request.user.id, is_active=True)
+        user = User.objects.get(pk=request.user.id)
         user.is_onboarded = request.data.get("is_onboarded", False)
         user.save()
         return Response({"message": "Updated successfully"}, status=status.HTTP_200_OK)
@@ -69,7 +52,7 @@ class UpdateUserOnBoardedEndpoint(BaseAPIView):
 
 class UpdateUserTourCompletedEndpoint(BaseAPIView):
     def patch(self, request):
-        user = User.objects.get(pk=request.user.id, is_active=True)
+        user = User.objects.get(pk=request.user.id)
         user.is_tour_completed = request.data.get("is_tour_completed", False)
         user.save()
         return Response({"message": "Updated successfully"}, status=status.HTTP_200_OK)

apiserver/plane/api/views/view.py

@@ -18,16 +18,17 @@ from django.db.models import Prefetch, OuterRef, Exists
 # Third party imports
 from rest_framework.response import Response
 from rest_framework import status
+from sentry_sdk import capture_exception
 
 # Module imports
-from . import BaseViewSet
-from plane.app.serializers import (
+from . import BaseViewSet, BaseAPIView
+from plane.api.serializers import (
     GlobalViewSerializer,
     IssueViewSerializer,
     IssueLiteSerializer,
     IssueViewFavoriteSerializer,
 )
-from plane.app.permissions import WorkspaceEntityPermission, ProjectEntityPermission
+from plane.api.permissions import WorkspaceEntityPermission, ProjectEntityPermission
 from plane.db.models import (
     Workspace,
     GlobalView,

apiserver/plane/api/views/workspace.py

@@ -2,6 +2,7 @@
 import jwt
 from datetime import date, datetime
 from dateutil.relativedelta import relativedelta
+from uuid import uuid4
 
 # Django imports
 from django.db import IntegrityError
@@ -25,14 +26,16 @@ from django.db.models import (
 )
 from django.db.models.functions import ExtractWeek, Cast, ExtractDay
 from django.db.models.fields import DateField
+from django.contrib.auth.hashers import make_password
 
 # Third party modules
 from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.permissions import AllowAny
+from sentry_sdk import capture_exception
 
 # Module imports
-from plane.app.serializers import (
+from plane.api.serializers import (
     WorkSpaceSerializer,
     WorkSpaceMemberSerializer,
     TeamSerializer,
@@ -45,7 +48,7 @@ from plane.app.serializers import (
     WorkspaceMemberAdminSerializer,
     WorkspaceMemberMeSerializer,
 )
-from plane.app.views.base import BaseAPIView
+from plane.api.views.base import BaseAPIView
 from . import BaseViewSet
 from plane.db.models import (
     User,
@@ -56,6 +59,14 @@ from plane.db.models import (
     IssueActivity,
     Issue,
     WorkspaceTheme,
+    IssueAssignee,
+    ProjectFavorite,
+    CycleFavorite,
+    ModuleMember,
+    ModuleFavorite,
+    PageFavorite,
+    Page,
+    IssueViewFavorite,
     IssueLink,
     IssueAttachment,
     IssueSubscriber,
@@ -65,7 +76,7 @@ from plane.db.models import (
     CycleIssue,
     IssueReaction,
 )
-from plane.app.permissions import (
+from plane.api.permissions import (
     WorkSpaceBasePermission,
     WorkSpaceAdminPermission,
     WorkspaceEntityPermission,
@@ -95,9 +106,7 @@ class WorkSpaceViewSet(BaseViewSet):
     def get_queryset(self):
         member_count = (
             WorkspaceMember.objects.filter(
-                workspace=OuterRef("id"),
-                member__is_bot=False,
-                is_active=True,
+                workspace=OuterRef("id"), member__is_bot=False
             )
             .order_by()
             .annotate(count=Func(F("id"), function="Count"))
@@ -172,9 +181,7 @@ class UserWorkSpacesEndpoint(BaseAPIView):
     def get(self, request):
         member_count = (
             WorkspaceMember.objects.filter(
-                workspace=OuterRef("id"),
-                member__is_bot=False,
-                is_active=True,
+                workspace=OuterRef("id"), member__is_bot=False
             )
             .order_by()
             .annotate(count=Func(F("id"), function="Count"))
@@ -220,40 +227,23 @@ class WorkSpaceAvailabilityCheckEndpoint(BaseAPIView):
         return Response({"status": not workspace}, status=status.HTTP_200_OK)
 
 
-class WorkspaceInvitationsViewset(BaseViewSet):
-    """Endpoint for creating, listing and  deleting workspaces"""
-
-    serializer_class = WorkSpaceMemberInviteSerializer
-    model = WorkspaceMemberInvite
-
+class InviteWorkspaceEndpoint(BaseAPIView):
     permission_classes = [
         WorkSpaceAdminPermission,
     ]
 
-    def get_queryset(self):
-        return self.filter_queryset(
-            super()
-            .get_queryset()
-            .filter(workspace__slug=self.kwargs.get("slug"))
-            .select_related("workspace", "workspace__owner", "created_by")
-        )
-
-    def create(self, request, slug):
-        emails = request.data.get("emails", [])
+    def post(self, request, slug):
+        emails = request.data.get("emails", False)
         # Check if email is provided
-        if not emails:
+        if not emails or not len(emails):
             return Response(
                 {"error": "Emails are required"}, status=status.HTTP_400_BAD_REQUEST
             )
 
-        # check for role level of the requesting user
+        # check for role level
         requesting_user = WorkspaceMember.objects.get(
-            workspace__slug=slug,
-            member=request.user,
-            is_active=True,
+            workspace__slug=slug, member=request.user
         )
-
-        # Check if any invited user has an higher role
         if len(
             [
                 email
@@ -266,17 +256,15 @@ class WorkspaceInvitationsViewset(BaseViewSet):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        # Get the workspace object
         workspace = Workspace.objects.get(slug=slug)
 
         # Check if user is already a member of workspace
         workspace_members = WorkspaceMember.objects.filter(
             workspace_id=workspace.id,
             member__email__in=[email.get("email") for email in emails],
-            is_active=True,
         ).select_related("member", "workspace", "workspace__owner")
 
-        if workspace_members:
+        if len(workspace_members):
             return Response(
                 {
                     "error": "Some users are already member of workspace",
@@ -314,20 +302,35 @@ class WorkspaceInvitationsViewset(BaseViewSet):
                     },
                     status=status.HTTP_400_BAD_REQUEST,
                 )
-        # Create workspace member invite
-        workspace_invitations = WorkspaceMemberInvite.objects.bulk_create(
+        WorkspaceMemberInvite.objects.bulk_create(
             workspace_invitations, batch_size=10, ignore_conflicts=True
         )
 
-        current_site = request.META.get('HTTP_ORIGIN')
+        workspace_invitations = WorkspaceMemberInvite.objects.filter(
+            email__in=[email.get("email") for email in emails]
+        ).select_related("workspace")
+
+        # create the user if signup is disabled
+        if settings.DOCKERIZED and not settings.ENABLE_SIGNUP:
+            _ = User.objects.bulk_create(
+                [
+                    User(
+                        username=str(uuid4().hex),
+                        email=invitation.email,
+                        password=make_password(uuid4().hex),
+                        is_password_autoset=True,
+                    )
+                    for invitation in workspace_invitations
+                ],
+                batch_size=100,
+            )
 
-        # Send invitations
         for invitation in workspace_invitations:
             workspace_invitation.delay(
                 invitation.email,
                 workspace.id,
                 invitation.token,
-                current_site,
+                settings.WEB_URL,
                 request.user.email,
             )
 
@@ -338,19 +341,11 @@ class WorkspaceInvitationsViewset(BaseViewSet):
             status=status.HTTP_200_OK,
         )
 
-    def destroy(self, request, slug, pk):
-        workspace_member_invite = WorkspaceMemberInvite.objects.get(
-            pk=pk, workspace__slug=slug
-        )
-        workspace_member_invite.delete()
-        return Response(status=status.HTTP_204_NO_CONTENT)
 
-
-class WorkspaceJoinEndpoint(BaseAPIView):
+class JoinWorkspaceEndpoint(BaseAPIView):
     permission_classes = [
         AllowAny,
     ]
-    """Invitation response endpoint the user can respond to the invitation"""
 
     def post(self, request, slug, pk):
         workspace_invite = WorkspaceMemberInvite.objects.get(
@@ -359,14 +354,12 @@ class WorkspaceJoinEndpoint(BaseAPIView):
 
         email = request.data.get("email", "")
 
-        # Check the email
         if email == "" or workspace_invite.email != email:
             return Response(
                 {"error": "You do not have permission to join the workspace"},
                 status=status.HTTP_403_FORBIDDEN,
             )
 
-        # If already responded then return error
         if workspace_invite.responded_at is None:
             workspace_invite.accepted = request.data.get("accepted", False)
             workspace_invite.responded_at = timezone.now()
@@ -378,23 +371,12 @@ class WorkspaceJoinEndpoint(BaseAPIView):
 
                 # If the user is present then create the workspace member
                 if user is not None:
-                    # Check if the user was already a member of workspace then activate the user
-                    workspace_member = WorkspaceMember.objects.filter(
-                        workspace=workspace_invite.workspace, member=user
-                    ).first()
-                    if workspace_member is not None:
-                        workspace_member.is_active = True
-                        workspace_member.role = workspace_invite.role
-                        workspace_member.save()
-                    else:
-                        # Create a Workspace
-                        _ = WorkspaceMember.objects.create(
-                            workspace=workspace_invite.workspace,
-                            member=user,
-                            role=workspace_invite.role,
-                        )
+                    WorkspaceMember.objects.create(
+                        workspace=workspace_invite.workspace,
+                        member=user,
+                        role=workspace_invite.role,
+                    )
 
-                    # Set the user last_workspace_id to the accepted workspace
                     user.last_workspace_id = workspace_invite.workspace.id
                     user.save()
 
@@ -406,7 +388,6 @@ class WorkspaceJoinEndpoint(BaseAPIView):
                     status=status.HTTP_200_OK,
                 )
 
-            # Workspace invitation rejected
             return Response(
                 {"message": "Workspace Invitation was not accepted"},
                 status=status.HTTP_200_OK,
@@ -417,13 +398,37 @@ class WorkspaceJoinEndpoint(BaseAPIView):
             status=status.HTTP_400_BAD_REQUEST,
         )
 
-    def get(self, request, slug, pk):
-        workspace_invitation = WorkspaceMemberInvite.objects.get(workspace__slug=slug, pk=pk)
-        serializer = WorkSpaceMemberInviteSerializer(workspace_invitation)
-        return Response(serializer.data, status=status.HTTP_200_OK)
+
+class WorkspaceInvitationsViewset(BaseViewSet):
+    serializer_class = WorkSpaceMemberInviteSerializer
+    model = WorkspaceMemberInvite
+
+    permission_classes = [
+        WorkSpaceAdminPermission,
+    ]
+
+    def get_queryset(self):
+        return self.filter_queryset(
+            super()
+            .get_queryset()
+            .filter(workspace__slug=self.kwargs.get("slug"))
+            .select_related("workspace", "workspace__owner", "created_by")
+        )
+
+    def destroy(self, request, slug, pk):
+        workspace_member_invite = WorkspaceMemberInvite.objects.get(
+            pk=pk, workspace__slug=slug
+        )
+        # delete the user if signup is disabled
+        if settings.DOCKERIZED and not settings.ENABLE_SIGNUP:
+            user = User.objects.filter(email=workspace_member_invite.email).first()
+            if user is not None:
+                user.delete()
+        workspace_member_invite.delete()
+        return Response(status=status.HTTP_204_NO_CONTENT)
 
 
-class UserWorkspaceInvitationsViewSet(BaseViewSet):
+class UserWorkspaceInvitationsEndpoint(BaseViewSet):
     serializer_class = WorkSpaceMemberInviteSerializer
     model = WorkspaceMemberInvite
 
@@ -437,19 +442,9 @@ class UserWorkspaceInvitationsViewSet(BaseViewSet):
         )
 
     def create(self, request):
-        invitations = request.data.get("invitations", [])
-        workspace_invitations = WorkspaceMemberInvite.objects.filter(
-            pk__in=invitations, email=request.user.email
-        ).order_by("-created_at")
+        invitations = request.data.get("invitations")
+        workspace_invitations = WorkspaceMemberInvite.objects.filter(pk__in=invitations)
 
-        # If the user is already a member of workspace and was deactivated then activate the user
-        for invitation in workspace_invitations:
-            # Update the WorkspaceMember for this specific invitation
-            WorkspaceMember.objects.filter(
-                workspace_id=invitation.workspace_id, member=request.user
-            ).update(is_active=True, role=invitation.role)
-
-        # Bulk create the user for all the workspaces
         WorkspaceMember.objects.bulk_create(
             [
                 WorkspaceMember(
@@ -486,24 +481,20 @@ class WorkSpaceMemberViewSet(BaseViewSet):
         return self.filter_queryset(
             super()
             .get_queryset()
-            .filter(
-                workspace__slug=self.kwargs.get("slug"),
-                member__is_bot=False,
-                is_active=True,
-            )
+            .filter(workspace__slug=self.kwargs.get("slug"), member__is_bot=False)
             .select_related("workspace", "workspace__owner")
             .select_related("member")
         )
 
     def list(self, request, slug):
         workspace_member = WorkspaceMember.objects.get(
-            member=request.user,
-            workspace__slug=slug,
-            is_active=True,
+            member=request.user, workspace__slug=slug
         )
 
-        # Get all active workspace members
-        workspace_members = self.get_queryset()
+        workspace_members = WorkspaceMember.objects.filter(
+            workspace__slug=slug,
+            member__is_bot=False,
+        ).select_related("workspace", "member")
 
         if workspace_member.role > 10:
             serializer = WorkspaceMemberAdminSerializer(workspace_members, many=True)
@@ -515,12 +506,7 @@ class WorkSpaceMemberViewSet(BaseViewSet):
         return Response(serializer.data, status=status.HTTP_200_OK)
 
     def partial_update(self, request, slug, pk):
-        workspace_member = WorkspaceMember.objects.get(
-            pk=pk,
-            workspace__slug=slug,
-            member__is_bot=False,
-            is_active=True,
-        )
+        workspace_member = WorkspaceMember.objects.get(pk=pk, workspace__slug=slug)
         if request.user.id == workspace_member.member_id:
             return Response(
                 {"error": "You cannot update your own role"},
@@ -529,9 +515,7 @@ class WorkSpaceMemberViewSet(BaseViewSet):
 
         # Get the requested user role
         requested_workspace_member = WorkspaceMember.objects.get(
-            workspace__slug=slug,
-            member=request.user,
-            is_active=True,
+            workspace__slug=slug, member=request.user
         )
         # Check if role is being updated
         # One cannot update role higher than his own role
@@ -556,121 +540,68 @@ class WorkSpaceMemberViewSet(BaseViewSet):
 
     def destroy(self, request, slug, pk):
         # Check the user role who is deleting the user
-        workspace_member = WorkspaceMember.objects.get(
-            workspace__slug=slug,
-            pk=pk,
-            member__is_bot=False,
-            is_active=True,
-        )
+        workspace_member = WorkspaceMember.objects.get(workspace__slug=slug, pk=pk)
 
         # check requesting user role
         requesting_workspace_member = WorkspaceMember.objects.get(
-            workspace__slug=slug,
-            member=request.user,
-            is_active=True,
+            workspace__slug=slug, member=request.user
         )
-
-        if str(workspace_member.id) == str(requesting_workspace_member.id):
-            return Response(
-                {
-                    "error": "You cannot remove yourself from the workspace. Please use leave workspace"
-                },
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
         if requesting_workspace_member.role < workspace_member.role:
             return Response(
                 {"error": "You cannot remove a user having role higher than you"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        if (
-            Project.objects.annotate(
-                total_members=Count("project_projectmember"),
-                member_with_role=Count(
-                    "project_projectmember",
-                    filter=Q(
-                        project_projectmember__member_id=request.user.id,
-                        project_projectmember__role=20,
-                    ),
-                ),
-            )
-            .filter(total_members=1, member_with_role=1, workspace__slug=slug)
-            .exists()
-        ):
-            return Response(
-                {
-                    "error": "User is part of some projects where they are the only admin you should leave that project first"
-                },
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        # Deactivate the users from the projects where the user is part of
-        _ = ProjectMember.objects.filter(
-            workspace__slug=slug,
-            member_id=workspace_member.member_id,
-            is_active=True,
-        ).update(is_active=False)
-
-        workspace_member.is_active = False
-        workspace_member.save()
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-    def leave(self, request, slug):
-        workspace_member = WorkspaceMember.objects.get(
-            workspace__slug=slug,
-            member=request.user,
-            is_active=True,
-        )
-
-        # Check if the leaving user is the only admin of the workspace
+        # Check for the only member in the workspace
         if (
             workspace_member.role == 20
-            and not WorkspaceMember.objects.filter(
+            and WorkspaceMember.objects.filter(
                 workspace__slug=slug,
                 role=20,
-                is_active=True,
+                member__is_bot=False,
             ).count()
-            > 1
+            == 1
         ):
             return Response(
-                {
-                    "error": "You cannot leave the workspace as your the only admin of the workspace you will have to either delete the workspace or create an another admin"
-                },
+                {"error": "Cannot delete the only Admin for the workspace"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        if (
-            Project.objects.annotate(
-                total_members=Count("project_projectmember"),
-                member_with_role=Count(
-                    "project_projectmember",
-                    filter=Q(
-                        project_projectmember__member_id=request.user.id,
-                        project_projectmember__role=20,
-                    ),
-                ),
-            )
-            .filter(total_members=1, member_with_role=1, workspace__slug=slug)
-            .exists()
-        ):
-            return Response(
-                {
-                    "error": "User is part of some projects where they are the only admin you should leave that project first"
-                },
-                status=status.HTTP_400_BAD_REQUEST,
-            )
+        # Delete the user also from all the projects
+        ProjectMember.objects.filter(
+            workspace__slug=slug, member=workspace_member.member
+        ).delete()
+        # Remove all favorites
+        ProjectFavorite.objects.filter(
+            workspace__slug=slug, user=workspace_member.member
+        ).delete()
+        CycleFavorite.objects.filter(
+            workspace__slug=slug, user=workspace_member.member
+        ).delete()
+        ModuleFavorite.objects.filter(
+            workspace__slug=slug, user=workspace_member.member
+        ).delete()
+        PageFavorite.objects.filter(
+            workspace__slug=slug, user=workspace_member.member
+        ).delete()
+        IssueViewFavorite.objects.filter(
+            workspace__slug=slug, user=workspace_member.member
+        ).delete()
+        # Also remove issue from issue assigned
+        IssueAssignee.objects.filter(
+            workspace__slug=slug, assignee=workspace_member.member
+        ).delete()
 
-        # # Deactivate the users from the projects where the user is part of
-        _ = ProjectMember.objects.filter(
-            workspace__slug=slug,
-            member_id=workspace_member.member_id,
-            is_active=True,
-        ).update(is_active=False)
+        # Remove if module member
+        ModuleMember.objects.filter(
+            workspace__slug=slug, member=workspace_member.member
+        ).delete()
+        # Delete owned Pages
+        Page.objects.filter(
+            workspace__slug=slug, owned_by=workspace_member.member
+        ).delete()
 
-        # # Deactivate the user
-        workspace_member.is_active = False
-        workspace_member.save()
+        workspace_member.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
@@ -698,9 +629,7 @@ class TeamMemberViewSet(BaseViewSet):
     def create(self, request, slug):
         members = list(
             WorkspaceMember.objects.filter(
-                workspace__slug=slug,
-                member__id__in=request.data.get("members", []),
-                is_active=True,
+                workspace__slug=slug, member__id__in=request.data.get("members", [])
             )
             .annotate(member_str_id=Cast("member", output_field=CharField()))
             .distinct()
@@ -729,6 +658,23 @@ class TeamMemberViewSet(BaseViewSet):
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
 
+class UserWorkspaceInvitationEndpoint(BaseViewSet):
+    model = WorkspaceMemberInvite
+    serializer_class = WorkSpaceMemberInviteSerializer
+
+    permission_classes = [
+        AllowAny,
+    ]
+
+    def get_queryset(self):
+        return self.filter_queryset(
+            super()
+            .get_queryset()
+            .filter(pk=self.kwargs.get("pk"))
+            .select_related("workspace")
+        )
+
+
 class UserLastProjectWithWorkspaceEndpoint(BaseAPIView):
     def get(self, request):
         user = User.objects.get(pk=request.user.id)
@@ -765,9 +711,7 @@ class UserLastProjectWithWorkspaceEndpoint(BaseAPIView):
 class WorkspaceMemberUserEndpoint(BaseAPIView):
     def get(self, request, slug):
         workspace_member = WorkspaceMember.objects.get(
-            member=request.user,
-            workspace__slug=slug,
-            is_active=True,
+            member=request.user, workspace__slug=slug
         )
         serializer = WorkspaceMemberMeSerializer(workspace_member)
         return Response(serializer.data, status=status.HTTP_200_OK)
@@ -776,9 +720,7 @@ class WorkspaceMemberUserEndpoint(BaseAPIView):
 class WorkspaceMemberUserViewsEndpoint(BaseAPIView):
     def post(self, request, slug):
         workspace_member = WorkspaceMember.objects.get(
-            workspace__slug=slug,
-            member=request.user,
-            is_active=True,
+            workspace__slug=slug, member=request.user
         )
         workspace_member.view_props = request.data.get("view_props", {})
         workspace_member.save()
@@ -1104,9 +1046,7 @@ class WorkspaceUserProfileEndpoint(BaseAPIView):
         user_data = User.objects.get(pk=user_id)
 
         requesting_workspace_member = WorkspaceMember.objects.get(
-            workspace__slug=slug,
-            member=request.user,
-            is_active=True,
+            workspace__slug=slug, member=request.user
         )
         projects = []
         if requesting_workspace_member.role >= 10:
@@ -1310,7 +1250,9 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):
                 status=status.HTTP_200_OK,
             )
 
-        return Response(issues, status=status.HTTP_200_OK)
+        return Response(
+            issues, status=status.HTTP_200_OK
+        )
 
 
 class WorkspaceLabelsEndpoint(BaseAPIView):
@@ -1324,3 +1266,30 @@ class WorkspaceLabelsEndpoint(BaseAPIView):
             project__project_projectmember__member=request.user,
         ).values("parent", "name", "color", "id", "project_id", "workspace__slug")
         return Response(labels, status=status.HTTP_200_OK)
+
+
+class LeaveWorkspaceEndpoint(BaseAPIView):
+    permission_classes = [
+        WorkspaceEntityPermission,
+    ]
+
+    def delete(self, request, slug):
+        workspace_member = WorkspaceMember.objects.get(
+            workspace__slug=slug, member=request.user
+        )
+
+        # Only Admin case
+        if (
+            workspace_member.role == 20
+            and WorkspaceMember.objects.filter(workspace__slug=slug, role=20).count()
+            == 1
+        ):
+            return Response(
+                {
+                    "error": "You cannot leave the workspace since you are the only admin of the workspace you should delete the workspace"
+                },
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        # Delete the member from workspace
+        workspace_member.delete()
+        return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/app/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class AppConfig(AppConfig):
-    name = "plane.app"

apiserver/plane/app/permissions/__init__.py

@@ -1,17 +0,0 @@
-
-from .workspace import (
-    WorkSpaceBasePermission,
-    WorkspaceOwnerPermission,
-    WorkSpaceAdminPermission,
-    WorkspaceEntityPermission,
-    WorkspaceViewerPermission,
-    WorkspaceUserPermission,
-)
-from .project import (
-    ProjectBasePermission,
-    ProjectEntityPermission,
-    ProjectMemberPermission,
-    ProjectLitePermission,
-)
-
-

apiserver/plane/app/serializers/api.py

@@ -1,31 +0,0 @@
-from .base import BaseSerializer
-from plane.db.models import APIToken, APIActivityLog
-
-
-class APITokenSerializer(BaseSerializer):
-    
-    class Meta:
-        model = APIToken
-        fields = "__all__"
-        read_only_fields = [
-            "token",
-            "expired_at",
-            "created_at",
-            "updated_at",
-            "workspace",
-            "user",
-        ]
-
-
-class APITokenReadSerializer(BaseSerializer):
-
-    class Meta:
-        model = APIToken
-        exclude = ('token',)
-
-
-class APIActivityLogSerializer(BaseSerializer):
-
-    class Meta:
-        model = APIActivityLog
-        fields = "__all__"

apiserver/plane/app/serializers/webhook.py

@@ -1,30 +0,0 @@
-# Third party imports
-from rest_framework import serializers
-
-# Module imports
-from .base import DynamicBaseSerializer
-from plane.db.models import Webhook, WebhookLog
-from plane.db.models.webhook import validate_domain, validate_schema 
-
-class WebhookSerializer(DynamicBaseSerializer):
-    url = serializers.URLField(validators=[validate_schema, validate_domain])
-
-    class Meta:
-        model = Webhook
-        fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "secret_key",
-        ]
-
-
-class WebhookLogSerializer(DynamicBaseSerializer):
-
-    class Meta:
-        model = WebhookLog
-        fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "webhook"
-        ]
-