Initial CI setup for apiserver unittests

.github/workflows/build-branch.yml

@@ -117,44 +117,6 @@ jobs:
         name: Checkout Files
         uses: actions/checkout@v4
 
-      - name: Get changed files
-        id: changed_files
-        uses: tj-actions/changed-files@v42
-        with:
-          files_yaml: |
-            apiserver:
-              - apiserver/**
-            proxy:
-              - caddy/**
-            admin:
-              - admin/**
-              - packages/**
-              - "package.json"
-              - "yarn.lock"
-              - "tsconfig.json"
-              - "turbo.json"
-            space:
-              - space/**
-              - packages/**
-              - "package.json"
-              - "yarn.lock"
-              - "tsconfig.json"
-              - "turbo.json"
-            web:
-              - web/**
-              - packages/**
-              - "package.json"
-              - "yarn.lock"
-              - "tsconfig.json"
-              - "turbo.json"
-            live:
-              - live/**
-              - packages/**
-              - 'package.json'
-              - 'yarn.lock'
-              - 'tsconfig.json'
-              - 'turbo.json'
-
   branch_build_push_admin:
     name: Build-Push Admin Docker Image
     runs-on: ubuntu-22.04
@@ -280,8 +242,8 @@ jobs:
           dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-image-owner: makeplane
           docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_proxy }}
-          build-context: ./caddy
-          dockerfile-path: ./caddy/Dockerfile
+          build-context: ./nginx
+          dockerfile-path: ./nginx/Dockerfile
           buildx-driver: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
           buildx-version: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
           buildx-platforms: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }}
@@ -328,6 +290,5 @@ jobs:
             ${{ github.workspace }}/deploy/selfhost/setup.sh
             ${{ github.workspace }}/deploy/selfhost/swarm.sh
             ${{ github.workspace }}/deploy/selfhost/restore.sh
-            ${{ github.workspace }}/deploy/selfhost/restore-airgapped.sh
             ${{ github.workspace }}/deploy/selfhost/docker-compose.yml
             ${{ github.workspace }}/deploy/selfhost/variables.env

.github/workflows/test-pull-request.yml

@@ -0,0 +1,190 @@
+name: Test Pull Request
+
+on:
+  workflow_dispatch:
+  pull_request:
+    types: ["opened", "synchronize", "ready_for_review"]
+    paths:
+      - 'apiserver/**'
+      - '.github/workflows/test-pull-request.yml'
+
+jobs:
+  test-apiserver:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    
+    services:
+      postgres:
+        image: postgres:14
+        env:
+          POSTGRES_PASSWORD: plane
+          POSTGRES_USER: plane
+          POSTGRES_DB: plane
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+      
+      redis:
+        image: redis:7-alpine
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+          
+      - name: Cache Python dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements/test.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+            
+      - name: Install Python dependencies
+        run: |
+          cd apiserver
+          python -m pip install --upgrade pip
+          pip install -r requirements/test.txt
+          
+      - name: Set up test environment
+        run: |
+          cd apiserver
+          cat > .env << EOF
+          # Basic Django settings
+          DEBUG=1
+          SECRET_KEY=test-secret-key-for-ci-only-do-not-use-in-production
+          
+          # Database Configuration
+          DATABASE_URL=postgres://plane:plane@localhost:5432/plane
+          
+          # Redis Configuration  
+          REDIS_URL=redis://localhost:6379
+          
+          # Email Backend for Testing
+          EMAIL_BACKEND=django.core.mail.backends.locmem.EmailBackend
+          
+          # CORS Settings for Testing
+          CORS_ALLOW_ALL_ORIGINS=True
+          CORS_ALLOWED_ORIGINS=http://localhost:3000,http://localhost:3001,http://localhost:3002
+          
+          # Disable SSL and security features for testing
+          SECURE_SSL_REDIRECT=False
+          SECURE_HSTS_SECONDS=0
+          SESSION_COOKIE_SECURE=False
+          CSRF_COOKIE_SECURE=False
+          
+          # Instance settings
+          INSTANCE_KEY=test-instance-key-for-ci
+          SKIP_ENV_VAR=1
+          
+          # File upload settings for testing
+          FILE_SIZE_LIMIT=5242880
+          USE_MINIO=0
+          
+          # Base URLs for testing
+          WEB_URL=http://localhost:8000
+          APP_BASE_URL=http://localhost:3000
+          ADMIN_BASE_URL=http://localhost:3001
+          SPACE_BASE_URL=http://localhost:3002
+          LIVE_BASE_URL=http://localhost:3100
+          
+          # Session settings
+          SESSION_COOKIE_AGE=604800
+          SESSION_COOKIE_NAME=session-id
+          ADMIN_SESSION_COOKIE_AGE=3600
+          
+          # API settings
+          API_KEY_RATE_LIMIT=60/minute
+          
+          # Disable external services for testing
+          ENABLE_SIGNUP=1
+          POSTHOG_API_KEY=
+          ANALYTICS_SECRET_KEY=
+          GITHUB_ACCESS_TOKEN=
+          UNSPLASH_ACCESS_KEY=
+          
+          # RabbitMQ/Celery settings (will be mocked in tests)
+          RABBITMQ_HOST=localhost
+          RABBITMQ_PORT=5672
+          RABBITMQ_USER=guest
+          RABBITMQ_PASSWORD=guest
+          RABBITMQ_VHOST=/
+          
+          # AWS/Storage settings (will be mocked in tests)
+          AWS_ACCESS_KEY_ID=test-access-key
+          AWS_SECRET_ACCESS_KEY=test-secret-key
+          AWS_S3_BUCKET_NAME=test-uploads
+          AWS_REGION=us-east-1
+          EOF
+          
+      - name: Run unit tests
+        run: |
+          cd apiserver
+          python run_tests.py -u -v --coverage
+          
+      - name: Run contract tests
+        run: |
+          cd apiserver
+          python run_tests.py -c -v
+          
+      - name: Show coverage summary
+        if: always()
+        run: |
+          cd apiserver
+          python -m coverage report --show-missing
+          
+      - name: Upload coverage reports
+        uses: codecov/codecov-action@v4
+        if: always() && env.CODECOV_TOKEN != ''
+        with:
+          file: ./apiserver/coverage.xml
+          flags: apiserver
+          name: apiserver-coverage
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+      - name: Generate coverage badge
+        if: always()
+        run: |
+          cd apiserver
+          coverage-badge -o coverage.svg
+        continue-on-error: true
+
+  test-summary:
+    if: always() && github.event.pull_request.draft == false
+    needs: [test-apiserver]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Test Results Summary
+        run: |
+          echo "# Test Results Summary" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          
+          if [[ "${{ needs.test-apiserver.result }}" == "success" ]]; then
+            echo "✅ **API Server Tests**: PASSED" >> $GITHUB_STEP_SUMMARY
+            echo "All tests completed successfully with coverage reporting." >> $GITHUB_STEP_SUMMARY
+          else
+            echo "❌ **API Server Tests**: FAILED" >> $GITHUB_STEP_SUMMARY
+            echo "Tests failed. Please check the logs for details." >> $GITHUB_STEP_SUMMARY
+            exit 1
+          fi
+          
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "## Test Categories Executed" >> $GITHUB_STEP_SUMMARY
+          echo "- **Unit Tests**: Fast, isolated component tests" >> $GITHUB_STEP_SUMMARY
+          echo "- **Contract Tests**: API endpoint verification" >> $GITHUB_STEP_SUMMARY 

CONTRIBUTING.md

@@ -69,14 +69,14 @@ chmod +x setup.sh
 docker compose -f docker-compose-local.yml up
 ```
 
-4. Start web apps:
+5. Start web apps:
 
 ```bash
 yarn dev
 ```
 
-5. Open your browser to http://localhost:3001/god-mode/ and register yourself as instance admin
-6. Open up your browser to http://localhost:3000 then log in using the same credentials from the previous step
+6. Open your browser to http://localhost:3001/god-mode/ and register yourself as instance admin
+7. Open up your browser to http://localhost:3000 then log in using the same credentials from the previous step
 
 That’s it! You’re all set to begin coding. Remember to refresh your browser if changes don’t auto-reload. Happy contributing! 🎉
 

admin/core/components/auth-header.tsx

@@ -67,8 +67,9 @@ export const InstanceHeader: FC = observer(() => {
         {breadcrumbItems.length >= 0 && (
           <div>
             <Breadcrumbs>
-              <Breadcrumbs.Item
-                component={
+              <Breadcrumbs.BreadcrumbItem
+                type="text"
+                link={
                   <BreadcrumbLink
                     href="/general/"
                     label="Settings"
@@ -79,9 +80,10 @@ export const InstanceHeader: FC = observer(() => {
               {breadcrumbItems.map(
                 (item) =>
                   item.title && (
-                    <Breadcrumbs.Item
+                    <Breadcrumbs.BreadcrumbItem
                       key={item.title}
-                      component={<BreadcrumbLink href={item.href} label={item.title} />}
+                      type="text"
+                      link={<BreadcrumbLink href={item.href} label={item.title} />}
                     />
                   )
               )}

admin/core/components/authentication/auth-banner.tsx

@@ -1,11 +1,11 @@
 import { FC } from "react";
 import { Info, X } from "lucide-react";
 // plane constants
-import { TAdminAuthErrorInfo } from "@plane/constants";
+import { TAuthErrorInfo } from "@plane/constants";
 
 type TAuthBanner = {
-  bannerData: TAdminAuthErrorInfo | undefined;
-  handleBannerData?: (bannerData: TAdminAuthErrorInfo | undefined) => void;
+  bannerData: TAuthErrorInfo | undefined;
+  handleBannerData?: (bannerData: TAuthErrorInfo | undefined) => void;
 };
 
 export const AuthBanner: FC<TAuthBanner> = (props) => {

admin/core/components/login/sign-in-form.tsx

@@ -4,7 +4,7 @@ import { FC, useEffect, useMemo, useState } from "react";
 import { useSearchParams } from "next/navigation";
 import { Eye, EyeOff } from "lucide-react";
 // plane internal packages
-import { API_BASE_URL, EAdminAuthErrorCodes, TAdminAuthErrorInfo } from "@plane/constants";
+import { API_BASE_URL, EAdminAuthErrorCodes, TAuthErrorInfo } from "@plane/constants";
 import { AuthService } from "@plane/services";
 import { Button, Input, Spinner } from "@plane/ui";
 // components
@@ -54,7 +54,7 @@ export const InstanceSignInForm: FC = (props) => {
   const [csrfToken, setCsrfToken] = useState<string | undefined>(undefined);
   const [formData, setFormData] = useState<TFormData>(defaultFromData);
   const [isSubmitting, setIsSubmitting] = useState(false);
-  const [errorInfo, setErrorInfo] = useState<TAdminAuthErrorInfo | undefined>(undefined);
+  const [errorInfo, setErrorInfo] = useState<TAuthErrorInfo | undefined>(undefined);
 
   const handleFormChange = (key: keyof TFormData, value: string | boolean) =>
     setFormData((prev) => ({ ...prev, [key]: value }));

admin/core/lib/auth-helpers.tsx

@@ -3,7 +3,7 @@ import Image from "next/image";
 import Link from "next/link";
 import { KeyRound, Mails } from "lucide-react";
 // plane packages
-import { SUPPORT_EMAIL, EAdminAuthErrorCodes, TAdminAuthErrorInfo } from "@plane/constants";
+import { SUPPORT_EMAIL, EAdminAuthErrorCodes, TAuthErrorInfo } from "@plane/constants";
 import { TGetBaseAuthenticationModeProps, TInstanceAuthenticationModes } from "@plane/types";
 import { resolveGeneralTheme } from "@plane/utils";
 // components
@@ -89,7 +89,7 @@ const errorCodeMessages: {
 export const authErrorHandler = (
   errorCode: EAdminAuthErrorCodes,
   email?: string | undefined
-): TAdminAuthErrorInfo | undefined => {
+): TAuthErrorInfo | undefined => {
   const bannerAlertErrorCodes = [
     EAdminAuthErrorCodes.ADMIN_ALREADY_EXIST,
     EAdminAuthErrorCodes.REQUIRED_ADMIN_EMAIL_PASSWORD_FIRST_NAME,

admin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "admin",
   "description": "Admin UI for Plane",
-  "version": "0.26.1",
+  "version": "0.26.0",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -31,7 +31,7 @@
     "lucide-react": "^0.469.0",
     "mobx": "^6.12.0",
     "mobx-react": "^9.1.1",
-    "next": "14.2.30",
+    "next": "^14.2.29",
     "next-themes": "^0.2.1",
     "postcss": "^8.4.38",
     "react": "^18.3.1",
@@ -50,6 +50,6 @@
     "@types/react-dom": "^18.2.18",
     "@types/uuid": "^9.0.8",
     "@types/zxcvbn": "^4.4.4",
-    "typescript": "5.8.3"
+    "typescript": "5.3.3"
   }
 }

aio/Dockerfile-app

@@ -11,7 +11,7 @@ WORKDIR /app
 RUN yarn global add turbo
 COPY . .
 
-RUN turbo prune --scope=web --scope=space --scope=admin --scope=live --docker
+RUN turbo prune --scope=web --scope=space --scope=admin --docker
 
 # *****************************************************************************
 # STAGE 2: Install dependencies & build the project
@@ -53,7 +53,7 @@ ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
 ENV NEXT_TELEMETRY_DISABLED=1
 ENV TURBO_TELEMETRY_DISABLED=1
 
-RUN yarn turbo run build --filter=web --filter=space --filter=admin --filter=live
+RUN yarn turbo run build --filter=web --filter=space --filter=admin
 
 # *****************************************************************************
 # STAGE 3: Copy the project and start it
@@ -87,8 +87,6 @@ RUN chmod +x ./api/bin/*
 RUN chmod -R 777 ./api/
 
 # NEXTJS BUILDS
-COPY --from=installer /app/node_modules ./node_modules/
-
 COPY --from=installer /app/web/next.config.js ./web/
 COPY --from=installer /app/web/package.json ./web/
 COPY --from=installer /app/web/.next/standalone ./web
@@ -107,10 +105,6 @@ COPY --from=installer /app/admin/.next/standalone ./admin
 COPY --from=installer /app/admin/.next/static ./admin/admin/.next/static
 COPY --from=installer /app/admin/public ./admin/admin/public
 
-COPY --from=installer /app/live/package.json ./live/
-COPY --from=installer /app/live/dist ./live/dist
-# COPY --from=installer /app/live/node_modules ./live/node_modules
-
 ARG NEXT_PUBLIC_API_BASE_URL=""
 ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
 

aio/nginx.conf

@@ -45,14 +45,6 @@ http {
             proxy_pass http://localhost:3003/god-mode/;
         }
 
-        location /live/ {
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade ${dollar}http_upgrade;
-            proxy_set_header Connection "upgrade";
-            proxy_set_header Host ${dollar}http_host;
-            proxy_pass http://localhost:3004/;
-        }
-
         location /api/ {
             proxy_http_version 1.1;
             proxy_set_header Upgrade ${dollar}http_upgrade;

aio/supervisord-app

@@ -29,16 +29,6 @@ stderr_logfile=/dev/stdout
 stderr_logfile_maxbytes=0
 environment=PORT=3003,HOSTNAME=0.0.0.0
 
-[program:live]
-command=node /app/live/dist/server.js
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
-environment=PORT=3004,HOSTNAME=0.0.0.0,API_BASE_URL="http://localhost:8000"
-
 [program:migrator]
 directory=/app/api
 command=sh -c "./bin/docker-entrypoint-migrator.sh"

apiserver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plane-api",
-  "version": "0.26.1",
+  "version": "0.26.0",
   "license": "AGPL-3.0",
   "private": true,
   "description": "API server powering Plane's backend"

apiserver/plane/api/views/issue.py

@@ -58,7 +58,7 @@ from plane.bgtasks.storage_metadata_task import get_asset_object_metadata
 from .base import BaseAPIView
 from plane.utils.host import base_host
 from plane.bgtasks.webhook_task import model_activity
-from plane.bgtasks.work_item_link_task import crawl_work_item_link_title
+
 
 class WorkspaceIssueAPIEndpoint(BaseAPIView):
     """
@@ -692,9 +692,6 @@ class IssueLinkAPIEndpoint(BaseAPIView):
         serializer = IssueLinkSerializer(data=request.data)
         if serializer.is_valid():
             serializer.save(project_id=project_id, issue_id=issue_id)
-            crawl_work_item_link_title.delay(
-                serializer.data.get("id"), serializer.data.get("url")
-            )
 
             link = IssueLink.objects.get(pk=serializer.data["id"])
             link.created_by_id = request.data.get("created_by", request.user.id)
@@ -722,9 +719,6 @@ class IssueLinkAPIEndpoint(BaseAPIView):
         serializer = IssueLinkSerializer(issue_link, data=request.data, partial=True)
         if serializer.is_valid():
             serializer.save()
-            crawl_work_item_link_title.delay(
-                serializer.data.get("id"), serializer.data.get("url")
-            )
             issue_activity.delay(
                 type="link.activity.updated",
                 requested_data=requested_data,

apiserver/plane/app/serializers/workspace.py

@@ -1,5 +1,7 @@
 # Third party imports
 from rest_framework import serializers
+from rest_framework import status
+from rest_framework.response import Response
 
 # Module imports
 from .base import BaseSerializer, DynamicBaseSerializer
@@ -196,7 +198,6 @@ class WorkspaceUserLinkSerializer(BaseSerializer):
 
 class IssueRecentVisitSerializer(serializers.ModelSerializer):
     project_identifier = serializers.SerializerMethodField()
-    assignees = serializers.SerializerMethodField()
 
     class Meta:
         model = Issue
@@ -214,14 +215,8 @@ class IssueRecentVisitSerializer(serializers.ModelSerializer):
 
     def get_project_identifier(self, obj):
         project = obj.project
-        return project.identifier if project else None
 
-    def get_assignees(self, obj):
-        return list(
-            obj.assignees.filter(issue_assignee__deleted_at__isnull=True).values_list(
-                "id", flat=True
-            )
-        )
+        return project.identifier if project else None
 
 
 class ProjectRecentVisitSerializer(serializers.ModelSerializer):

apiserver/plane/app/urls/api.py

@@ -4,14 +4,14 @@ from plane.app.views import ApiTokenEndpoint, ServiceApiTokenEndpoint
 urlpatterns = [
     # API Tokens
     path(
-        "users/api-tokens/",
+        "workspaces/<str:slug>/api-tokens/",
         ApiTokenEndpoint.as_view(),
         name="api-tokens",
     ),
     path(
-        "users/api-tokens/<uuid:pk>/",
+        "workspaces/<str:slug>/api-tokens/<uuid:pk>/",
         ApiTokenEndpoint.as_view(),
-        name="api-tokens-details",
+        name="api-tokens",
     ),
     path(
         "workspaces/<str:slug>/service-api-tokens/",

apiserver/plane/app/urls/asset.py

@@ -13,8 +13,6 @@ from plane.app.views import (
     ProjectAssetEndpoint,
     ProjectBulkAssetEndpoint,
     AssetCheckEndpoint,
-    WorkspaceAssetDownloadEndpoint,
-    ProjectAssetDownloadEndpoint,
 )
 
 
@@ -91,14 +89,4 @@ urlpatterns = [
         AssetCheckEndpoint.as_view(),
         name="asset-check",
     ),
-    path(
-        "assets/v2/workspaces/<str:slug>/download/<uuid:asset_id>/",
-        WorkspaceAssetDownloadEndpoint.as_view(),
-        name="workspace-asset-download",
-    ),
-    path(
-        "assets/v2/workspaces/<str:slug>/projects/<uuid:project_id>/download/<uuid:asset_id>/",
-        ProjectAssetDownloadEndpoint.as_view(),
-        name="project-asset-download",
-    ),
 ]

apiserver/plane/app/views/__init__.py

@@ -107,8 +107,6 @@ from .asset.v2 import (
     ProjectAssetEndpoint,
     ProjectBulkAssetEndpoint,
     AssetCheckEndpoint,
-    WorkspaceAssetDownloadEndpoint,
-    ProjectAssetDownloadEndpoint,
 )
 from .issue.base import (
     IssueListEndpoint,

apiserver/plane/app/views/api.py

@@ -1,10 +1,8 @@
 # Python import
 from uuid import uuid4
-from typing import Optional
 
 # Third party
 from rest_framework.response import Response
-from rest_framework.request import Request
 from rest_framework import status
 
 # Module import
@@ -15,9 +13,12 @@ from plane.app.permissions import WorkspaceEntityPermission
 
 
 class ApiTokenEndpoint(BaseAPIView):
-    def post(self, request: Request) -> Response:
+    permission_classes = [WorkspaceEntityPermission]
+
+    def post(self, request, slug):
         label = request.data.get("label", str(uuid4().hex))
         description = request.data.get("description", "")
+        workspace = Workspace.objects.get(slug=slug)
         expired_at = request.data.get("expired_at", None)
 
         # Check the user type
@@ -27,6 +28,7 @@ class ApiTokenEndpoint(BaseAPIView):
             label=label,
             description=description,
             user=request.user,
+            workspace=workspace,
             user_type=user_type,
             expired_at=expired_at,
         )
@@ -35,23 +37,29 @@ class ApiTokenEndpoint(BaseAPIView):
         # Token will be only visible while creating
         return Response(serializer.data, status=status.HTTP_201_CREATED)
 
-    def get(self, request: Request, pk: Optional[str] = None) -> Response:
+    def get(self, request, slug, pk=None):
         if pk is None:
-            api_tokens = APIToken.objects.filter(user=request.user, is_service=False)
+            api_tokens = APIToken.objects.filter(
+                user=request.user, workspace__slug=slug, is_service=False
+            )
             serializer = APITokenReadSerializer(api_tokens, many=True)
             return Response(serializer.data, status=status.HTTP_200_OK)
         else:
-            api_tokens = APIToken.objects.get(user=request.user, pk=pk)
+            api_tokens = APIToken.objects.get(
+                user=request.user, workspace__slug=slug, pk=pk
+            )
             serializer = APITokenReadSerializer(api_tokens)
             return Response(serializer.data, status=status.HTTP_200_OK)
 
-    def delete(self, request: Request, pk: str) -> Response:
-        api_token = APIToken.objects.get(user=request.user, pk=pk, is_service=False)
+    def delete(self, request, slug, pk):
+        api_token = APIToken.objects.get(
+            workspace__slug=slug, user=request.user, pk=pk, is_service=False
+        )
         api_token.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
-    def patch(self, request: Request, pk: str) -> Response:
-        api_token = APIToken.objects.get(user=request.user, pk=pk)
+    def patch(self, request, slug, pk):
+        api_token = APIToken.objects.get(workspace__slug=slug, user=request.user, pk=pk)
         serializer = APITokenSerializer(api_token, data=request.data, partial=True)
         if serializer.is_valid():
             serializer.save()
@@ -62,7 +70,7 @@ class ApiTokenEndpoint(BaseAPIView):
 class ServiceApiTokenEndpoint(BaseAPIView):
     permission_classes = [WorkspaceEntityPermission]
 
-    def post(self, request: Request, slug: str) -> Response:
+    def post(self, request, slug):
         workspace = Workspace.objects.get(slug=slug)
 
         api_token = APIToken.objects.filter(

apiserver/plane/app/views/asset/v2.py

@@ -718,56 +718,3 @@ class AssetCheckEndpoint(BaseAPIView):
             id=asset_id, workspace__slug=slug, deleted_at__isnull=True
         ).exists()
         return Response({"exists": asset}, status=status.HTTP_200_OK)
-
-
-class WorkspaceAssetDownloadEndpoint(BaseAPIView):
-    """Endpoint to generate a download link for an asset with content-disposition=attachment."""
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
-    def get(self, request, slug, asset_id):
-        try:
-            asset = FileAsset.objects.get(
-                id=asset_id,
-                workspace__slug=slug,
-                is_uploaded=True,
-            )
-        except FileAsset.DoesNotExist:
-            return Response(
-                {"error": "The requested asset could not be found."},
-                status=status.HTTP_404_NOT_FOUND,
-            )
-
-        storage = S3Storage(request=request)
-        signed_url = storage.generate_presigned_url(
-            object_name=asset.asset.name,
-            disposition=f"attachment; filename={asset.asset.name}",
-        )
-
-        return HttpResponseRedirect(signed_url)
-
-
-class ProjectAssetDownloadEndpoint(BaseAPIView):
-    """Endpoint to generate a download link for an asset with content-disposition=attachment."""
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="PROJECT")
-    def get(self, request, slug, project_id, asset_id):
-        try:
-            asset = FileAsset.objects.get(
-                id=asset_id,
-                workspace__slug=slug,
-                project_id=project_id,
-                is_uploaded=True,
-            )
-        except FileAsset.DoesNotExist:
-            return Response(
-                {"error": "The requested asset could not be found."},
-                status=status.HTTP_404_NOT_FOUND,
-            )
-
-        storage = S3Storage(request=request)
-        signed_url = storage.generate_presigned_url(
-            object_name=asset.asset.name,
-            disposition=f"attachment; filename={asset.asset.name}",
-        )
-
-        return HttpResponseRedirect(signed_url)

apiserver/plane/app/views/issue/base.py

@@ -944,33 +944,9 @@ class IssueDetailEndpoint(BaseAPIView):
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def get(self, request, slug, project_id):
         filters = issue_filters(request.query_params, "GET")
-
-        # check for the project member role, if the role is 5 then check for the guest_view_all_features
-        #  if it is true then show all the issues else show only the issues created by the user
-        project_member_subquery = ProjectMember.objects.filter(
-            project_id=OuterRef("project_id"),
-            member=self.request.user,
-            is_active=True,
-        ).filter(
-            Q(role__gt=ROLE.GUEST.value) 
-            | Q(
-                role=ROLE.GUEST.value, project__guest_view_all_features=True
-            )
-        )
-
-        # Main issue query
         issue = (
             Issue.issue_objects.filter(workspace__slug=slug, project_id=project_id)
-            .filter(
-                Q(Exists(project_member_subquery))
-                | Q(
-                    project__project_projectmember__member=self.request.user,
-                    project__project_projectmember__is_active=True,
-                    project__project_projectmember__role=ROLE.GUEST.value,
-                    project__guest_view_all_features=False,
-                    created_by=self.request.user,
-                )
-            )
+            .select_related("workspace", "project", "state", "parent")
             .prefetch_related("assignees", "labels", "issue_module__module")
             .annotate(
                 cycle_id=Subquery(
@@ -1038,7 +1014,6 @@ class IssueDetailEndpoint(BaseAPIView):
                 .values("count")
             )
         )
-
         issue = issue.filter(**filters)
         order_by_param = request.GET.get("order_by", "-created_at")
         # Issue queryset

apiserver/plane/app/views/issue/link.py

@@ -45,7 +45,7 @@ class IssueLinkViewSet(BaseViewSet):
         serializer = IssueLinkSerializer(data=request.data)
         if serializer.is_valid():
             serializer.save(project_id=project_id, issue_id=issue_id)
-            crawl_work_item_link_title.delay(
+            crawl_work_item_link_title(
                 serializer.data.get("id"), serializer.data.get("url")
             )
             issue_activity.delay(
@@ -78,7 +78,7 @@ class IssueLinkViewSet(BaseViewSet):
         serializer = IssueLinkSerializer(issue_link, data=request.data, partial=True)
         if serializer.is_valid():
             serializer.save()
-            crawl_work_item_link_title.delay(
+            crawl_work_item_link_title(
                 serializer.data.get("id"), serializer.data.get("url")
             )
 

apiserver/plane/app/views/project/base.py

@@ -341,10 +341,7 @@ class ProjectViewSet(BaseViewSet):
         except IntegrityError as e:
             if "already exists" in str(e):
                 return Response(
-                    {
-                        "name": "The project name is already taken",
-                        "code": "PROJECT_NAME_ALREADY_EXIST",
-                    },
+                    {"name": "The project name is already taken"},
                     status=status.HTTP_409_CONFLICT,
                 )
         except Workspace.DoesNotExist:
@@ -353,10 +350,7 @@ class ProjectViewSet(BaseViewSet):
             )
         except serializers.ValidationError:
             return Response(
-                {
-                    "identifier": "The project identifier is already taken",
-                    "code": "PROJECT_IDENTIFIER_ALREADY_EXIST",
-                },
+                {"identifier": "The project identifier is already taken"},
                 status=status.HTTP_409_CONFLICT,
             )
 

apiserver/plane/app/views/project/member.py

@@ -168,8 +168,6 @@ class ProjectMemberViewSet(BaseViewSet):
             workspace__slug=slug,
             member__is_bot=False,
             is_active=True,
-            member__member_workspace__workspace__slug=slug,
-            member__member_workspace__is_active=True,
         ).select_related("project", "member", "workspace")
 
         serializer = ProjectMemberRoleSerializer(
@@ -315,11 +313,7 @@ class UserProjectRolesEndpoint(BaseAPIView):
 
     def get(self, request, slug):
         project_members = ProjectMember.objects.filter(
-            workspace__slug=slug,
-            member_id=request.user.id,
-            is_active=True,
-            member__member_workspace__workspace__slug=slug,
-            member__member_workspace__is_active=True,
+            workspace__slug=slug, member_id=request.user.id, is_active=True
         ).values("project_id", "role")
 
         project_members = {

apiserver/plane/app/views/workspace/member.py

@@ -1,6 +1,5 @@
 # Django imports
 from django.db.models import Count, Q, OuterRef, Subquery, IntegerField
-from django.utils import timezone
 from django.db.models.functions import Coalesce
 
 # Third party modules
@@ -134,7 +133,7 @@ class WorkSpaceMemberViewSet(BaseViewSet):
         # 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, updated_at=timezone.now())
+        ).update(is_active=False)
 
         workspace_member.is_active = False
         workspace_member.save()
@@ -195,7 +194,7 @@ class WorkSpaceMemberViewSet(BaseViewSet):
         # # 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, updated_at=timezone.now())
+        ).update(is_active=False)
 
         # # Deactivate the user
         workspace_member.is_active = False

apiserver/plane/bgtasks/email_notification_task.py

@@ -284,7 +284,6 @@ def send_email_notification(
                 "project": str(issue.project.name),
                 "user_preference": f"{base_api}/profile/preferences/email",
                 "comments": comments,
-                "entity_type": "issue",
             }
             html_content = render_to_string(
                 "emails/notifications/issue-updates.html", context

apiserver/plane/bgtasks/work_item_link_task.py

@@ -19,6 +19,17 @@ logger = logging.getLogger("plane.worker")
 
 DEFAULT_FAVICON = "PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9ImN1cnJlbnRDb2xvciIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIGNsYXNzPSJsdWNpZGUgbHVjaWRlLWxpbmstaWNvbiBsdWNpZGUtbGluayI+PHBhdGggZD0iTTEwIDEzYTUgNSAwIDAgMCA3LjU0LjU0bDMtM2E1IDUgMCAwIDAtNy4wNy03LjA3bC0xLjcyIDEuNzEiLz48cGF0aCBkPSJNMTQgMTFhNSA1IDAgMCAwLTcuNTQtLjU0bC0zIDNhNSA1IDAgMCAwIDcuMDcgNy4wN2wxLjcxLTEuNzEiLz48L3N2Zz4="  # noqa: E501
 
+
+@shared_task
+def crawl_work_item_link_title(id: str, url: str) -> None:
+    meta_data = crawl_work_item_link_title_and_favicon(url)
+    issue_link = IssueLink.objects.get(id=id)
+
+    issue_link.metadata = meta_data
+
+    issue_link.save()
+
+
 def crawl_work_item_link_title_and_favicon(url: str) -> Dict[str, Any]:
     """
     Crawls a URL to extract the title and favicon.
@@ -46,18 +57,17 @@ def crawl_work_item_link_title_and_favicon(url: str) -> Dict[str, Any]:
             "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36"  # noqa: E501
         }
 
-        soup = None
-        title = None
+        # Fetch the main page
+        response = requests.get(url, headers=headers, timeout=2)
 
-        try:
-            response = requests.get(url, headers=headers, timeout=1)
+        response.raise_for_status()
 
-            soup = BeautifulSoup(response.content, "html.parser")
-            title_tag = soup.find("title")
-            title = title_tag.get_text().strip() if title_tag else None
+        # Parse HTML
+        soup = BeautifulSoup(response.content, "html.parser")
 
-        except requests.RequestException as e:
-            logger.warning(f"Failed to fetch HTML for title: {str(e)}")
+        # Extract title
+        title_tag = soup.find("title")
+        title = title_tag.get_text().strip() if title_tag else None
 
         # Fetch and encode favicon
         favicon_base64 = fetch_and_encode_favicon(headers, soup, url)
@@ -72,6 +82,14 @@ def crawl_work_item_link_title_and_favicon(url: str) -> Dict[str, Any]:
 
         return result
 
+    except requests.RequestException as e:
+        log_exception(e)
+        return {
+            "error": f"Request failed: {str(e)}",
+            "title": None,
+            "favicon": None,
+            "url": url,
+        }
     except Exception as e:
         log_exception(e)
         return {
@@ -82,7 +100,7 @@ def crawl_work_item_link_title_and_favicon(url: str) -> Dict[str, Any]:
         }
 
 
-def find_favicon_url(soup: Optional[BeautifulSoup], base_url: str) -> Optional[str]:
+def find_favicon_url(soup: BeautifulSoup, base_url: str) -> Optional[str]:
     """
     Find the favicon URL from HTML soup.
 
@@ -93,20 +111,18 @@ def find_favicon_url(soup: Optional[BeautifulSoup], base_url: str) -> Optional[s
     Returns:
         str: Absolute URL to favicon or None
     """
+    # Look for various favicon link tags
+    favicon_selectors = [
+        'link[rel="icon"]',
+        'link[rel="shortcut icon"]',
+        'link[rel="apple-touch-icon"]',
+        'link[rel="apple-touch-icon-precomposed"]',
+    ]
 
-    if soup is not None:
-        # Look for various favicon link tags
-        favicon_selectors = [
-            'link[rel="icon"]',
-            'link[rel="shortcut icon"]',
-            'link[rel="apple-touch-icon"]',
-            'link[rel="apple-touch-icon-precomposed"]',
-        ]
-
-        for selector in favicon_selectors:
-            favicon_tag = soup.select_one(selector)
-            if favicon_tag and favicon_tag.get("href"):
-                return urljoin(base_url, favicon_tag["href"])
+    for selector in favicon_selectors:
+        favicon_tag = soup.select_one(selector)
+        if favicon_tag and favicon_tag.get("href"):
+            return urljoin(base_url, favicon_tag["href"])
 
     # Fallback to /favicon.ico
     parsed_url = urlparse(base_url)
@@ -115,6 +131,7 @@ def find_favicon_url(soup: Optional[BeautifulSoup], base_url: str) -> Optional[s
     # Check if fallback exists
     try:
         response = requests.head(fallback_url, timeout=2)
+        response.raise_for_status()
         if response.status_code == 200:
             return fallback_url
     except requests.RequestException as e:
@@ -125,8 +142,8 @@ def find_favicon_url(soup: Optional[BeautifulSoup], base_url: str) -> Optional[s
 
 
 def fetch_and_encode_favicon(
-    headers: Dict[str, str], soup: Optional[BeautifulSoup], url: str
-) -> Dict[str, Optional[str]]:
+    headers: Dict[str, str], soup: BeautifulSoup, url: str
+) -> Optional[Dict[str, str]]:
     """
     Fetch favicon and encode it as base64.
 
@@ -145,7 +162,8 @@ def fetch_and_encode_favicon(
                 "favicon_base64": f"data:image/svg+xml;base64,{DEFAULT_FAVICON}",
             }
 
-        response = requests.get(favicon_url, headers=headers, timeout=1)
+        response = requests.get(favicon_url, headers=headers, timeout=2)
+        response.raise_for_status()
 
         # Get content type
         content_type = response.headers.get("content-type", "image/x-icon")
@@ -165,13 +183,3 @@ def fetch_and_encode_favicon(
             "favicon_url": None,
             "favicon_base64": f"data:image/svg+xml;base64,{DEFAULT_FAVICON}",
         }
-
-
-@shared_task
-def crawl_work_item_link_title(id: str, url: str) -> None:
-    meta_data = crawl_work_item_link_title_and_favicon(url)
-    issue_link = IssueLink.objects.get(id=id)
-
-    issue_link.metadata = meta_data
-
-    issue_link.save()

apiserver/plane/db/migrations/0097_project_external_id_project_external_source.py

@@ -1,23 +0,0 @@
-# Generated by Django 4.2.21 on 2025-06-06 12:33
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0096_user_is_email_valid_user_masked_at'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='project',
-            name='external_id',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='external_source',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-    ]

apiserver/plane/db/models/project.py

@@ -122,9 +122,6 @@ class Project(BaseModel):
     # timezone
     TIMEZONE_CHOICES = tuple(zip(pytz.all_timezones, pytz.all_timezones))
     timezone = models.CharField(max_length=255, default="UTC", choices=TIMEZONE_CHOICES)
-    # external_id for imports
-    external_source = models.CharField(max_length=255, null=True, blank=True)
-    external_id = models.CharField(max_length=255, blank=True, null=True)
 
     @property
     def cover_image_url(self):

apiserver/plane/tests/README.md

@@ -12,6 +12,29 @@ Tests are organized into the following categories:
   - **App tests**: Test the web application API endpoints (under `/api/`).
 - **Smoke tests**: Basic tests to verify that the application runs correctly.
 
+## Continuous Integration (CI)
+
+Tests run automatically on pull requests via GitHub Actions:
+
+### Automated Testing Workflow
+
+When a pull request is created or updated with changes to `apiserver/**` files, the `test-pull-request.yml` workflow automatically:
+
+1. **Sets up test environment**: PostgreSQL 14, Redis 7, Python 3.11
+2. **Runs unit tests**: Fast, isolated component tests with coverage
+3. **Runs contract tests**: API endpoint verification
+4. **Generates coverage reports**: Enforces 90% threshold with HTML, terminal, and XML formats
+5. **Uploads to Codecov**: If token is configured
+
+### CI Environment Variables
+
+The CI automatically configures comprehensive environment variables including:
+- Database and Redis connections
+- Security settings (disabled for testing)
+- Base URLs for all components
+- File upload and storage settings
+- External service configurations (mocked)
+
 ## API vs App Endpoints
 
 Plane has two types of API endpoints:
@@ -32,6 +55,8 @@ Plane has two types of API endpoints:
 
 ## Running Tests
 
+### Local Testing
+
 To run all tests:
 
 ```bash
@@ -54,20 +79,19 @@ python -m pytest plane/tests/contract/app/
 python -m pytest plane/tests/smoke/
 ```
 
-For convenience, we also provide a helper script:
+### Using the Test Runner
+
+For convenience, we provide helper scripts:
 
 ```bash
-# Run all tests
-./run_tests.py
+# Using Python script directly
+python run_tests.py --coverage --verbose  # Full test suite with coverage
+python run_tests.py -u -v                 # Unit tests only
+python run_tests.py -c -v                 # Contract tests only
+python run_tests.py -p -v                 # Parallel execution
 
-# Run only unit tests
-./run_tests.py -u
-
-# Run contract tests with coverage report
-./run_tests.py -c -o
-
-# Run tests in parallel
-./run_tests.py -p
+# Using shell wrapper
+./run_tests.sh --coverage --verbose       # Full test suite with coverage
 ```
 
 ## Fixtures
@@ -134,9 +158,30 @@ Generate a coverage report with:
 
 ```bash
 python -m pytest --cov=plane --cov-report=term --cov-report=html
+# Or using the test runner
+python run_tests.py --coverage
 ```
 
-This creates an HTML report in the `htmlcov/` directory.
+This creates an HTML report in the `htmlcov/` directory and enforces the 90% coverage threshold.
+
+## CI Troubleshooting
+
+### Common CI Issues
+
+1. **Test failures**: Check the GitHub Actions logs for specific error messages
+2. **Coverage below threshold**: Add tests for uncovered code
+3. **Database connection issues**: Ensure PostgreSQL service is healthy in CI
+4. **Redis connection issues**: Ensure Redis service is healthy in CI
+
+### Local Setup for CI Testing
+
+Make sure you have the test dependencies installed:
+
+```bash
+pip install -r requirements/test.txt
+```
+
+Set up your local environment with PostgreSQL and Redis, or use the provided Docker setup.
 
 ## Migration from Old Tests
 

apiserver/plane/tests/conftest.py

@@ -69,48 +69,6 @@ def session_client(api_client, create_user):
     return api_client
 
 
-@pytest.fixture
-def create_bot_user(db):
-    """Create and return a bot user instance"""
-    from uuid import uuid4
-
-    unique_id = uuid4().hex[:8]
-    user = User.objects.create(
-        email=f"bot-{unique_id}@plane.so",
-        username=f"bot_user_{unique_id}",
-        first_name="Bot",
-        last_name="User",
-        is_bot=True,
-    )
-    user.set_password("bot@123")
-    user.save()
-    return user
-
-
-@pytest.fixture
-def api_token_data():
-    """Return sample API token data for testing"""
-    from django.utils import timezone
-    from datetime import timedelta
-
-    return {
-        "label": "Test API Token",
-        "description": "Test description for API token",
-        "expired_at": (timezone.now() + timedelta(days=30)).isoformat(),
-    }
-
-
-@pytest.fixture
-def create_api_token_for_user(db, create_user):
-    """Create and return an API token for a specific user"""
-    return APIToken.objects.create(
-        label="Test Token",
-        description="Test token description",
-        user=create_user,
-        user_type=0,
-    )
-
-
 @pytest.fixture
 def plane_server(live_server):
     """

apiserver/plane/tests/contract/app/test_api_token.py

@@ -1,372 +0,0 @@
-import pytest
-from datetime import timedelta
-from uuid import uuid4
-from django.urls import reverse
-from django.utils import timezone
-from rest_framework import status
-
-from plane.db.models import APIToken, User
-
-
-@pytest.mark.contract
-class TestApiTokenEndpoint:
-    """Test cases for ApiTokenEndpoint"""
-
-    # POST /user/api-tokens/ tests
-    @pytest.mark.django_db
-    def test_create_api_token_success(
-        self, session_client, create_user, api_token_data
-    ):
-        """Test successful API token creation"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens")
-
-        # Act
-        response = session_client.post(url, api_token_data, format="json")
-
-        # Assert
-        assert response.status_code == status.HTTP_201_CREATED
-        assert "token" in response.data
-        assert response.data["label"] == api_token_data["label"]
-        assert response.data["description"] == api_token_data["description"]
-        assert response.data["user_type"] == 0  # Human user
-
-        # Verify token was created in database
-        token = APIToken.objects.get(pk=response.data["id"])
-        assert token.user == create_user
-        assert token.label == api_token_data["label"]
-
-    @pytest.mark.django_db
-    def test_create_api_token_for_bot_user(
-        self, session_client, create_bot_user, api_token_data
-    ):
-        """Test API token creation for bot user"""
-        # Arrange
-        session_client.force_authenticate(user=create_bot_user)
-        url = reverse("api-tokens")
-
-        # Act
-        response = session_client.post(url, api_token_data, format="json")
-
-        # Assert
-        assert response.status_code == status.HTTP_201_CREATED
-        assert response.data["user_type"] == 1  # Bot user
-
-    @pytest.mark.django_db
-    def test_create_api_token_minimal_data(self, session_client, create_user):
-        """Test API token creation with minimal data"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens")
-
-        # Act
-        response = session_client.post(url, {}, format="json")
-
-        # Assert
-        assert response.status_code == status.HTTP_201_CREATED
-        assert "token" in response.data
-        assert len(response.data["label"]) == 32  # UUID hex length
-        assert response.data["description"] == ""
-
-    @pytest.mark.django_db
-    def test_create_api_token_with_expiry(self, session_client, create_user):
-        """Test API token creation with expiry date"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens")
-        future_date = timezone.now() + timedelta(days=30)
-        data = {"label": "Expiring Token", "expired_at": future_date.isoformat()}
-
-        # Act
-        response = session_client.post(url, data, format="json")
-
-        # Assert
-        assert response.status_code == status.HTTP_201_CREATED
-
-        # Verify expiry date was set
-        token = APIToken.objects.get(pk=response.data["id"])
-        assert token.expired_at is not None
-
-    @pytest.mark.django_db
-    def test_create_api_token_unauthenticated(self, api_client, api_token_data):
-        """Test API token creation without authentication"""
-        # Arrange
-        url = reverse("api-tokens")
-
-        # Act
-        response = api_client.post(url, api_token_data, format="json")
-
-        # Assert
-        assert response.status_code == status.HTTP_401_UNAUTHORIZED
-
-    # GET /user/api-tokens/ tests
-    @pytest.mark.django_db
-    def test_get_all_api_tokens(self, session_client, create_user):
-        """Test retrieving all API tokens for user"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-
-        # Create multiple tokens
-        APIToken.objects.create(label="Token 1", user=create_user, user_type=0)
-        APIToken.objects.create(label="Token 2", user=create_user, user_type=0)
-        # Create a service token (should be excluded)
-        APIToken.objects.create(
-            label="Service Token", user=create_user, user_type=0, is_service=True
-        )
-        url = reverse("api-tokens")
-
-        # Act
-        response = session_client.get(url)
-
-        # Assert
-        assert response.status_code == status.HTTP_200_OK
-        assert len(response.data) == 2  # Only non-service tokens
-        assert all(token["is_service"] is False for token in response.data)
-
-    @pytest.mark.django_db
-    def test_get_empty_api_tokens_list(self, session_client, create_user):
-        """Test retrieving API tokens when none exist"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens")
-
-        # Act
-        response = session_client.get(url)
-
-        # Assert
-        assert response.status_code == status.HTTP_200_OK
-        assert response.data == []
-
-    # GET /user/api-tokens/<pk>/ tests
-    @pytest.mark.django_db
-    def test_get_specific_api_token(
-        self, session_client, create_user, create_api_token_for_user
-    ):
-        """Test retrieving a specific API token"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens", kwargs={"pk": create_api_token_for_user.pk})
-
-        # Act
-        response = session_client.get(url)
-
-        # Assert
-        assert response.status_code == status.HTTP_200_OK
-        assert str(response.data["id"]) == str(create_api_token_for_user.pk)
-        assert response.data["label"] == create_api_token_for_user.label
-        assert (
-            "token" not in response.data
-        )  # Token should not be visible in read serializer
-
-    @pytest.mark.django_db
-    def test_get_nonexistent_api_token(self, session_client, create_user):
-        """Test retrieving a non-existent API token"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-        fake_pk = uuid4()
-        url = reverse("api-tokens", kwargs={"pk": fake_pk})
-
-        # Act
-        response = session_client.get(url)
-
-        # Assert
-        assert response.status_code == status.HTTP_404_NOT_FOUND
-
-    @pytest.mark.django_db
-    def test_get_other_users_api_token(self, session_client, create_user, db):
-        """Test retrieving another user's API token (should fail)"""
-        # Arrange
-        # Create another user and their token with unique email and username
-        unique_id = uuid4().hex[:8]
-        unique_email = f"other-{unique_id}@plane.so"
-        unique_username = f"other_user_{unique_id}"
-        other_user = User.objects.create(email=unique_email, username=unique_username)
-        other_token = APIToken.objects.create(
-            label="Other Token", user=other_user, user_type=0
-        )
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens", kwargs={"pk": other_token.pk})
-
-        # Act
-        response = session_client.get(url)
-
-        # Assert
-        assert response.status_code == status.HTTP_404_NOT_FOUND
-
-    # DELETE /user/api-tokens/<pk>/ tests
-    @pytest.mark.django_db
-    def test_delete_api_token_success(
-        self, session_client, create_user, create_api_token_for_user
-    ):
-        """Test successful API token deletion"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens", kwargs={"pk": create_api_token_for_user.pk})
-
-        # Act
-        response = session_client.delete(url)
-
-        # Assert
-        assert response.status_code == status.HTTP_204_NO_CONTENT
-        assert not APIToken.objects.filter(pk=create_api_token_for_user.pk).exists()
-
-    @pytest.mark.django_db
-    def test_delete_nonexistent_api_token(self, session_client, create_user):
-        """Test deleting a non-existent API token"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-        fake_pk = uuid4()
-        url = reverse("api-tokens", kwargs={"pk": fake_pk})
-
-        # Act
-        response = session_client.delete(url)
-
-        # Assert
-        assert response.status_code == status.HTTP_404_NOT_FOUND
-
-    @pytest.mark.django_db
-    def test_delete_other_users_api_token(self, session_client, create_user, db):
-        """Test deleting another user's API token (should fail)"""
-        # Arrange
-        # Create another user and their token with unique email and username
-        unique_id = uuid4().hex[:8]
-        unique_email = f"delete-other-{unique_id}@plane.so"
-        unique_username = f"delete_other_user_{unique_id}"
-        other_user = User.objects.create(email=unique_email, username=unique_username)
-        other_token = APIToken.objects.create(
-            label="Other Token", user=other_user, user_type=0
-        )
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens", kwargs={"pk": other_token.pk})
-
-        # Act
-        response = session_client.delete(url)
-
-        # Assert
-        assert response.status_code == status.HTTP_404_NOT_FOUND
-        # Verify token still exists
-        assert APIToken.objects.filter(pk=other_token.pk).exists()
-
-    @pytest.mark.django_db
-    def test_delete_service_api_token_forbidden(self, session_client, create_user):
-        """Test deleting a service API token (should fail)"""
-        # Arrange
-        service_token = APIToken.objects.create(
-            label="Service Token", user=create_user, user_type=0, is_service=True
-        )
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens", kwargs={"pk": service_token.pk})
-
-        # Act
-        response = session_client.delete(url)
-
-        # Assert
-        assert response.status_code == status.HTTP_404_NOT_FOUND
-        # Verify token still exists
-        assert APIToken.objects.filter(pk=service_token.pk).exists()
-
-    # PATCH /user/api-tokens/<pk>/ tests
-    @pytest.mark.django_db
-    def test_patch_api_token_success(
-        self, session_client, create_user, create_api_token_for_user
-    ):
-        """Test successful API token update"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens", kwargs={"pk": create_api_token_for_user.pk})
-        update_data = {
-            "label": "Updated Token Label",
-            "description": "Updated description",
-        }
-
-        # Act
-        response = session_client.patch(url, update_data, format="json")
-
-        # Assert
-        assert response.status_code == status.HTTP_200_OK
-        assert response.data["label"] == update_data["label"]
-        assert response.data["description"] == update_data["description"]
-
-        # Verify database was updated
-        create_api_token_for_user.refresh_from_db()
-        assert create_api_token_for_user.label == update_data["label"]
-        assert create_api_token_for_user.description == update_data["description"]
-
-    @pytest.mark.django_db
-    def test_patch_api_token_partial_update(
-        self, session_client, create_user, create_api_token_for_user
-    ):
-        """Test partial API token update"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens", kwargs={"pk": create_api_token_for_user.pk})
-        original_description = create_api_token_for_user.description
-        update_data = {"label": "Only Label Updated"}
-
-        # Act
-        response = session_client.patch(url, update_data, format="json")
-
-        # Assert
-        assert response.status_code == status.HTTP_200_OK
-        assert response.data["label"] == update_data["label"]
-        assert response.data["description"] == original_description
-
-    @pytest.mark.django_db
-    def test_patch_nonexistent_api_token(self, session_client, create_user):
-        """Test updating a non-existent API token"""
-        # Arrange
-        session_client.force_authenticate(user=create_user)
-        fake_pk = uuid4()
-        url = reverse("api-tokens", kwargs={"pk": fake_pk})
-        update_data = {"label": "New Label"}
-
-        # Act
-        response = session_client.patch(url, update_data, format="json")
-
-        # Assert
-        assert response.status_code == status.HTTP_404_NOT_FOUND
-
-    @pytest.mark.django_db
-    def test_patch_other_users_api_token(self, session_client, create_user, db):
-        """Test updating another user's API token (should fail)"""
-        # Arrange
-        # Create another user and their token with unique email and username
-        unique_id = uuid4().hex[:8]
-        unique_email = f"patch-other-{unique_id}@plane.so"
-        unique_username = f"patch_other_user_{unique_id}"
-        other_user = User.objects.create(email=unique_email, username=unique_username)
-        other_token = APIToken.objects.create(
-            label="Other Token", user=other_user, user_type=0
-        )
-        session_client.force_authenticate(user=create_user)
-        url = reverse("api-tokens", kwargs={"pk": other_token.pk})
-        update_data = {"label": "Hacked Label"}
-
-        # Act
-        response = session_client.patch(url, update_data, format="json")
-
-        # Assert
-        assert response.status_code == status.HTTP_404_NOT_FOUND
-
-        # Verify token was not updated
-        other_token.refresh_from_db()
-        assert other_token.label == "Other Token"
-
-    # Authentication tests
-    @pytest.mark.django_db
-    def test_all_endpoints_require_authentication(self, api_client):
-        """Test that all endpoints require authentication"""
-        # Arrange
-        endpoints = [
-            (reverse("api-tokens"), "get"),
-            (reverse("api-tokens"), "post"),
-            (reverse("api-tokens", kwargs={"pk": uuid4()}), "get"),
-            (reverse("api-tokens", kwargs={"pk": uuid4()}), "patch"),
-            (reverse("api-tokens", kwargs={"pk": uuid4()}), "delete"),
-        ]
-
-        # Act & Assert
-        for url, method in endpoints:
-            response = getattr(api_client, method)(url)
-            assert response.status_code == status.HTTP_401_UNAUTHORIZED

apiserver/plane/tests/unit/serializers/test_issue_recent_visit.py

@@ -1,75 +0,0 @@
-import pytest
-
-from plane.db.models import (
-    Workspace,
-    Project,
-    Issue,
-    User,
-    IssueAssignee,
-    WorkspaceMember,
-    ProjectMember,
-)
-from plane.app.serializers.workspace import IssueRecentVisitSerializer
-from django.utils import timezone
-
-
-@pytest.mark.unit
-class TestIssueRecentVisitSerializer:
-    """Test the IssueRecentVisitSerializer"""
-
-    def test_issue_recent_visit_serializer_fields(self, db):
-        """Test that the serializer includes the correct fields"""
-
-        test_user_1 = User.objects.create(
-            email="test_user_1@example.com", first_name="Test", last_name="User"
-        )
-
-        # To test for deleted issue assignee
-        test_user_2 = User.objects.create(
-            email="test_user_2@example.com",
-            first_name="Other",
-            last_name="User",
-            username="some user name",
-        )
-
-        workspace = Workspace.objects.create(
-            name="Test Workspace", slug="test-workspace", owner=test_user_1
-        )
-
-        WorkspaceMember.objects.create(member=test_user_2, role=15, workspace=workspace)
-
-        project = Project.objects.create(
-            name="Test Project", identifier="test-project", workspace=workspace
-        )
-        ProjectMember.objects.create(project=project, member=test_user_2)
-
-        issue = Issue.objects.create(
-            name="Test Issue",
-            workspace=workspace,
-            project=project,
-        )
-
-        IssueAssignee.objects.create(issue=issue, assignee=test_user_1, project=project)
-
-        # Deleted issue assignee
-        IssueAssignee.objects.create(
-            issue=issue,
-            assignee=test_user_2,
-            project=project,
-            deleted_at=timezone.now(),
-        )
-
-        serialized_data = IssueRecentVisitSerializer(
-            issue,
-        ).data
-
-        # Check fields are present and correct
-        assert "name" in serialized_data
-        assert "assignees" in serialized_data
-        assert "project_identifier" in serialized_data
-
-        assert serialized_data["name"] == "Test Issue"
-        assert serialized_data["project_identifier"] == "TEST-PROJECT"
-
-        # Only including non-deleted issue assignees
-        assert serialized_data["assignees"] == [test_user_1.id]

apiserver/requirements/base.txt

@@ -1,7 +1,7 @@
 # base requirements
 
 # django
-Django==4.2.22
+Django==4.2.21
 # rest framework
 djangorestframework==3.15.2
 # postgres

apiserver/requirements/test.txt

@@ -9,4 +9,4 @@ factory-boy==3.3.0
 freezegun==1.2.2
 coverage==7.2.7
 httpx==0.24.1
-requests==2.32.4
+requests==2.32.2

apiserver/run_tests.py

@@ -6,36 +6,20 @@ import sys
 
 def main():
     parser = argparse.ArgumentParser(description="Run Plane tests")
+    parser.add_argument("-u", "--unit", action="store_true", help="Run unit tests only")
     parser.add_argument(
-        "-u", "--unit", 
-        action="store_true", 
-        help="Run unit tests only"
+        "-c", "--contract", action="store_true", help="Run contract tests only"
     )
     parser.add_argument(
-        "-c", "--contract", 
-        action="store_true", 
-        help="Run contract tests only"
+        "-s", "--smoke", action="store_true", help="Run smoke tests only"
     )
     parser.add_argument(
-        "-s", "--smoke", 
-        action="store_true", 
-        help="Run smoke tests only"
+        "-o", "--coverage", action="store_true", help="Generate coverage report"
     )
     parser.add_argument(
-        "-o", "--coverage", 
-        action="store_true", 
-        help="Generate coverage report"
-    )
-    parser.add_argument(
-        "-p", "--parallel", 
-        action="store_true", 
-        help="Run tests in parallel"
-    )
-    parser.add_argument(
-        "-v", "--verbose", 
-        action="store_true", 
-        help="Verbose output"
+        "-p", "--parallel", action="store_true", help="Run tests in parallel"
     )
+    parser.add_argument("-v", "--verbose", action="store_true", help="Verbose output")
     args = parser.parse_args()
 
     # Build command
@@ -56,7 +40,14 @@ def main():
 
     # Add coverage
     if args.coverage:
-        cmd.extend(["--cov=plane", "--cov-report=term", "--cov-report=html"])
+        cmd.extend(
+            [
+                "--cov=plane",
+                "--cov-report=term",
+                "--cov-report=html",
+                "--cov-report=xml",
+            ]
+        )
 
     # Add parallel
     if args.parallel:
@@ -71,10 +62,10 @@ def main():
 
     # Print command
     print(f"Running: {' '.join(cmd)}")
-    
+
     # Execute command
     result = subprocess.run(cmd)
-    
+
     # Check coverage thresholds if coverage is enabled
     if args.coverage:
         print("Checking coverage thresholds...")
@@ -83,9 +74,9 @@ def main():
         if coverage_result.returncode != 0:
             print("Coverage below threshold (90%)")
             sys.exit(coverage_result.returncode)
-            
+
     sys.exit(result.returncode)
 
 
 if __name__ == "__main__":
-    main() 
+    main()

apiserver/templates/emails/notifications/issue-updates.html

@@ -3,7 +3,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Updates on {{entity_type}}</title>
+    <title>Updates on issue</title>
     <style type="text/css" emogrify="no"> html { font-family: system-ui; } p, h1, h2, h3, h4, ol, ul { margin: 0; } h-full { height: 100%; } a:hover { color: #3358d4 !important; } </style>
     <style> *[class="gmail-fix"] { display: none !important; } </style>
     <style type="text/css" emogrify="no"> @media (max-width: 600px) { .gmx-killpill { content: " \03D1"; } } </style>
@@ -37,7 +37,7 @@
           {% else %} 
           <p style="font-size: 1rem;color: #1f2d5c; line-height: 28px"> {{summary}} <span style="font-size: 1rem; font-weight: 700; line-height: 28px"> {% if data|length > 0 %} {{ data.0.actor_detail.first_name}} {{data.0.actor_detail.last_name}} {% else %} {{ comments.0.actor_detail.first_name}} {{comments.0.actor_detail.last_name}} {% endif %} </span>and others. </p>
           {% endif %} <!-- {% if actors_involved == 1 %} {% if data|length > 0 and comments|length == 0 %} <p style="font-size: 1rem;color: #1f2d5c; line-height: 28px"> <span style="font-size: 1rem; font-weight: 700; line-height: 28px"> {{ data.0.actor_detail.first_name}} {{data.0.actor_detail.last_name }} </span> made {{total_updates}} {% if total_updates > 1 %}updates{% else %}update{% endif %} to the issue. </p> {% elif data|length == 0 and comments|length > 0 %} <p style="font-size: 1rem;color: #1f2d5c; line-height: 28px"> <span style="font-size: 1rem; font-weight: 700; line-height: 28px"> {{ comments.0.actor_detail.first_name}} {{comments.0.actor_detail.last_name }} </span> added {{total_comments}} new {% if total_comments > 1 %}comments{% else %}comment{% endif %}. </p> {% elif data|length > 0 and comments|length > 0 %} <p style="font-size: 1rem;color: #1f2d5c; line-height: 28px"> <span style="font-size: 1rem; font-weight: 700; line-height: 28px"> {{ data.0.actor_detail.first_name}} {{data.0.actor_detail.last_name }} </span> made {{total_updates}} {% if total_updates > 1 %}updates{% else %}update{% endif %} and added {{total_comments}} new {% if total_comments > 1 %}comments{% else %}comment{% endif %} on the issue. </p> {% endif %} {% else %} <p style="font-size: 1rem;color: #1f2d5c; line-height: 28px"> There are {{ total_updates }} new updates and {{total_comments}} new comments on the issue. </p> {% endif %} --> {% for update in data %} {% if update.changes.name %} <!-- Issue title updated --> 
-          <p style="font-size: 1rem; line-height: 28px; color: #1f2d5c"> The {{entity_type}} title has been updated to {{ issue.name}} </p>
+          <p style="font-size: 1rem; line-height: 28px; color: #1f2d5c"> The issue title has been updated to {{ issue.name}} </p>
           {% endif %} <!-- Outer update Box start --> {% if data %} 
           <div style=" background-color: #f7f9ff; border-radius: 8px; border-style: solid; border-width: 1px; border-color: #c1d0ff; padding: 20px; margin-top: 15px; max-width: 100%; " >
             <!-- Block Heading --> 
@@ -224,7 +224,7 @@
           {% endif %} 
         </div>
         <a href="{{ issue_url }}" style="text-decoration: none;">
-          <div style=" max-width: min-content; white-space: nowrap; background-color: #3e63dd; padding: 10px 15px; border: 1px solid #2f4ba8; border-radius: 4px; margin-top: 15px; cursor: pointer; font-size: 0.8rem; color: white; " > View {{entity_type}} </div>
+          <div style=" max-width: min-content; white-space: nowrap; background-color: #3e63dd; padding: 10px 15px; border: 1px solid #2f4ba8; border-radius: 4px; margin-top: 15px; cursor: pointer; font-size: 0.8rem; color: white; " > View issue </div>
         </a>
       </div>
       <!-- Footer --> 
@@ -232,7 +232,7 @@
         <tr>
           <td>
             <div style="font-size: 0.8rem; color: #1c2024">
-              This email was sent to <a href="mailto:{{receiver.email}}" style="color: #3a5bc7; font-weight: 500; text-decoration: none" >{{ receiver.email }}.</a > If you'd rather not receive this kind of email, <a href="{{ issue_url }}" style="color: #3a5bc7; text-decoration: none" >you can unsubscribe to the {{entity_type}}</a > or <a href="{{ user_preference }}" style="color: #3a5bc7; text-decoration: none" >manage your email preferences</a >. <!-- Github | LinkedIn | Twitter --> 
+              This email was sent to <a href="mailto:{{receiver.email}}" style="color: #3a5bc7; font-weight: 500; text-decoration: none" >{{ receiver.email }}.</a > If you'd rather not receive this kind of email, <a href="{{ issue_url }}" style="color: #3a5bc7; text-decoration: none" >you can unsubscribe to the issue</a > or <a href="{{ user_preference }}" style="color: #3a5bc7; text-decoration: none" >manage your email preferences</a >. <!-- Github | LinkedIn | Twitter --> 
               <div style="margin-top: 60px; float: right"> <a href="https://github.com/makeplane" target="_blank" style="margin-left: 10px; text-decoration: none" > <img src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/github_32px.png" width="25" height="25" border="0" style="display: inline-block" /> </a> <a href="https://www.linkedin.com/company/planepowers/" target="_blank" style="margin-left: 10px; text-decoration: none" > <img src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/linkedin_32px.png" width="25" height="25" border="0" style="display: inline-block" /> </a> <a href="https://twitter.com/planepowers" target="_blank" style="margin-left: 10px; text-decoration: none" > <img src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/twitter_32px.png" width="25" height="25" border="0" style="display: inline-block" /> </a> </div>
             </div>
           </td>

caddy/Caddyfile.template

@@ -1,34 +0,0 @@
-(plane_proxy) {
-	request_body {
-		max_size {$FILE_SIZE_LIMIT}
-	}
-
-	reverse_proxy /spaces/* space:3000
-
-	reverse_proxy /god-mode/* admin:3000
-	
-	reverse_proxy /live/* live:3000
-
-	reverse_proxy /api/* api:8000
-
-	reverse_proxy /auth/* api:8000
-
-	reverse_proxy /{$BUCKET_NAME}/* plane-minio:9000
-
-	reverse_proxy /* web:3000
-}
-
-{
-	email {$CERT_EMAIL:admin@example.com}
-	acme_ca {$CERT_ACME_CA} 
-	{$CERT_ACME_DNS}
-	servers {
-		max_header_size 5MB
-		client_ip_headers X-Forwarded-For X-Real-IP
-		trusted_proxies static {$TRUSTED_PROXIES:0.0.0.0/0}
-	}
-}
-
-{$SITE_ADDRESS} {
-	import plane_proxy
-}

caddy/Dockerfile

@@ -1,9 +0,0 @@
-FROM makeplane/caddy:latest
-
-COPY ./Caddyfile.template /etc/caddy/Caddyfile
-
-COPY ./caddy.sh /docker-entrypoint.sh
-
-RUN chmod +x /docker-entrypoint.sh
-
-CMD ["/docker-entrypoint.sh"]

caddy/caddy.sh

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-if [ "$APP_DOMAIN" == "localhost" ]; then
-    export SITE_ADDRESS=":${LISTEN_HTTP_PORT}"
-elif [ "$SSL" == "true" ]; then
-    export SITE_ADDRESS="${APP_DOMAIN}:${LISTEN_HTTPS_PORT}"
-else
-    export SITE_ADDRESS="http://${APP_DOMAIN}:${LISTEN_HTTP_PORT}"
-fi
-
-exec caddy run --config /etc/caddy/Caddyfile

deploy/selfhost/README.md

@@ -58,7 +58,7 @@ Installing plane is a very easy and minimal step process.
 ### Downloading Latest Release
 
 ```
-mkdir -p plane-selfhost && cd plane-selfhost
+mkdir plane-selfhost
 
 cd plane-selfhost
 ```
@@ -144,15 +144,11 @@ Again the `options [1-7]` will be popped up, and this time hit `7` to exit.
 Before proceeding, we suggest used to review `.env` file and set the values.
 Below are the most import keys you must refer to. _<span style="color: #fcba03">You can use any text editor to edit this file</span>_.
 
-> `APP_DOMAIN` - Set the Fully Qualified Domain Name here. (eg. `plane.example.com`)
-> 
-> `LISTEN_PORT` - This is default set to `80`. Make sure the port you choose to use is not preoccupied. (e.g `LISTEN_PORT=8080`)
-> 
-> `LISTEN_SSL_PORT` - This is default set to `443`. Make sure the port you choose to use is not preoccupied. (e.g `LISTEN_SSL_PORT=8443`)
-> 
-> `WEB_URL` - This is default set to `http://localhost`. Change this to the FQDN you plan to use along with LISTEN_PORT/LISTEN_SSL_PORT (eg. `https://plane.example.com:8443` or `http://[IP-ADDRESS]:8080`)
-> 
-> `CORS_ALLOWED_ORIGINS` - This is default set to `http://${APP_DOMAIN},https://${APP_DOMAIN}`. Change this to the FQDN you plan to use along with LISTEN_PORT and  LISTEN_SSL_PORT (eg. `http://plane.example.com:8080,https://plane.example.com:8443`)
+> `NGINX_PORT` - This is default set to `80`. Make sure the port you choose to use is not preoccupied. (e.g `NGINX_PORT=8080`)
+
+> `WEB_URL` - This is default set to `http://localhost`. Change this to the FQDN you plan to use along with NGINX_PORT (eg. `https://plane.example.com:8080` or `http://[IP-ADDRESS]:8080`)
+
+> `CORS_ALLOWED_ORIGINS` - This is default set to `http://localhost`. Change this to the FQDN you plan to use along with NGINX_PORT (eg. `https://plane.example.com:8080` or `http://[IP-ADDRESS]:8080`)
 
 There are many other settings you can play with, but we suggest you configure `EMAIL SETTINGS` as it will enable you to invite your teammates onto the platform.
 
@@ -176,8 +172,6 @@ Select a Action you want to perform:
 Action [2]: 2
 ```
 
-> You can also choose to run `./setup.sh start` as direct command.
-
 Expect something like this.  
 ![Downloading docker images](images/download.png)
 
@@ -213,8 +207,6 @@ Select a Action you want to perform:
 Action [2]: 3
 ```
 
-> You can also choose to run `./setup.sh stop` as direct command.
-
 If all goes well, you must see something like this
 
 ![Stop Services](images/stopped.png)
@@ -261,8 +253,6 @@ Select a Action you want to perform:
 Action [2]: 4
 ```
 
-> You can also choose to run `./setup.sh restart` as direct command.
-
 If all goes well, you must see something like this
 
 ![Restart Services](images/restart.png)
@@ -307,8 +297,6 @@ Select a Action you want to perform:
 Action [2]: 5
 ```
 
-> You can also choose to run `./setup.sh upgrade` as direct command.
-
 By choosing this, it will stop the services and then will download the latest `docker-compose.yaml` and `plane.env`.
 
 You must expect the below message
@@ -477,8 +465,6 @@ Select a Action you want to perform:
 Action [2]: 7
 ```
 
-> You can also choose to run `./setup.sh backup` as direct command.
-
 In response, you can find the backup folder
 
 ```bash
@@ -500,7 +486,7 @@ When you want to restore the previously backed-up data, follow the instructions
 1. Download the restore script using the command below. We suggest downloading it in the same folder as `setup.sh`.
 
    ```bash
-   curl -fsSL -o restore.sh https://github.com/makeplane/plane/releases/latest/download/restore.sh
+   curl -fsSL -o restore.sh https://raw.githubusercontent.com/makeplane/plane/master/deploy/selfhost/restore.sh
    chmod +x restore.sh
    ```
 
@@ -543,31 +529,6 @@ When you want to restore the previously backed-up data, follow the instructions
 
 ---
 
-### Restore for Commercial Air-Gapped (Docker Compose)
-
-When you want to restore the previously backed-up data on Plane Commercial Air-Gapped version, follow the instructions below.
-
-1. Download the restore script using the command below
-
-   ```bash
-   curl -fsSL -o restore-airgapped.sh https://github.com/makeplane/plane/releases/latest/download/restore-airgapped.sh
-   chmod +x restore-airgapped.sh
-   ```
-
-1. Copy the backup folder and the `restore-airgapped.sh` to `Commercial Airgapped Edition` server
-
-1. Make sure that Plane Commercial (Airgapped) is extracted and ready to get started. In case it is running, you would need to stop that.
-
-1. Execute the command below to restore your data.
-
-   ```bash
-   ./restore-airgapped.sh <path to backup folder containing *.tar.gz files>
-   ```
-
-1. After restoration, you are ready to start Plane Commercial (Airgapped) will all your previously saved data. 
-
----
-
 <details>
    <summary><h2>Upgrading from v0.13.2 to v0.14.x</h2></summary>
 

deploy/selfhost/build.yml

@@ -17,12 +17,6 @@ services:
       context: ./
       dockerfile: ./admin/Dockerfile.admin
 
-  live:
-    image: ${DOCKERHUB_USER:-local}/plane-live:${APP_RELEASE:-latest}
-    build:
-      context: .
-      dockerfile: ./live/Dockerfile.live
-
   api:
     image: ${DOCKERHUB_USER:-local}/plane-backend:${APP_RELEASE:-latest}
     build:
@@ -32,5 +26,5 @@ services:
   proxy:
     image: ${DOCKERHUB_USER:-local}/plane-proxy:${APP_RELEASE:-latest}
     build:
-      context: ./caddy
+      context: ./nginx
       dockerfile: ./Dockerfile

deploy/selfhost/docker-compose.yml

@@ -24,14 +24,9 @@ x-aws-s3-env: &aws-s3-env
   AWS_S3_BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads}
 
 x-proxy-env: &proxy-env
-  SSL: ${SSL:-false}
-  APP_DOMAIN: ${APP_DOMAIN:-localhost}
-  FILE_SIZE_LIMIT: ${FILE_SIZE_LIMIT:-5242880}
-  CERT_EMAIL: ${CERT_EMAIL:-admin@example.com}
-  CERT_ACME_CA: ${CERT_ACME_CA:-}
-  LISTEN_HTTP_PORT: ${LISTEN_PORT:-80}
-  LISTEN_HTTPS_PORT: ${LISTEN_SSL_PORT:-443}
+  NGINX_PORT: ${NGINX_PORT:-80}
   BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads}
+  FILE_SIZE_LIMIT: ${FILE_SIZE_LIMIT:-5242880}
 
 x-mq-env: &mq-env # RabbitMQ Settings
   RABBITMQ_HOST: ${RABBITMQ_HOST:-plane-mq}
@@ -217,31 +212,22 @@ services:
 
   # Comment this if you already have a reverse proxy running
   proxy:
-    image: artifacts.plane.so/makeplane/plane-proxy:${APP_RELEASE_VERSION}
+    image: artifacts.plane.so/makeplane/plane-proxy:${APP_RELEASE:-stable}
+    ports:
+      - target: 80
+        published: ${NGINX_PORT:-80}
+        protocol: tcp
+        mode: host
+    environment:
+      <<: *proxy-env
     deploy:
       replicas: 1
       restart_policy:
         condition: on-failure
-    environment:
-      <<: *proxy-env
-    ports:
-    - target: 80
-      published: ${LISTEN_HTTP_PORT:-80}
-      protocol: tcp
-      mode: host
-    - target: 443
-      published: ${LISTEN_HTTPS_PORT:-443}
-      protocol: tcp
-      mode: host
-    volumes:
-    - proxy_config:/config
-    - proxy_data:/data
     depends_on:
-    - web
-    - api
-    - space
-    - admin
-    - live
+      - web
+      - api
+      - space
 
 volumes:
   pgdata:
@@ -251,6 +237,4 @@ volumes:
   logs_worker:
   logs_beat-worker:
   logs_migrator:
-  caddy_config:
-  caddy_data:
   rabbitmq_data:

deploy/selfhost/install.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 BRANCH=${BRANCH:-master}
-RELEASE_TAG=${RELEASE_TAG:-v0.22-dev}
 SCRIPT_DIR=$PWD
 SERVICE_FOLDER=plane-app
 PLANE_INSTALL_DIR=$PWD/$SERVICE_FOLDER
@@ -178,13 +177,11 @@ function syncEnvFile(){
                 updateEnvFile "$key" "$value" "$DOCKER_ENV_PATH"
             fi
         done < "$DOCKER_ENV_PATH"
-        # Replace APP_RELEASE with the latest value
-        updateEnvFile "APP_RELEASE" "$APP_RELEASE" "$DOCKER_ENV_PATH"
     fi
     echo "Environment variables synced successfully" >&2
 }
 
-function buildYourOwnImage() {
+function buildYourOwnImage(){
     echo "Building images locally..."
 
     export DOCKERHUB_USER="myplane"
@@ -426,7 +423,7 @@ function upgrade() {
     stopServices
 
     echo
-    echo "***** DOWNLOADING $APP_RELEASE VERSION ****"
+    echo "***** DOWNLOADING STABLE VERSION ****"
     install
 
     echo "***** PLEASE VALIDATE AND START SERVICES ****"

deploy/selfhost/restore-airgapped.sh

@@ -1,144 +0,0 @@
-#!/bin/bash
-+set -euo pipefail
-
-function print_header() {
-clear
-
-cat <<"EOF"
---------------------------------------------
- ____  _                          ///////// 
-|  _ \| | __ _ _ __   ___         ///////// 
-| |_) | |/ _` | '_ \ / _ \   /////    ///// 
-|  __/| | (_| | | | |  __/   /////    ///// 
-|_|   |_|\__,_|_| |_|\___|        ////      
-                                  ////      
---------------------------------------------
-Project management tool from the future
---------------------------------------------
-EOF
-}
-
-function restoreData() {
-
-    echo ""
-    echo "****************************************************"
-    echo "We are about to restore your data from the backup files."
-    echo "****************************************************"
-    echo ""
-
-    # set the backup folder path
-    BACKUP_FOLDER=${1}
-
-    if [ -z "$BACKUP_FOLDER" ]; then
-        BACKUP_FOLDER="$PWD/backup"
-        read -p "Enter the backup folder path [$BACKUP_FOLDER]: " BACKUP_FOLDER
-        if [ -z "$BACKUP_FOLDER" ]; then
-            BACKUP_FOLDER="$PWD/backup"
-        fi
-    fi
-
-    # check if the backup folder exists
-    if [ ! -d "$BACKUP_FOLDER" ]; then
-        echo "Error: Backup folder not found at $BACKUP_FOLDER"
-        exit 1
-    fi
-
-    # check if there are any .tar.gz files in the backup folder
-    if ! ls "$BACKUP_FOLDER"/*.tar.gz 1> /dev/null 2>&1; then
-        echo "Error: Backup folder does not contain .tar.gz files"
-        exit 1
-    fi
-
-    echo ""
-    echo "Using backup folder: $BACKUP_FOLDER"
-    echo ""
-
-    # ask for current install path
-    AIRGAPPED_INSTALL_PATH="$HOME/planeairgapped"
-    read -p "Enter the airgapped instance install path [$AIRGAPPED_INSTALL_PATH]: " AIRGAPPED_INSTALL_PATH
-    if [ -z "$AIRGAPPED_INSTALL_PATH" ]; then
-        AIRGAPPED_INSTALL_PATH="$HOME/planeairgapped"
-    fi
-
-    # check if the airgapped instance install path exists
-    if [ ! -d "$AIRGAPPED_INSTALL_PATH" ]; then
-        echo "Error: Airgapped instance install path not found at $AIRGAPPED_INSTALL_PATH"
-        exit 1
-    fi
-
-    echo ""
-    echo "Using airgapped instance install path: $AIRGAPPED_INSTALL_PATH"
-    echo ""
-
-    # check if the docker-compose.yaml exists
-    if [ ! -f "$AIRGAPPED_INSTALL_PATH/docker-compose.yml" ]; then
-        echo "Error: docker-compose.yml not found at $AIRGAPPED_INSTALL_PATH/docker-compose.yml"
-        exit 1
-    fi
-
-    local dockerServiceStatus
-    if command -v jq &> /dev/null; then
-        dockerServiceStatus=$($COMPOSE_CMD ls --filter name=plane-airgapped --format=json | jq -r .[0].Status)
-    else
-        dockerServiceStatus=$($COMPOSE_CMD ls --filter name=plane-airgapped | grep -o "running" | head -n 1)
-    fi
-
-    if [[ $dockerServiceStatus == "running" ]]; then
-        echo "Plane Airgapped is running. Please STOP the Plane Airgapped before restoring data."
-        exit 1
-    fi
-
-    CURRENT_USER_ID=$(id -u)
-    CURRENT_GROUP_ID=$(id -g)
-
-    # if the data folder not exists, create it
-    if [ ! -d "$AIRGAPPED_INSTALL_PATH/data" ]; then
-        mkdir -p "$AIRGAPPED_INSTALL_PATH/data"
-        chown -R $CURRENT_USER_ID:$CURRENT_GROUP_ID "$AIRGAPPED_INSTALL_PATH/data"
-    fi
-
-    for BACKUP_FILE in "$BACKUP_FOLDER/*.tar.gz"; do
-        if [ -e "$BACKUP_FILE" ]; then
-
-            # get the basefilename without the extension
-            BASE_FILE_NAME=$(basename "$BACKUP_FILE" ".tar.gz")
-
-            # extract the restoreFile to the airgapped instance install path
-            echo "Restoring $BASE_FILE_NAME"
-            rm -rf "$AIRGAPPED_INSTALL_PATH/data/$BASE_FILE_NAME" || true
-            
-            tar -xvzf "$BACKUP_FILE" -C "$AIRGAPPED_INSTALL_PATH/data/"
-            if [ $? -ne 0 ]; then
-                echo "Error: Failed to extract $BACKUP_FILE"
-                exit 1
-            fi
-            chown -R $CURRENT_USER_ID:$CURRENT_GROUP_ID "$AIRGAPPED_INSTALL_PATH/data/$BASE_FILE_NAME"
-            if [ $? -ne 0 ]; then
-                echo "Error: Failed to change ownership of $AIRGAPPED_INSTALL_PATH/data/$BASE_FILE_NAME"
-                exit 1
-            fi
-        else
-            echo "No .tar.gz files found in the current directory."
-            echo ""
-            echo "Please provide the path to the backup file."
-            echo ""
-            echo "Usage: $0 /path/to/backup"  
-            exit 1
-        fi
-    done
-
-    echo ""
-    echo "Restore completed successfully."
-    echo ""
-}
-
-# if docker-compose is installed
-if command -v docker-compose &> /dev/null
-then
-    COMPOSE_CMD="docker-compose"
-else
-    COMPOSE_CMD="docker compose"
-fi
-
-print_header
-restoreData "$@"

deploy/selfhost/variables.env

@@ -1,6 +1,5 @@
 APP_DOMAIN=localhost
 APP_RELEASE=stable
-SSL=false
 
 WEB_REPLICAS=1
 SPACE_REPLICAS=1
@@ -10,11 +9,10 @@ WORKER_REPLICAS=1
 BEAT_WORKER_REPLICAS=1
 LIVE_REPLICAS=1
 
-LISTEN_PORT=80
-LISTEN_SSL_PORT=443
+NGINX_PORT=80
 WEB_URL=http://${APP_DOMAIN}
 DEBUG=0
-CORS_ALLOWED_ORIGINS=http://${APP_DOMAIN},https://${APP_DOMAIN}
+CORS_ALLOWED_ORIGINS=http://${APP_DOMAIN}
 API_BASE_URL=http://api:8000
 
 #DB SETTINGS
@@ -32,11 +30,6 @@ REDIS_HOST=plane-redis
 REDIS_PORT=6379
 REDIS_URL=
 
-# If SSL Cert to be generated, set CERT_EMAIL and APP_PROTOCOL to https
-CERT_EMAIL=
-CERT_ACME_CA=https://acme-v02.api.letsencrypt.org/directory
-TRUSTED_PROXIES=0.0.0.0/0
-
 # RabbitMQ Settings
 RABBITMQ_HOST=plane-mq
 RABBITMQ_PORT=5672

live/package.json

@@ -1,6 +1,6 @@
 {
   "name": "live",
-  "version": "0.26.1",
+  "version": "0.26.0",
   "license": "AGPL-3.0",
   "description": "A realtime collaborative server powers Plane's rich text editor",
   "main": "./src/server.ts",
@@ -58,6 +58,6 @@
     "nodemon": "^3.1.7",
     "ts-node": "^10.9.2",
     "tsup": "8.4.0",
-    "typescript": "5.8.3"
+    "typescript": "5.3.3"
   }
 }

package.json

@@ -2,7 +2,7 @@
   "name": "plane",
   "description": "Open-source project management that unlocks customer value",
   "repository": "https://github.com/makeplane/plane.git",
-  "version": "0.26.1",
+  "version": "0.26.0",
   "license": "AGPL-3.0",
   "private": true,
   "workspaces": [
@@ -24,16 +24,14 @@
   "devDependencies": {
     "prettier": "latest",
     "prettier-plugin-tailwindcss": "^0.5.4",
-    "turbo": "^2.5.4"
+    "turbo": "^2.5.3"
   },
   "resolutions": {
-    "brace-expansion": "2.0.2",
     "nanoid": "3.3.8",
     "esbuild": "0.25.0",
     "@babel/helpers": "7.26.10",
     "@babel/runtime": "7.26.10",
-    "chokidar": "3.6.0",
-    "tar-fs": "3.0.9"
+    "chokidar": "3.6.0"
   },
   "packageManager": "yarn@1.22.22"
 }

packages/constants/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/constants",
-  "version": "0.26.1",
+  "version": "0.26.0",
   "private": true,
   "main": "./src/index.ts",
   "license": "AGPL-3.0"

packages/constants/src/analytics-v2/common.ts

@@ -0,0 +1,105 @@
+import { TAnalyticsTabsV2Base } from "@plane/types";
+import { ChartXAxisProperty, ChartYAxisMetric } from "../chart";
+
+export const insightsFields: Record<TAnalyticsTabsV2Base, string[]> = {
+  overview: [
+    "total_users",
+    "total_admins",
+    "total_members",
+    "total_guests",
+    "total_projects",
+    "total_work_items",
+    "total_cycles",
+    "total_intake",
+  ],
+  "work-items": [
+    "total_work_items",
+    "started_work_items",
+    "backlog_work_items",
+    "un_started_work_items",
+    "completed_work_items",
+  ],
+};
+
+export const ANALYTICS_V2_DURATION_FILTER_OPTIONS = [
+  {
+    name: "Yesterday",
+    value: "yesterday",
+  },
+  {
+    name: "Last 7 days",
+    value: "last_7_days",
+  },
+  {
+    name: "Last 30 days",
+    value: "last_30_days",
+  },
+  {
+    name: "Last 3 months",
+    value: "last_3_months",
+  },
+];
+
+export const ANALYTICS_V2_X_AXIS_VALUES: { value: ChartXAxisProperty; label: string }[] = [
+  {
+    value: ChartXAxisProperty.STATES,
+    label: "State name",
+  },
+  {
+    value: ChartXAxisProperty.STATE_GROUPS,
+    label: "State group",
+  },
+  {
+    value: ChartXAxisProperty.PRIORITY,
+    label: "Priority",
+  },
+  {
+    value: ChartXAxisProperty.LABELS,
+    label: "Label",
+  },
+  {
+    value: ChartXAxisProperty.ASSIGNEES,
+    label: "Assignee",
+  },
+  {
+    value: ChartXAxisProperty.ESTIMATE_POINTS,
+    label: "Estimate point",
+  },
+  {
+    value: ChartXAxisProperty.CYCLES,
+    label: "Cycle",
+  },
+  {
+    value: ChartXAxisProperty.MODULES,
+    label: "Module",
+  },
+  {
+    value: ChartXAxisProperty.COMPLETED_AT,
+    label: "Completed date",
+  },
+  {
+    value: ChartXAxisProperty.TARGET_DATE,
+    label: "Due date",
+  },
+  {
+    value: ChartXAxisProperty.START_DATE,
+    label: "Start date",
+  },
+  {
+    value: ChartXAxisProperty.CREATED_AT,
+    label: "Created date",
+  },
+];
+
+export const ANALYTICS_V2_Y_AXIS_VALUES: { value: ChartYAxisMetric; label: string }[] = [
+  {
+    value: ChartYAxisMetric.WORK_ITEM_COUNT,
+    label: "Work item",
+  },
+  {
+    value: ChartYAxisMetric.ESTIMATE_POINT_COUNT,
+    label: "Estimate",
+  },
+];
+
+export const ANALYTICS_V2_DATE_KEYS = ["completed_at", "target_date", "start_date", "created_at"];

packages/constants/src/analytics.ts

@@ -0,0 +1,81 @@
+// types
+import { TXAxisValues, TYAxisValues } from "@plane/types";
+
+export const ANALYTICS_TABS = [
+  {
+    key: "scope_and_demand",
+    i18n_title: "workspace_analytics.tabs.scope_and_demand",
+  },
+  { key: "custom", i18n_title: "workspace_analytics.tabs.custom" },
+];
+
+export const ANALYTICS_X_AXIS_VALUES: { value: TXAxisValues; label: string }[] =
+  [
+    {
+      value: "state_id",
+      label: "State name",
+    },
+    {
+      value: "state__group",
+      label: "State group",
+    },
+    {
+      value: "priority",
+      label: "Priority",
+    },
+    {
+      value: "labels__id",
+      label: "Label",
+    },
+    {
+      value: "assignees__id",
+      label: "Assignee",
+    },
+    {
+      value: "estimate_point__value",
+      label: "Estimate point",
+    },
+    {
+      value: "issue_cycle__cycle_id",
+      label: "Cycle",
+    },
+    {
+      value: "issue_module__module_id",
+      label: "Module",
+    },
+    {
+      value: "completed_at",
+      label: "Completed date",
+    },
+    {
+      value: "target_date",
+      label: "Due date",
+    },
+    {
+      value: "start_date",
+      label: "Start date",
+    },
+    {
+      value: "created_at",
+      label: "Created date",
+    },
+  ];
+
+export const ANALYTICS_Y_AXIS_VALUES: { value: TYAxisValues; label: string }[] =
+  [
+    {
+      value: "issue_count",
+      label: "Work item Count",
+    },
+    {
+      value: "estimate",
+      label: "Estimate",
+    },
+  ];
+
+export const ANALYTICS_DATE_KEYS = [
+  "completed_at",
+  "target_date",
+  "start_date",
+  "created_at",
+];

packages/constants/src/analytics/common.ts

@@ -1,178 +0,0 @@
-import { TAnalyticsTabsBase } from "@plane/types";
-import { ChartXAxisProperty, ChartYAxisMetric } from "../chart";
-
-export interface IInsightField {
-  key: string;
-  i18nKey: string;
-  i18nProps?: {
-    entity?: string;
-    entityPlural?: string;
-    [key: string]: any;
-  };
-}
-
-export const ANALYTICS_INSIGHTS_FIELDS: Record<TAnalyticsTabsBase, IInsightField[]> = {
-  overview: [
-    {
-      key: "total_users",
-      i18nKey: "workspace_analytics.total",
-      i18nProps: {
-        entity: "common.users",
-      },
-    },
-    {
-      key: "total_admins",
-      i18nKey: "workspace_analytics.total",
-      i18nProps: {
-        entity: "common.admins",
-      },
-    },
-    {
-      key: "total_members",
-      i18nKey: "workspace_analytics.total",
-      i18nProps: {
-        entity: "common.members",
-      },
-    },
-    {
-      key: "total_guests",
-      i18nKey: "workspace_analytics.total",
-      i18nProps: {
-        entity: "common.guests",
-      },
-    },
-    {
-      key: "total_projects",
-      i18nKey: "workspace_analytics.total",
-      i18nProps: {
-        entity: "common.projects",
-      },
-    },
-    {
-      key: "total_work_items",
-      i18nKey: "workspace_analytics.total",
-      i18nProps: {
-        entity: "common.work_items",
-      },
-    },
-    {
-      key: "total_cycles",
-      i18nKey: "workspace_analytics.total",
-      i18nProps: {
-        entity: "common.cycles",
-      },
-    },
-    {
-      key: "total_intake",
-      i18nKey: "workspace_analytics.total",
-      i18nProps: {
-        entity: "sidebar.intake",
-      },
-    },
-  ],
-  "work-items": [
-    {
-      key: "total_work_items",
-      i18nKey: "workspace_analytics.total",
-    },
-    {
-      key: "started_work_items",
-      i18nKey: "workspace_analytics.started_work_items",
-    },
-    {
-      key: "backlog_work_items",
-      i18nKey: "workspace_analytics.backlog_work_items",
-    },
-    {
-      key: "un_started_work_items",
-      i18nKey: "workspace_analytics.un_started_work_items",
-    },
-    {
-      key: "completed_work_items",
-      i18nKey: "workspace_analytics.completed_work_items",
-    },
-  ],
-};
-
-export const ANALYTICS_DURATION_FILTER_OPTIONS = [
-  {
-    name: "Yesterday",
-    value: "yesterday",
-  },
-  {
-    name: "Last 7 days",
-    value: "last_7_days",
-  },
-  {
-    name: "Last 30 days",
-    value: "last_30_days",
-  },
-  {
-    name: "Last 3 months",
-    value: "last_3_months",
-  },
-];
-
-export const ANALYTICS_X_AXIS_VALUES: { value: ChartXAxisProperty; label: string }[] = [
-  {
-    value: ChartXAxisProperty.STATES,
-    label: "State name",
-  },
-  {
-    value: ChartXAxisProperty.STATE_GROUPS,
-    label: "State group",
-  },
-  {
-    value: ChartXAxisProperty.PRIORITY,
-    label: "Priority",
-  },
-  {
-    value: ChartXAxisProperty.LABELS,
-    label: "Label",
-  },
-  {
-    value: ChartXAxisProperty.ASSIGNEES,
-    label: "Assignee",
-  },
-  {
-    value: ChartXAxisProperty.ESTIMATE_POINTS,
-    label: "Estimate point",
-  },
-  {
-    value: ChartXAxisProperty.CYCLES,
-    label: "Cycle",
-  },
-  {
-    value: ChartXAxisProperty.MODULES,
-    label: "Module",
-  },
-  {
-    value: ChartXAxisProperty.COMPLETED_AT,
-    label: "Completed date",
-  },
-  {
-    value: ChartXAxisProperty.TARGET_DATE,
-    label: "Due date",
-  },
-  {
-    value: ChartXAxisProperty.START_DATE,
-    label: "Start date",
-  },
-  {
-    value: ChartXAxisProperty.CREATED_AT,
-    label: "Created date",
-  },
-];
-
-export const ANALYTICS_Y_AXIS_VALUES: { value: ChartYAxisMetric; label: string }[] = [
-  {
-    value: ChartYAxisMetric.WORK_ITEM_COUNT,
-    label: "Work item",
-  },
-  {
-    value: ChartYAxisMetric.ESTIMATE_POINT_COUNT,
-    label: "Estimate",
-  },
-];
-
-export const ANALYTICS_V2_DATE_KEYS = ["completed_at", "target_date", "start_date", "created_at"];

packages/constants/src/auth.ts

@@ -69,7 +69,7 @@ export enum EErrorAlertType {
 
 export type TAuthErrorInfo = {
   type: EErrorAlertType;
-  code: EAuthErrorCodes;
+  code: EAdminAuthErrorCodes;
   title: string;
   message: any;
 };
@@ -87,13 +87,6 @@ export enum EAdminAuthErrorCodes {
   ADMIN_USER_DEACTIVATED = "5190",
 }
 
-export type TAdminAuthErrorInfo = {
-  type: EErrorAlertType;
-  code: EAdminAuthErrorCodes;
-  title: string;
-  message: any;
-};
-
 export enum EAuthErrorCodes {
   // Global
   INSTANCE_NOT_CONFIGURED = "5000",

packages/constants/src/endpoints.ts

@@ -1,26 +1,28 @@
 export const API_BASE_URL = process.env.NEXT_PUBLIC_API_BASE_URL || "";
-export const API_BASE_PATH = process.env.NEXT_PUBLIC_API_BASE_PATH || "";
+export const API_BASE_PATH = process.env.NEXT_PUBLIC_API_BASE_PATH || "/";
 export const API_URL = encodeURI(`${API_BASE_URL}${API_BASE_PATH}`);
 // God Mode Admin App Base Url
 export const ADMIN_BASE_URL = process.env.NEXT_PUBLIC_ADMIN_BASE_URL || "";
-export const ADMIN_BASE_PATH = process.env.NEXT_PUBLIC_ADMIN_BASE_PATH || "";
+export const ADMIN_BASE_PATH = process.env.NEXT_PUBLIC_ADMIN_BASE_PATH || "/";
 export const GOD_MODE_URL = encodeURI(`${ADMIN_BASE_URL}${ADMIN_BASE_PATH}`);
 // Publish App Base Url
 export const SPACE_BASE_URL = process.env.NEXT_PUBLIC_SPACE_BASE_URL || "";
-export const SPACE_BASE_PATH = process.env.NEXT_PUBLIC_SPACE_BASE_PATH || "";
+export const SPACE_BASE_PATH = process.env.NEXT_PUBLIC_SPACE_BASE_PATH || "/";
 export const SITES_URL = encodeURI(`${SPACE_BASE_URL}${SPACE_BASE_PATH}`);
 // Live App Base Url
 export const LIVE_BASE_URL = process.env.NEXT_PUBLIC_LIVE_BASE_URL || "";
-export const LIVE_BASE_PATH = process.env.NEXT_PUBLIC_LIVE_BASE_PATH || "";
+export const LIVE_BASE_PATH = process.env.NEXT_PUBLIC_LIVE_BASE_PATH || "/";
 export const LIVE_URL = encodeURI(`${LIVE_BASE_URL}${LIVE_BASE_PATH}`);
 // Web App Base Url
 export const WEB_BASE_URL = process.env.NEXT_PUBLIC_WEB_BASE_URL || "";
-export const WEB_BASE_PATH = process.env.NEXT_PUBLIC_WEB_BASE_PATH || "";
+export const WEB_BASE_PATH = process.env.NEXT_PUBLIC_WEB_BASE_PATH || "/";
 export const WEB_URL = encodeURI(`${WEB_BASE_URL}${WEB_BASE_PATH}`);
 // plane website url
-export const WEBSITE_URL = process.env.NEXT_PUBLIC_WEBSITE_URL || "https://plane.so";
+export const WEBSITE_URL =
+  process.env.NEXT_PUBLIC_WEBSITE_URL || "https://plane.so";
 // support email
-export const SUPPORT_EMAIL = process.env.NEXT_PUBLIC_SUPPORT_EMAIL || "support@plane.so";
+export const SUPPORT_EMAIL =
+  process.env.NEXT_PUBLIC_SUPPORT_EMAIL || "support@plane.so";
 // marketing links
 export const MARKETING_PRICING_PAGE_LINK = "https://plane.so/pricing";
 export const MARKETING_CONTACT_US_PAGE_LINK = "https://plane.so/contact";

packages/constants/src/inbox.ts

@@ -95,32 +95,3 @@ export const INBOX_ISSUE_SORT_BY_OPTIONS = [
     i18n_label: "common.sort.desc",
   },
 ];
-
-export enum EPastDurationFilters {
-  TODAY = "today",
-  YESTERDAY = "yesterday",
-  LAST_7_DAYS = "last_7_days",
-  LAST_30_DAYS = "last_30_days",
-}
-
-export const PAST_DURATION_FILTER_OPTIONS: {
-  name: string;
-  value: string;
-}[] = [
-  {
-    name: "Today",
-    value: EPastDurationFilters.TODAY,
-  },
-  {
-    name: "Yesterday",
-    value: EPastDurationFilters.YESTERDAY,
-  },
-  {
-    name: "Last 7 days",
-    value: EPastDurationFilters.LAST_7_DAYS,
-  },
-  {
-    name: "Last 30 days",
-    value: EPastDurationFilters.LAST_30_DAYS,
-  },
-];

packages/constants/src/index.ts

@@ -1,4 +1,5 @@
 export * from "./ai";
+export * from "./analytics";
 export * from "./auth";
 export * from "./chart";
 export * from "./endpoints";
@@ -21,7 +22,7 @@ export * from "./module";
 export * from "./project";
 export * from "./views";
 export * from "./themes";
-export * from "./intake";
+export * from "./inbox";
 export * from "./profile";
 export * from "./workspace-drafts";
 export * from "./label";
@@ -33,5 +34,4 @@ export * from "./emoji";
 export * from "./subscription";
 export * from "./settings";
 export * from "./icon";
-export * from "./estimates";
-export * from "./analytics";
+export * from "./analytics-v2";

packages/constants/src/issue/filter.ts

@@ -136,7 +136,45 @@ export const ISSUE_DISPLAY_FILTERS_BY_PAGE: TIssueFiltersToDisplayByPageType = {
       ],
       display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
       display_filters: {
-        group_by: ["state", "cycle", "module", "priority", "labels", "assignees", "created_by", null],
+        group_by: [
+          "state",
+          "cycle",
+          "module",
+          "state_detail.group",
+          "priority",
+          "labels",
+          "assignees",
+          "created_by",
+          null,
+        ],
+        order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "-priority"],
+        type: [null, "active", "backlog"],
+      },
+      extra_options: {
+        access: true,
+        values: ["show_empty_groups"],
+      },
+    },
+  },
+  draft_issues: {
+    list: {
+      filters: ["priority", "state_group", "cycle", "module", "labels", "start_date", "target_date", "issue_type"],
+      display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
+      display_filters: {
+        group_by: ["state_detail.group", "cycle", "module", "priority", "project", "labels", null],
+        order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "-priority"],
+        type: [null, "active", "backlog"],
+      },
+      extra_options: {
+        access: true,
+        values: ["show_empty_groups"],
+      },
+    },
+    kanban: {
+      filters: ["priority", "state_group", "cycle", "module", "labels", "start_date", "target_date", "issue_type"],
+      display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
+      display_filters: {
+        group_by: ["state_detail.group", "cycle", "module", "priority", "project", "labels"],
         order_by: ["sort_order", "-created_at", "-updated_at", "start_date", "-priority"],
         type: [null, "active", "backlog"],
       },

packages/constants/src/module.ts

@@ -1,16 +1,9 @@
 // types
-import { TModuleLayoutOptions, TModuleOrderByOptions, TModuleStatus } from "@plane/types";
-
-export const MODULE_STATUS_COLORS: {
-  [key in TModuleStatus]: string;
-} = {
-  backlog: "#a3a3a2",
-  planned: "#3f76ff",
-  paused: "#525252",
-  completed: "#16a34a",
-  cancelled: "#ef4444",
-  "in-progress": "#f39e1f",
-};
+import {
+  TModuleLayoutOptions,
+  TModuleOrderByOptions,
+  TModuleStatus,
+} from "@plane/types";
 
 export const MODULE_STATUS: {
   i18n_label: string;
@@ -22,42 +15,42 @@ export const MODULE_STATUS: {
   {
     i18n_label: "project_modules.status.backlog",
     value: "backlog",
-    color: MODULE_STATUS_COLORS.backlog,
+    color: "#a3a3a2",
     textColor: "text-custom-text-400",
     bgColor: "bg-custom-background-80",
   },
   {
     i18n_label: "project_modules.status.planned",
     value: "planned",
-    color: MODULE_STATUS_COLORS.planned,
+    color: "#3f76ff",
     textColor: "text-blue-500",
     bgColor: "bg-indigo-50",
   },
   {
     i18n_label: "project_modules.status.in_progress",
     value: "in-progress",
-    color: MODULE_STATUS_COLORS["in-progress"],
+    color: "#f39e1f",
     textColor: "text-amber-500",
     bgColor: "bg-amber-50",
   },
   {
     i18n_label: "project_modules.status.paused",
     value: "paused",
-    color: MODULE_STATUS_COLORS.paused,
+    color: "#525252",
     textColor: "text-custom-text-300",
     bgColor: "bg-custom-background-90",
   },
   {
     i18n_label: "project_modules.status.completed",
     value: "completed",
-    color: MODULE_STATUS_COLORS.completed,
+    color: "#16a34a",
     textColor: "text-green-600",
     bgColor: "bg-green-100",
   },
   {
     i18n_label: "project_modules.status.cancelled",
     value: "cancelled",
-    color: MODULE_STATUS_COLORS.cancelled,
+    color: "#ef4444",
     textColor: "text-red-500",
     bgColor: "bg-red-50",
   },

packages/constants/src/payment.ts

@@ -72,23 +72,23 @@ export const PLANE_COMMUNITY_PRODUCTS: Record<string, IPaymentProduct> = {
     prices: [
       {
         id: `price_yearly_${EProductSubscriptionEnum.BUSINESS}`,
-        unit_amount: 15600,
+        unit_amount: 0,
         recurring: "year",
         currency: "usd",
-        workspace_amount: 15600,
+        workspace_amount: 0,
         product: EProductSubscriptionEnum.BUSINESS,
       },
       {
         id: `price_monthly_${EProductSubscriptionEnum.BUSINESS}`,
-        unit_amount: 1500,
+        unit_amount: 0,
         recurring: "month",
         currency: "usd",
-        workspace_amount: 1500,
+        workspace_amount: 0,
         product: EProductSubscriptionEnum.BUSINESS,
       },
     ],
     payment_quantity: 1,
-    is_active: true,
+    is_active: false,
   },
   [EProductSubscriptionEnum.ENTERPRISE]: {
     id: EProductSubscriptionEnum.ENTERPRISE,
@@ -141,8 +141,8 @@ export const SUBSCRIPTION_REDIRECTION_URLS: Record<EProductSubscriptionEnum, Rec
     year: "https://app.plane.so/upgrade/pro/self-hosted?plan=year",
   },
   [EProductSubscriptionEnum.BUSINESS]: {
-    month: "https://app.plane.so/upgrade/business/self-hosted?plan=month",
-    year: "https://app.plane.so/upgrade/business/self-hosted?plan=year",
+    month: TALK_TO_SALES_URL,
+    year: TALK_TO_SALES_URL,
   },
   [EProductSubscriptionEnum.ENTERPRISE]: {
     month: TALK_TO_SALES_URL,

packages/constants/src/project.ts

@@ -149,12 +149,3 @@ export const DEFAULT_PROJECT_FORM_VALUES: Partial<IProject> = {
   network: 2,
   project_lead: null,
 };
-
-export enum EProjectFeatureKey {
-  WORK_ITEMS = "work_items",
-  CYCLES = "cycles",
-  MODULES = "modules",
-  VIEWS = "views",
-  PAGES = "pages",
-  INTAKE = "intake",
-}

packages/constants/src/state.ts

@@ -1,5 +1,4 @@
 "use client"
-
 export type TStateGroups = "backlog" | "unstarted" | "started" | "completed" | "cancelled";
 
 export type TDraggableData = {

packages/decorators/package.json

@@ -28,7 +28,7 @@
     "@types/reflect-metadata": "^0.1.0",
     "@types/ws": "^8.5.10",
     "tsup": "8.4.0",
-    "typescript": "5.8.3"
+    "typescript": "^5.3.3"
   },
   "peerDependencies": {
     "express": ">=4.21.2",

packages/editor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/editor",
-  "version": "0.26.1",
+  "version": "0.26.0",
   "description": "Core Editor that powers Plane",
   "license": "AGPL-3.0",
   "private": true,
@@ -82,7 +82,7 @@
     "@types/react-dom": "^18.2.18",
     "postcss": "^8.4.38",
     "tsup": "8.4.0",
-    "typescript": "5.8.3"
+    "typescript": "5.3.3"
   },
   "keywords": [
     "editor",

packages/editor/src/ce/extensions/core/extensions.ts

@@ -1,13 +1,13 @@
-import type { Extensions } from "@tiptap/core";
+import { Extensions } from "@tiptap/core";
 // types
-import type { IEditorProps } from "@/types";
+import { TExtensions, TFileHandler } from "@/types";
 
-export type TCoreAdditionalExtensionsProps = Pick<
-  IEditorProps,
-  "disabledExtensions" | "flaggedExtensions" | "fileHandler"
->;
+type Props = {
+  disabledExtensions: TExtensions[];
+  fileHandler: TFileHandler;
+};
 
-export const CoreEditorAdditionalExtensions = (props: TCoreAdditionalExtensionsProps): Extensions => {
+export const CoreEditorAdditionalExtensions = (props: Props): Extensions => {
   const {} = props;
   return [];
 };

packages/editor/src/ce/extensions/core/read-only-extensions.ts

@@ -1,15 +1,12 @@
-import type { Extensions } from "@tiptap/core";
+import { Extensions } from "@tiptap/core";
 // types
-import type { IReadOnlyEditorProps } from "@/types";
+import { TExtensions } from "@/types";
 
-export type TCoreReadOnlyEditorAdditionalExtensionsProps = Pick<
-  IReadOnlyEditorProps,
-  "disabledExtensions" | "flaggedExtensions"
->;
+type Props = {
+  disabledExtensions: TExtensions[];
+};
 
-export const CoreReadOnlyEditorAdditionalExtensions = (
-  props: TCoreReadOnlyEditorAdditionalExtensionsProps
-): Extensions => {
+export const CoreReadOnlyEditorAdditionalExtensions = (props: Props): Extensions => {
   const {} = props;
   return [];
 };

packages/editor/src/ce/extensions/document-extensions.tsx

@@ -1,39 +1,36 @@
-import type { HocuspocusProvider } from "@hocuspocus/provider";
-import type { AnyExtension } from "@tiptap/core";
+import { HocuspocusProvider } from "@hocuspocus/provider";
+import { AnyExtension } from "@tiptap/core";
 import { SlashCommands } from "@/extensions";
 // plane editor types
-import type { TEmbedConfig } from "@/plane-editor/types";
+import { TIssueEmbedConfig } from "@/plane-editor/types";
 // types
-import type { IEditorProps, TExtensions, TUserDetails } from "@/types";
+import { TExtensions, TUserDetails } from "@/types";
 
-export type TDocumentEditorAdditionalExtensionsProps = Pick<
-  IEditorProps,
-  "disabledExtensions" | "flaggedExtensions" | "fileHandler"
-> & {
-  embedConfig: TEmbedConfig | undefined;
-  provider?: HocuspocusProvider;
+type Props = {
+  disabledExtensions?: TExtensions[];
+  issueEmbedConfig: TIssueEmbedConfig | undefined;
+  provider: HocuspocusProvider;
   userDetails: TUserDetails;
 };
 
-export type TDocumentEditorAdditionalExtensionsRegistry = {
-  isEnabled: (disabledExtensions: TExtensions[], flaggedExtensions: TExtensions[]) => boolean;
-  getExtension: (props: TDocumentEditorAdditionalExtensionsProps) => AnyExtension;
+type ExtensionConfig = {
+  isEnabled: (disabledExtensions: TExtensions[]) => boolean;
+  getExtension: (props: Props) => AnyExtension;
 };
 
-const extensionRegistry: TDocumentEditorAdditionalExtensionsRegistry[] = [
+const extensionRegistry: ExtensionConfig[] = [
   {
     isEnabled: (disabledExtensions) => !disabledExtensions.includes("slash-commands"),
-    getExtension: ({ disabledExtensions, flaggedExtensions }) =>
-      SlashCommands({ disabledExtensions, flaggedExtensions }),
+    getExtension: () => SlashCommands({}),
   },
 ];
 
-export const DocumentEditorAdditionalExtensions = (props: TDocumentEditorAdditionalExtensionsProps) => {
-  const { disabledExtensions, flaggedExtensions } = props;
+export const DocumentEditorAdditionalExtensions = (_props: Props) => {
+  const { disabledExtensions = [] } = _props;
 
   const documentExtensions = extensionRegistry
-    .filter((config) => config.isEnabled(disabledExtensions, flaggedExtensions))
-    .map((config) => config.getExtension(props));
+    .filter((config) => config.isEnabled(disabledExtensions))
+    .map((config) => config.getExtension(_props));
 
   return documentExtensions;
 };

packages/editor/src/ce/extensions/rich-text/extensions.tsx

@@ -1,42 +0,0 @@
-import { AnyExtension, Extensions } from "@tiptap/core";
-// extensions
-import { SlashCommands } from "@/extensions/slash-commands/root";
-// types
-import { IEditorProps, TExtensions } from "@/types";
-
-export type TRichTextEditorAdditionalExtensionsProps = Pick<
-  IEditorProps,
-  "disabledExtensions" | "flaggedExtensions" | "fileHandler"
->;
-
-/**
- * Registry entry configuration for extensions
- */
-export type TRichTextEditorAdditionalExtensionsRegistry = {
-  /** Determines if the extension should be enabled based on disabled extensions */
-  isEnabled: (disabledExtensions: TExtensions[], flaggedExtensions: TExtensions[]) => boolean;
-  /** Returns the extension instance(s) when enabled */
-  getExtension: (props: TRichTextEditorAdditionalExtensionsProps) => AnyExtension | undefined;
-};
-
-const extensionRegistry: TRichTextEditorAdditionalExtensionsRegistry[] = [
-  {
-    isEnabled: (disabledExtensions) => !disabledExtensions.includes("slash-commands"),
-    getExtension: ({ disabledExtensions, flaggedExtensions }) =>
-      SlashCommands({
-        disabledExtensions,
-        flaggedExtensions,
-      }),
-  },
-];
-
-export const RichTextEditorAdditionalExtensions = (props: TRichTextEditorAdditionalExtensionsProps) => {
-  const { disabledExtensions, flaggedExtensions } = props;
-
-  const extensions: Extensions = extensionRegistry
-    .filter((config) => config.isEnabled(disabledExtensions, flaggedExtensions))
-    .map((config) => config.getExtension(props))
-    .filter((extension): extension is AnyExtension => extension !== undefined);
-
-  return extensions;
-};

packages/editor/src/ce/extensions/rich-text/read-only-extensions.tsx

@@ -1,31 +0,0 @@
-import { AnyExtension, Extensions } from "@tiptap/core";
-// types
-import { IReadOnlyEditorProps, TExtensions } from "@/types";
-
-export type TRichTextReadOnlyEditorAdditionalExtensionsProps = Pick<
-  IReadOnlyEditorProps,
-  "disabledExtensions" | "flaggedExtensions" | "fileHandler"
->;
-
-/**
- * Registry entry configuration for extensions
- */
-export type TRichTextReadOnlyEditorAdditionalExtensionsRegistry = {
-  /** Determines if the extension should be enabled based on disabled extensions */
-  isEnabled: (disabledExtensions: TExtensions[]) => boolean;
-  /** Returns the extension instance(s) when enabled */
-  getExtension: (props: TRichTextReadOnlyEditorAdditionalExtensionsProps) => AnyExtension | undefined;
-};
-
-const extensionRegistry: TRichTextReadOnlyEditorAdditionalExtensionsRegistry[] = [];
-
-export const RichTextReadOnlyEditorAdditionalExtensions = (props: TRichTextReadOnlyEditorAdditionalExtensionsProps) => {
-  const { disabledExtensions } = props;
-
-  const extensions: Extensions = extensionRegistry
-    .filter((config) => config.isEnabled(disabledExtensions))
-    .map((config) => config.getExtension(props))
-    .filter((extension): extension is AnyExtension => extension !== undefined);
-
-  return extensions;
-};

packages/editor/src/ce/extensions/slash-commands.tsx

@@ -1,9 +1,11 @@
 // extensions
-import type { TSlashCommandAdditionalOption } from "@/extensions";
+import { TSlashCommandAdditionalOption } from "@/extensions";
 // types
-import type { IEditorProps } from "@/types";
+import { TExtensions } from "@/types";
 
-type Props = Pick<IEditorProps, "disabledExtensions" | "flaggedExtensions">;
+type Props = {
+  disabledExtensions?: TExtensions[];
+};
 
 export const coreEditorAdditionalSlashCommandOptions = (props: Props): TSlashCommandAdditionalOption[] => {
   const {} = props;

packages/editor/src/core/components/editors/document/collaborative-editor.tsx

@@ -13,11 +13,10 @@ import { getEditorClassNames } from "@/helpers/common";
 // hooks
 import { useCollaborativeEditor } from "@/hooks/use-collaborative-editor";
 // types
-import { EditorRefApi, ICollaborativeDocumentEditorProps } from "@/types";
+import { EditorRefApi, ICollaborativeDocumentEditor } from "@/types";
 
-const CollaborativeDocumentEditor: React.FC<ICollaborativeDocumentEditorProps> = (props) => {
+const CollaborativeDocumentEditor = (props: ICollaborativeDocumentEditor) => {
   const {
-    onChange,
     onTransaction,
     aiHandler,
     bubbleMenuEnabled = true,
@@ -28,7 +27,6 @@ const CollaborativeDocumentEditor: React.FC<ICollaborativeDocumentEditorProps> =
     editorClassName = "",
     embedHandler,
     fileHandler,
-    flaggedExtensions,
     forwardedRef,
     handleEditorReady,
     id,
@@ -58,12 +56,10 @@ const CollaborativeDocumentEditor: React.FC<ICollaborativeDocumentEditorProps> =
     embedHandler,
     extensions,
     fileHandler,
-    flaggedExtensions,
     forwardedRef,
     handleEditorReady,
     id,
     mentionHandler,
-    onChange,
     onTransaction,
     placeholder,
     realtimeConfig,
@@ -99,7 +95,7 @@ const CollaborativeDocumentEditor: React.FC<ICollaborativeDocumentEditorProps> =
   );
 };
 
-const CollaborativeDocumentEditorWithRef = React.forwardRef<EditorRefApi, ICollaborativeDocumentEditorProps>(
+const CollaborativeDocumentEditorWithRef = React.forwardRef<EditorRefApi, ICollaborativeDocumentEditor>(
   (props, ref) => (
     <CollaborativeDocumentEditor {...props} forwardedRef={ref as React.MutableRefObject<EditorRefApi | null>} />
   )

packages/editor/src/core/components/editors/document/page-renderer.tsx

@@ -5,7 +5,7 @@ import { AIFeaturesMenu, BlockMenu, EditorBubbleMenu } from "@/components/menus"
 // types
 import { TAIHandler, TDisplayConfig } from "@/types";
 
-type Props = {
+type IPageRenderer = {
   aiHandler?: TAIHandler;
   bubbleMenuEnabled: boolean;
   displayConfig: TDisplayConfig;
@@ -15,7 +15,7 @@ type Props = {
   tabIndex?: number;
 };
 
-export const PageRenderer = (props: Props) => {
+export const PageRenderer = (props: IPageRenderer) => {
   const { aiHandler, bubbleMenuEnabled, displayConfig, editor, editorContainerClassName, id, tabIndex } = props;
 
   return (

packages/editor/src/core/components/editors/document/read-only-editor.tsx

@@ -1,5 +1,5 @@
 import { Extensions } from "@tiptap/core";
-import React, { forwardRef, MutableRefObject } from "react";
+import { forwardRef, MutableRefObject } from "react";
 // plane imports
 import { cn } from "@plane/utils";
 // components
@@ -13,9 +13,30 @@ import { getEditorClassNames } from "@/helpers/common";
 // hooks
 import { useReadOnlyEditor } from "@/hooks/use-read-only-editor";
 // types
-import { EditorReadOnlyRefApi, IDocumentReadOnlyEditorProps } from "@/types";
+import {
+  EditorReadOnlyRefApi,
+  TDisplayConfig,
+  TExtensions,
+  TReadOnlyFileHandler,
+  TReadOnlyMentionHandler,
+} from "@/types";
 
-const DocumentReadOnlyEditor: React.FC<IDocumentReadOnlyEditorProps> = (props) => {
+interface IDocumentReadOnlyEditor {
+  disabledExtensions: TExtensions[];
+  id: string;
+  initialValue: string;
+  containerClassName: string;
+  displayConfig?: TDisplayConfig;
+  editorClassName?: string;
+  embedHandler: any;
+  fileHandler: TReadOnlyFileHandler;
+  tabIndex?: number;
+  handleEditorReady?: (value: boolean) => void;
+  mentionHandler: TReadOnlyMentionHandler;
+  forwardedRef?: React.MutableRefObject<EditorReadOnlyRefApi | null>;
+}
+
+const DocumentReadOnlyEditor = (props: IDocumentReadOnlyEditor) => {
   const {
     containerClassName,
     disabledExtensions,
@@ -23,7 +44,6 @@ const DocumentReadOnlyEditor: React.FC<IDocumentReadOnlyEditorProps> = (props) =
     editorClassName = "",
     embedHandler,
     fileHandler,
-    flaggedExtensions,
     id,
     forwardedRef,
     handleEditorReady,
@@ -44,7 +64,6 @@ const DocumentReadOnlyEditor: React.FC<IDocumentReadOnlyEditorProps> = (props) =
     editorClassName,
     extensions,
     fileHandler,
-    flaggedExtensions,
     forwardedRef,
     handleEditorReady,
     initialValue,
@@ -68,7 +87,7 @@ const DocumentReadOnlyEditor: React.FC<IDocumentReadOnlyEditorProps> = (props) =
   );
 };
 
-const DocumentReadOnlyEditorWithRef = forwardRef<EditorReadOnlyRefApi, IDocumentReadOnlyEditorProps>((props, ref) => (
+const DocumentReadOnlyEditorWithRef = forwardRef<EditorReadOnlyRefApi, IDocumentReadOnlyEditor>((props, ref) => (
   <DocumentReadOnlyEditor {...props} forwardedRef={ref as MutableRefObject<EditorReadOnlyRefApi | null>} />
 ));
 

packages/editor/src/core/components/editors/editor-container.tsx

@@ -53,14 +53,17 @@ export const EditorContainer: FC<EditorContainerProps> = (props) => {
       const lastNodePos = editor.state.doc.resolve(Math.max(0, docSize - 2));
       const lastNode = lastNodePos.node();
 
-      // Check if its last node and add new node
-      if (lastNode) {
-        const isLastNodeEmptyParagraph = lastNode.type.name === CORE_EXTENSIONS.PARAGRAPH && lastNode.content.size === 0;
-        // Only insert a new paragraph if the last node is not an empty paragraph and not a doc node
-        if (!isLastNodeEmptyParagraph && lastNode.type.name !== "doc") {
-          const endPosition = editor?.state.doc.content.size;
-          editor?.chain().insertContentAt(endPosition, { type: "paragraph" }).focus("end").run();
-        }
+      // Check if the last node is a  not paragraph
+      if (lastNode && lastNode.type.name !== CORE_EXTENSIONS.PARAGRAPH) {
+        // If last node is not a paragraph, insert a new paragraph at the end
+        const endPosition = editor?.state.doc.content.size;
+        editor?.chain().insertContentAt(endPosition, { type: CORE_EXTENSIONS.PARAGRAPH }).run();
+
+        // Focus the newly added paragraph for immediate editing
+        editor
+          .chain()
+          .setTextSelection(endPosition + 1)
+          .run();
       }
     } catch (error) {
       console.error("An error occurred while handling container click to insert new empty node at bottom:", error);

packages/editor/src/core/components/editors/editor-wrapper.tsx

@@ -26,7 +26,6 @@ export const EditorWrapper: React.FC<Props> = (props) => {
     id,
     initialValue,
     fileHandler,
-    flaggedExtensions,
     forwardedRef,
     mentionHandler,
     onChange,
@@ -45,7 +44,6 @@ export const EditorWrapper: React.FC<Props> = (props) => {
     enableHistory: true,
     extensions,
     fileHandler,
-    flaggedExtensions,
     forwardedRef,
     id,
     initialValue,

packages/editor/src/core/components/editors/lite-text/editor.tsx

@@ -4,25 +4,23 @@ import { EditorWrapper } from "@/components/editors/editor-wrapper";
 // extensions
 import { EnterKeyExtension } from "@/extensions";
 // types
-import { EditorRefApi, ILiteTextEditorProps } from "@/types";
+import { EditorRefApi, ILiteTextEditor } from "@/types";
 
-const LiteTextEditor: React.FC<ILiteTextEditorProps> = (props) => {
+const LiteTextEditor = (props: ILiteTextEditor) => {
   const { onEnterKeyPress, disabledExtensions, extensions: externalExtensions = [] } = props;
 
-  const extensions = useMemo(() => {
-    const resolvedExtensions = [...externalExtensions];
-
-    if (!disabledExtensions?.includes("enter-key")) {
-      resolvedExtensions.push(EnterKeyExtension(onEnterKeyPress));
-    }
-
-    return resolvedExtensions;
-  }, [externalExtensions, disabledExtensions, onEnterKeyPress]);
+  const extensions = useMemo(
+    () => [
+      ...externalExtensions,
+      ...(disabledExtensions?.includes("enter-key") ? [] : [EnterKeyExtension(onEnterKeyPress)]),
+    ],
+    [externalExtensions, disabledExtensions, onEnterKeyPress]
+  );
 
   return <EditorWrapper {...props} extensions={extensions} />;
 };
 
-const LiteTextEditorWithRef = forwardRef<EditorRefApi, ILiteTextEditorProps>((props, ref) => (
+const LiteTextEditorWithRef = forwardRef<EditorRefApi, ILiteTextEditor>((props, ref) => (
   <LiteTextEditor {...props} forwardedRef={ref as React.MutableRefObject<EditorRefApi | null>} />
 ));
 

packages/editor/src/core/components/editors/lite-text/read-only-editor.tsx

@@ -2,9 +2,9 @@ import { forwardRef } from "react";
 // components
 import { ReadOnlyEditorWrapper } from "@/components/editors";
 // types
-import { EditorReadOnlyRefApi, ILiteTextReadOnlyEditorProps } from "@/types";
+import { EditorReadOnlyRefApi, ILiteTextReadOnlyEditor } from "@/types";
 
-const LiteTextReadOnlyEditorWithRef = forwardRef<EditorReadOnlyRefApi, ILiteTextReadOnlyEditorProps>((props, ref) => (
+const LiteTextReadOnlyEditorWithRef = forwardRef<EditorReadOnlyRefApi, ILiteTextReadOnlyEditor>((props, ref) => (
   <ReadOnlyEditorWrapper {...props} forwardedRef={ref as React.MutableRefObject<EditorReadOnlyRefApi | null>} />
 ));
 

packages/editor/src/core/components/editors/read-only-editor-wrapper.tsx

@@ -15,9 +15,7 @@ export const ReadOnlyEditorWrapper = (props: IReadOnlyEditorProps) => {
     disabledExtensions,
     displayConfig = DEFAULT_DISPLAY_CONFIG,
     editorClassName = "",
-    extensions,
     fileHandler,
-    flaggedExtensions,
     forwardedRef,
     id,
     initialValue,
@@ -27,9 +25,7 @@ export const ReadOnlyEditorWrapper = (props: IReadOnlyEditorProps) => {
   const editor = useReadOnlyEditor({
     disabledExtensions,
     editorClassName,
-    extensions,
     fileHandler,
-    flaggedExtensions,
     forwardedRef,
     initialValue,
     mentionHandler,

packages/editor/src/core/components/editors/rich-text/editor.tsx

@@ -3,21 +3,12 @@ import { forwardRef, useCallback } from "react";
 import { EditorWrapper } from "@/components/editors";
 import { EditorBubbleMenu } from "@/components/menus";
 // extensions
-import { SideMenuExtension } from "@/extensions";
-// plane editor imports
-import { RichTextEditorAdditionalExtensions } from "@/plane-editor/extensions/rich-text/extensions";
+import { SideMenuExtension, SlashCommands } from "@/extensions";
 // types
-import { EditorRefApi, IRichTextEditorProps } from "@/types";
+import { EditorRefApi, IRichTextEditor } from "@/types";
 
-const RichTextEditor: React.FC<IRichTextEditorProps> = (props) => {
-  const {
-    bubbleMenuEnabled = true,
-    disabledExtensions,
-    dragDropEnabled,
-    extensions: externalExtensions = [],
-    fileHandler,
-    flaggedExtensions,
-  } = props;
+const RichTextEditor = (props: IRichTextEditor) => {
+  const { disabledExtensions, dragDropEnabled, bubbleMenuEnabled = true, extensions: externalExtensions = [] } = props;
 
   const getExtensions = useCallback(() => {
     const extensions = [
@@ -26,15 +17,17 @@ const RichTextEditor: React.FC<IRichTextEditorProps> = (props) => {
         aiEnabled: false,
         dragDropEnabled: !!dragDropEnabled,
       }),
-      ...RichTextEditorAdditionalExtensions({
-        disabledExtensions,
-        fileHandler,
-        flaggedExtensions,
-      }),
     ];
+    if (!disabledExtensions?.includes("slash-commands")) {
+      extensions.push(
+        SlashCommands({
+          disabledExtensions,
+        })
+      );
+    }
 
     return extensions;
-  }, [dragDropEnabled, disabledExtensions, externalExtensions, fileHandler, flaggedExtensions]);
+  }, [dragDropEnabled, disabledExtensions, externalExtensions]);
 
   return (
     <EditorWrapper {...props} extensions={getExtensions()}>
@@ -43,7 +36,7 @@ const RichTextEditor: React.FC<IRichTextEditorProps> = (props) => {
   );
 };
 
-const RichTextEditorWithRef = forwardRef<EditorRefApi, IRichTextEditorProps>((props, ref) => (
+const RichTextEditorWithRef = forwardRef<EditorRefApi, IRichTextEditor>((props, ref) => (
   <RichTextEditor {...props} forwardedRef={ref as React.MutableRefObject<EditorRefApi | null>} />
 ));
 

packages/editor/src/core/components/editors/rich-text/read-only-editor.tsx

@@ -1,32 +1,11 @@
-import { forwardRef, useCallback } from "react";
-// plane editor extensions
-import { RichTextReadOnlyEditorAdditionalExtensions } from "@/plane-editor/extensions/rich-text/read-only-extensions";
+import { forwardRef } from "react";
 // types
-import { EditorReadOnlyRefApi, IRichTextReadOnlyEditorProps } from "@/types";
-// local imports
+import { EditorReadOnlyRefApi, IRichTextReadOnlyEditor } from "@/types";
 import { ReadOnlyEditorWrapper } from "../read-only-editor-wrapper";
 
-const RichTextReadOnlyEditorWithRef = forwardRef<EditorReadOnlyRefApi, IRichTextReadOnlyEditorProps>((props, ref) => {
-  const { disabledExtensions, fileHandler, flaggedExtensions } = props;
-
-  const getExtensions = useCallback(() => {
-    const extensions = RichTextReadOnlyEditorAdditionalExtensions({
-      disabledExtensions,
-      fileHandler,
-      flaggedExtensions,
-    });
-
-    return extensions;
-  }, [disabledExtensions, fileHandler, flaggedExtensions]);
-
-  return (
-    <ReadOnlyEditorWrapper
-      {...props}
-      extensions={getExtensions()}
-      forwardedRef={ref as React.MutableRefObject<EditorReadOnlyRefApi | null>}
-    />
-  );
-});
+const RichTextReadOnlyEditorWithRef = forwardRef<EditorReadOnlyRefApi, IRichTextReadOnlyEditor>((props, ref) => (
+  <ReadOnlyEditorWrapper {...props} forwardedRef={ref as React.MutableRefObject<EditorReadOnlyRefApi | null>} />
+));
 
 RichTextReadOnlyEditorWithRef.displayName = "RichReadOnlyEditorWithRef";
 

packages/editor/src/core/extensions/extensions.ts

@@ -37,27 +37,20 @@ import { getExtensionStorage } from "@/helpers/get-extension-storage";
 // plane editor extensions
 import { CoreEditorAdditionalExtensions } from "@/plane-editor/extensions";
 // types
-import type { IEditorProps } from "@/types";
+import { TExtensions, TFileHandler, TMentionHandler } from "@/types";
 
-type TArguments = Pick<
-  IEditorProps,
-  "disabledExtensions" | "flaggedExtensions" | "fileHandler" | "mentionHandler" | "placeholder" | "tabIndex"
-> & {
+type TArguments = {
+  disabledExtensions: TExtensions[];
   enableHistory: boolean;
+  fileHandler: TFileHandler;
+  mentionHandler: TMentionHandler;
+  placeholder?: string | ((isFocused: boolean, value: string) => string);
+  tabIndex?: number;
   editable: boolean;
 };
 
 export const CoreEditorExtensions = (args: TArguments): Extensions => {
-  const {
-    disabledExtensions,
-    enableHistory,
-    fileHandler,
-    flaggedExtensions,
-    mentionHandler,
-    placeholder,
-    tabIndex,
-    editable,
-  } = args;
+  const { disabledExtensions, enableHistory, fileHandler, mentionHandler, placeholder, tabIndex, editable } = args;
 
   const extensions = [
     StarterKit.configure({
@@ -177,14 +170,12 @@ export const CoreEditorExtensions = (args: TArguments): Extensions => {
     CustomTextAlignExtension,
     CustomCalloutExtension,
     UtilityExtension({
-      disabledExtensions,
-      fileHandler,
       isEditable: editable,
+      fileHandler,
     }),
     CustomColorExtension,
     ...CoreEditorAdditionalExtensions({
       disabledExtensions,
-      flaggedExtensions,
       fileHandler,
     }),
   ];

packages/editor/src/core/extensions/read-only-extensions.ts

@@ -31,12 +31,16 @@ import { isValidHttpUrl } from "@/helpers/common";
 // plane editor extensions
 import { CoreReadOnlyEditorAdditionalExtensions } from "@/plane-editor/extensions";
 // types
-import type { IReadOnlyEditorProps } from "@/types";
+import { TExtensions, TReadOnlyFileHandler, TReadOnlyMentionHandler } from "@/types";
 
-type Props = Pick<IReadOnlyEditorProps, "disabledExtensions" | "flaggedExtensions" | "fileHandler" | "mentionHandler">;
+type Props = {
+  disabledExtensions: TExtensions[];
+  fileHandler: TReadOnlyFileHandler;
+  mentionHandler: TReadOnlyMentionHandler;
+};
 
 export const CoreReadOnlyEditorExtensions = (props: Props): Extensions => {
-  const { disabledExtensions, fileHandler, flaggedExtensions, mentionHandler } = props;
+  const { disabledExtensions, fileHandler, mentionHandler } = props;
 
   const extensions = [
     StarterKit.configure({
@@ -123,13 +127,11 @@ export const CoreReadOnlyEditorExtensions = (props: Props): Extensions => {
     CustomTextAlignExtension,
     CustomCalloutReadOnlyExtension,
     UtilityExtension({
-      disabledExtensions,
-      fileHandler,
       isEditable: false,
+      fileHandler,
     }),
     ...CoreReadOnlyEditorAdditionalExtensions({
       disabledExtensions,
-      flaggedExtensions,
     }),
   ];
 

packages/editor/src/core/extensions/slash-commands/command-items-list.tsx

@@ -49,7 +49,7 @@ export type TSlashCommandSection = {
 export const getSlashCommandFilteredSections =
   (args: TExtensionProps) =>
   ({ query }: { query: string }): TSlashCommandSection[] => {
-    const { additionalOptions: externalAdditionalOptions, disabledExtensions, flaggedExtensions } = args;
+    const { additionalOptions: externalAdditionalOptions, disabledExtensions } = args;
     const SLASH_COMMAND_SECTIONS: TSlashCommandSection[] = [
       {
         key: "general",
@@ -290,7 +290,6 @@ export const getSlashCommandFilteredSections =
       ...(externalAdditionalOptions ?? []),
       ...coreEditorAdditionalSlashCommandOptions({
         disabledExtensions,
-        flaggedExtensions,
       }),
     ]?.forEach((item) => {
       const sectionToPushTo = SLASH_COMMAND_SECTIONS.find((s) => s.key === item.section) ?? SLASH_COMMAND_SECTIONS[0];

packages/editor/src/core/extensions/slash-commands/root.tsx

@@ -7,7 +7,7 @@ import { CORE_EXTENSIONS } from "@/constants/extension";
 // helpers
 import { CommandListInstance } from "@/helpers/tippy";
 // types
-import { IEditorProps, ISlashCommandItem, TEditorCommands, TSlashCommandSectionKeys } from "@/types";
+import { ISlashCommandItem, TEditorCommands, TExtensions, TSlashCommandSectionKeys } from "@/types";
 // components
 import { getSlashCommandFilteredSections } from "./command-items-list";
 import { SlashCommandsMenu, SlashCommandsMenuProps } from "./command-menu";
@@ -106,8 +106,9 @@ const renderItems = () => {
   };
 };
 
-export type TExtensionProps = Pick<IEditorProps, "disabledExtensions" | "flaggedExtensions"> & {
+export type TExtensionProps = {
   additionalOptions?: TSlashCommandAdditionalOption[];
+  disabledExtensions?: TExtensions[];
 };
 
 export const SlashCommands = (props: TExtensionProps) =>

packages/editor/src/core/extensions/utility.ts

@@ -8,7 +8,7 @@ import { DropHandlerPlugin } from "@/plugins/drop";
 import { FilePlugins } from "@/plugins/file/root";
 import { MarkdownClipboardPlugin } from "@/plugins/markdown-clipboard";
 // types
-import type { IEditorProps, TFileHandler, TReadOnlyFileHandler } from "@/types";
+import { TFileHandler, TReadOnlyFileHandler } from "@/types";
 
 declare module "@tiptap/core" {
   interface Commands {
@@ -23,14 +23,14 @@ export interface UtilityExtensionStorage {
   uploadInProgress: boolean;
 }
 
-type Props = Pick<IEditorProps, "disabledExtensions"> & {
+type Props = {
   fileHandler: TFileHandler | TReadOnlyFileHandler;
   isEditable: boolean;
 };
 
 export const UtilityExtension = (props: Props) => {
-  const { disabledExtensions, fileHandler, isEditable } = props;
-  const { restore } = fileHandler;
+  const { fileHandler, isEditable } = props;
+  const { restore: restoreImageFn } = fileHandler;
 
   return Extension.create<Record<string, unknown>, UtilityExtensionStorage>({
     name: "utility",
@@ -45,15 +45,12 @@ export const UtilityExtension = (props: Props) => {
         }),
         ...codemark({ markType: this.editor.schema.marks.code }),
         MarkdownClipboardPlugin(this.editor),
-        DropHandlerPlugin({
-          disabledExtensions,
-          editor: this.editor,
-        }),
+        DropHandlerPlugin(this.editor),
       ];
     },
 
     onCreate() {
-      restorePublicImages(this.editor, restore);
+      restorePublicImages(this.editor, restoreImageFn);
     },
 
     addStorage() {

packages/editor/src/core/helpers/parser.ts

@@ -1,89 +0,0 @@
-// plane imports
-import { TDocumentPayload, TDuplicateAssetData, TDuplicateAssetResponse } from "@plane/types";
-import { TEditorAssetType } from "@plane/types/src/enums";
-// local imports
-import { convertHTMLDocumentToAllFormats } from "./yjs-utils";
-
-/**
- * @description function to extract all image assets from HTML content
- * @param htmlContent
- * @returns {string[]} array of image asset sources
- */
-export const extractImageAssetsFromHTMLContent = (htmlContent: string): string[] => {
-  // create a DOM parser
-  const parser = new DOMParser();
-  // parse the HTML string into a DOM document
-  const doc = parser.parseFromString(htmlContent, "text/html");
-  // get all image components
-  const imageComponents = doc.querySelectorAll("image-component");
-  // collect all unique image sources
-  const imageSources = new Set<string>();
-  // extract sources from image components
-  imageComponents.forEach((component) => {
-    const src = component.getAttribute("src");
-    if (src) imageSources.add(src);
-  });
-  return Array.from(imageSources);
-};
-
-/**
- * @description function to replace image assets in HTML content with new IDs
- * @param props
- * @returns {string} HTML content with replaced image assets
- */
-export const replaceImageAssetsInHTMLContent = (props: {
-  htmlContent: string;
-  assetMap: Record<string, string>;
-}): string => {
-  const { htmlContent, assetMap } = props;
-  // create a DOM parser
-  const parser = new DOMParser();
-  // parse the HTML string into a DOM document
-  const doc = parser.parseFromString(htmlContent, "text/html");
-  // replace sources in image components
-  const imageComponents = doc.querySelectorAll("image-component");
-  imageComponents.forEach((component) => {
-    const oldSrc = component.getAttribute("src");
-    if (oldSrc && assetMap[oldSrc]) {
-      component.setAttribute("src", assetMap[oldSrc]);
-    }
-  });
-  // serialize the document back into a string
-  return doc.body.innerHTML;
-};
-
-export const getEditorContentWithReplacedImageAssets = async (props: {
-  descriptionHTML: string;
-  entityId: string;
-  entityType: TEditorAssetType;
-  projectId: string | undefined;
-  variant: "rich" | "document";
-  duplicateAssetService: (params: TDuplicateAssetData) => Promise<TDuplicateAssetResponse>;
-}): Promise<TDocumentPayload> => {
-  const { descriptionHTML, entityId, entityType, projectId, variant, duplicateAssetService } = props;
-  let replacedDescription = descriptionHTML;
-  // step 1: extract image assets from the description
-  const imageAssets = extractImageAssetsFromHTMLContent(descriptionHTML);
-  if (imageAssets.length !== 0) {
-    // step 2: duplicate the image assets
-    const duplicateAssetsResponse = await duplicateAssetService({
-      entity_id: entityId,
-      entity_type: entityType,
-      project_id: projectId,
-      asset_ids: imageAssets,
-    });
-    if (Object.keys(duplicateAssetsResponse ?? {}).length > 0) {
-      // step 3: replace the image assets in the description
-      replacedDescription = replaceImageAssetsInHTMLContent({
-        htmlContent: descriptionHTML,
-        assetMap: duplicateAssetsResponse,
-      });
-    }
-  }
-  // step 4: convert the description to the document payload
-  const documentPayload = convertHTMLDocumentToAllFormats({
-    document_html: replacedDescription,
-    variant,
-  });
-  return documentPayload;
-};

packages/editor/src/core/helpers/yjs-utils.ts

@@ -3,7 +3,6 @@ import { generateHTML, generateJSON } from "@tiptap/html";
 import { prosemirrorJSONToYDoc, yXmlFragmentToProseMirrorRootNode } from "y-prosemirror";
 import * as Y from "yjs";
 // extensions
-import { TDocumentPayload } from "@plane/types";
 import {
   CoreEditorExtensionsWithoutProps,
   DocumentEditorExtensionsWithoutProps,
@@ -141,50 +140,3 @@ export const getAllDocumentFormatsFromDocumentEditorBinaryData = (
     contentHTML,
   };
 };
-
-type TConvertHTMLDocumentToAllFormatsArgs = {
-  document_html: string;
-  variant: "rich" | "document";
-};
-
-/**
- * @description Converts HTML content to all supported document formats (JSON, HTML, and binary)
- * @param {TConvertHTMLDocumentToAllFormatsArgs} args - Arguments containing HTML content and variant type
- * @param {string} args.document_html - The HTML content to convert
- * @param {"rich" | "document"} args.variant - The type of editor variant to use for conversion
- * @returns {TDocumentPayload} Object containing the document in all supported formats
- * @throws {Error} If an invalid variant is provided
- */
-export const convertHTMLDocumentToAllFormats = (args: TConvertHTMLDocumentToAllFormatsArgs): TDocumentPayload => {
-  const { document_html, variant } = args;
-
-  let allFormats: TDocumentPayload;
-
-  if (variant === "rich") {
-    // Convert HTML to binary format for rich text editor
-    const contentBinary = getBinaryDataFromRichTextEditorHTMLString(document_html);
-    // Generate all document formats from the binary data
-    const { contentBinaryEncoded, contentHTML, contentJSON } =
-      getAllDocumentFormatsFromRichTextEditorBinaryData(contentBinary);
-    allFormats = {
-      description: contentJSON,
-      description_html: contentHTML,
-      description_binary: contentBinaryEncoded,
-    };
-  } else if (variant === "document") {
-    // Convert HTML to binary format for document editor
-    const contentBinary = getBinaryDataFromDocumentEditorHTMLString(document_html);
-    // Generate all document formats from the binary data
-    const { contentBinaryEncoded, contentHTML, contentJSON } =
-      getAllDocumentFormatsFromDocumentEditorBinaryData(contentBinary);
-    allFormats = {
-      description: contentJSON,
-      description_html: contentHTML,
-      description_binary: contentBinaryEncoded,
-    };
-  } else {
-    throw new Error(`Invalid variant provided: ${variant}`);
-  }
-
-  return allFormats;
-};

packages/editor/src/core/hooks/use-collaborative-editor.ts

@@ -9,20 +9,18 @@ import { useEditor } from "@/hooks/use-editor";
 // plane editor extensions
 import { DocumentEditorAdditionalExtensions } from "@/plane-editor/extensions";
 // types
-import { TCollaborativeEditorHookProps } from "@/types";
+import { TCollaborativeEditorProps } from "@/types";
 
-export const useCollaborativeEditor = (props: TCollaborativeEditorHookProps) => {
+export const useCollaborativeEditor = (props: TCollaborativeEditorProps) => {
   const {
-    onChange,
     onTransaction,
     disabledExtensions,
     editable,
-    editorClassName = "",
+    editorClassName,
     editorProps = {},
     embedHandler,
-    extensions = [],
+    extensions,
     fileHandler,
-    flaggedExtensions,
     forwardedRef,
     handleEditorReady,
     id,
@@ -91,22 +89,18 @@ export const useCollaborativeEditor = (props: TCollaborativeEditorHookProps) =>
       Collaboration.configure({
         document: provider.document,
       }),
-      ...extensions,
+      ...(extensions ?? []),
       ...DocumentEditorAdditionalExtensions({
         disabledExtensions,
-        embedConfig: embedHandler,
-        fileHandler,
-        flaggedExtensions,
+        issueEmbedConfig: embedHandler?.issue,
         provider,
         userDetails: user,
       }),
     ],
     fileHandler,
-    flaggedExtensions,
     forwardedRef,
     handleEditorReady,
     mentionHandler,
-    onChange,
     onTransaction,
     placeholder,
     provider,

packages/editor/src/core/hooks/use-editor.ts

@@ -1,12 +1,13 @@
+import { HocuspocusProvider } from "@hocuspocus/provider";
 import { DOMSerializer } from "@tiptap/pm/model";
-import { useEditor as useTiptapEditor } from "@tiptap/react";
-import { useImperativeHandle, useEffect } from "react";
+import { EditorProps } from "@tiptap/pm/view";
+import { useEditor as useTiptapEditor, Extensions } from "@tiptap/react";
+import { useImperativeHandle, MutableRefObject, useEffect } from "react";
 import * as Y from "yjs";
 // components
 import { getEditorMenuItems } from "@/components/menus";
 // constants
 import { CORE_EXTENSIONS } from "@/constants/extension";
-import { CORE_EDITOR_META } from "@/constants/meta";
 // extensions
 import { CoreEditorExtensions } from "@/extensions";
 // helpers
@@ -17,19 +18,49 @@ import { IMarking, scrollSummary, scrollToNodeViaDOMCoordinates } from "@/helper
 // props
 import { CoreEditorProps } from "@/props";
 // types
-import type { TDocumentEventsServer, TEditorCommands, TEditorHookProps } from "@/types";
+import type {
+  TDocumentEventsServer,
+  EditorRefApi,
+  TEditorCommands,
+  TFileHandler,
+  TExtensions,
+  TMentionHandler,
+} from "@/types";
+import { CORE_EDITOR_META } from "@/constants/meta";
 
-export const useEditor = (props: TEditorHookProps) => {
+export interface CustomEditorProps {
+  editable: boolean;
+  editorClassName: string;
+  editorProps?: EditorProps;
+  enableHistory: boolean;
+  disabledExtensions: TExtensions[];
+  extensions?: Extensions;
+  fileHandler: TFileHandler;
+  forwardedRef?: MutableRefObject<EditorRefApi | null>;
+  handleEditorReady?: (value: boolean) => void;
+  id?: string;
+  initialValue?: string;
+  mentionHandler: TMentionHandler;
+  onChange?: (json: object, html: string) => void;
+  onTransaction?: () => void;
+  autofocus?: boolean;
+  placeholder?: string | ((isFocused: boolean, value: string) => string);
+  provider?: HocuspocusProvider;
+  tabIndex?: number;
+  // undefined when prop is not passed, null if intentionally passed to stop
+  // swr syncing
+  value?: string | null | undefined;
+}
+
+export const useEditor = (props: CustomEditorProps) => {
   const {
-    autofocus = false,
     disabledExtensions,
     editable = true,
-    editorClassName = "",
+    editorClassName,
     editorProps = {},
     enableHistory,
     extensions = [],
     fileHandler,
-    flaggedExtensions,
     forwardedRef,
     handleEditorReady,
     id = "",
@@ -38,9 +69,10 @@ export const useEditor = (props: TEditorHookProps) => {
     onChange,
     onTransaction,
     placeholder,
-    provider,
     tabIndex,
     value,
+    provider,
+    autofocus = false,
   } = props;
 
   const editor = useTiptapEditor(
@@ -62,7 +94,6 @@ export const useEditor = (props: TEditorHookProps) => {
           disabledExtensions,
           enableHistory,
           fileHandler,
-          flaggedExtensions,
           mentionHandler,
           placeholder,
           tabIndex,

packages/editor/src/core/hooks/use-read-only-editor.ts

@@ -1,8 +1,8 @@
-import { useEditor as useTiptapEditor } from "@tiptap/react";
-import { useImperativeHandle, useEffect } from "react";
+import { HocuspocusProvider } from "@hocuspocus/provider";
+import { EditorProps } from "@tiptap/pm/view";
+import { useEditor as useTiptapEditor, Extensions } from "@tiptap/react";
+import { useImperativeHandle, MutableRefObject, useEffect } from "react";
 import * as Y from "yjs";
-// constants
-import { CORE_EDITOR_META } from "@/constants/meta";
 // extensions
 import { CoreReadOnlyEditorExtensions } from "@/extensions";
 // helpers
@@ -11,19 +11,32 @@ import { IMarking, scrollSummary } from "@/helpers/scroll-to-node";
 // props
 import { CoreReadOnlyEditorProps } from "@/props";
 // types
-import type { TReadOnlyEditorHookProps } from "@/types";
+import type { EditorReadOnlyRefApi, TExtensions, TReadOnlyFileHandler, TReadOnlyMentionHandler } from "@/types";
+import { CORE_EDITOR_META } from "@/constants/meta";
 
-export const useReadOnlyEditor = (props: TReadOnlyEditorHookProps) => {
+interface CustomReadOnlyEditorProps {
+  disabledExtensions: TExtensions[];
+  editorClassName: string;
+  editorProps?: EditorProps;
+  extensions?: Extensions;
+  forwardedRef?: MutableRefObject<EditorReadOnlyRefApi | null>;
+  initialValue?: string;
+  fileHandler: TReadOnlyFileHandler;
+  handleEditorReady?: (value: boolean) => void;
+  mentionHandler: TReadOnlyMentionHandler;
+  provider?: HocuspocusProvider;
+}
+
+export const useReadOnlyEditor = (props: CustomReadOnlyEditorProps) => {
   const {
     disabledExtensions,
-    editorClassName = "",
-    editorProps = {},
-    extensions = [],
-    fileHandler,
-    flaggedExtensions,
-    forwardedRef,
-    handleEditorReady,
     initialValue,
+    editorClassName,
+    forwardedRef,
+    extensions = [],
+    editorProps = {},
+    fileHandler,
+    handleEditorReady,
     mentionHandler,
     provider,
   } = props;
@@ -46,9 +59,8 @@ export const useReadOnlyEditor = (props: TReadOnlyEditorHookProps) => {
     extensions: [
       ...CoreReadOnlyEditorExtensions({
         disabledExtensions,
-        fileHandler,
-        flaggedExtensions,
         mentionHandler,
+        fileHandler,
       }),
       ...extensions,
     ],

packages/editor/src/core/plugins/drag-handle.ts

@@ -1,6 +1,7 @@
 import { Fragment, Slice, Node, Schema } from "@tiptap/pm/model";
 import { NodeSelection } from "@tiptap/pm/state";
-import { EditorView } from "@tiptap/pm/view";
+// @ts-expect-error __serializeForClipboard's is not exported
+import { __serializeForClipboard, EditorView } from "@tiptap/pm/view";
 // constants
 import { CORE_EXTENSIONS } from "@/constants/extension";
 // extensions
@@ -416,7 +417,7 @@ const handleNodeSelection = (
     }
 
     const slice = view.state.selection.content();
-    const { dom, text } = view.serializeForClipboard(slice);
+    const { dom, text } = __serializeForClipboard(view, slice);
 
     if (event instanceof DragEvent && event.dataTransfer) {
       event.dataTransfer.clearData();

packages/editor/src/core/plugins/drop.ts

@@ -3,17 +3,10 @@ import { Plugin, PluginKey } from "@tiptap/pm/state";
 // constants
 import { ACCEPTED_ATTACHMENT_MIME_TYPES, ACCEPTED_IMAGE_MIME_TYPES } from "@/constants/config";
 // types
-import { TEditorCommands, TExtensions } from "@/types";
+import { TEditorCommands } from "@/types";
 
-type Props = {
-  disabledExtensions?: TExtensions[];
-  editor: Editor;
-};
-
-export const DropHandlerPlugin = (props: Props): Plugin => {
-  const { disabledExtensions, editor } = props;
-
-  return new Plugin({
+export const DropHandlerPlugin = (editor: Editor): Plugin =>
+  new Plugin({
     key: new PluginKey("drop-handler-plugin"),
     props: {
       handlePaste: (view, event) => {
@@ -32,7 +25,6 @@ export const DropHandlerPlugin = (props: Props): Plugin => {
           if (acceptedFiles.length) {
             const pos = view.state.selection.from;
             insertFilesSafely({
-              disabledExtensions,
               editor,
               files: acceptedFiles,
               initialPos: pos,
@@ -66,7 +58,6 @@ export const DropHandlerPlugin = (props: Props): Plugin => {
             if (coordinates) {
               const pos = coordinates.pos;
               insertFilesSafely({
-                disabledExtensions,
                 editor,
                 files: acceptedFiles,
                 initialPos: pos,
@@ -80,10 +71,8 @@ export const DropHandlerPlugin = (props: Props): Plugin => {
       },
     },
   });
-};
 
 type InsertFilesSafelyArgs = {
-  disabledExtensions?: TExtensions[];
   editor: Editor;
   event: "insert" | "drop";
   files: File[];
@@ -92,7 +81,7 @@ type InsertFilesSafelyArgs = {
 };
 
 export const insertFilesSafely = async (args: InsertFilesSafelyArgs) => {
-  const { disabledExtensions, editor, event, files, initialPos, type } = args;
+  const { editor, event, files, initialPos, type } = args;
   let pos = initialPos;
 
   for (const file of files) {
@@ -111,7 +100,7 @@ export const insertFilesSafely = async (args: InsertFilesSafelyArgs) => {
         else if (ACCEPTED_ATTACHMENT_MIME_TYPES.includes(file.type)) fileType = "attachment";
       }
       // insert file depending on the type at the current position
-      if (fileType === "image" && !disabledExtensions?.includes("image")) {
+      if (fileType === "image") {
         editor.commands.insertImageComponent({
           file,
           pos,

packages/editor/src/core/types/collaboration.ts

@@ -1,4 +1,50 @@
+import { Extensions } from "@tiptap/core";
+import { EditorProps } from "@tiptap/pm/view";
+// plane editor types
+import { TEmbedConfig } from "@/plane-editor/types";
+// types
+import {
+  EditorReadOnlyRefApi,
+  EditorRefApi,
+  TExtensions,
+  TFileHandler,
+  TMentionHandler,
+  TReadOnlyFileHandler,
+  TReadOnlyMentionHandler,
+  TRealtimeConfig,
+  TUserDetails,
+} from "@/types";
+
 export type TServerHandler = {
   onConnect?: () => void;
   onServerError?: () => void;
 };
+
+type TCollaborativeEditorHookProps = {
+  disabledExtensions: TExtensions[];
+  editable: boolean;
+  editorClassName: string;
+  editorProps?: EditorProps;
+  extensions?: Extensions;
+  handleEditorReady?: (value: boolean) => void;
+  id: string;
+  realtimeConfig: TRealtimeConfig;
+  serverHandler?: TServerHandler;
+  user: TUserDetails;
+};
+
+export type TCollaborativeEditorProps = TCollaborativeEditorHookProps & {
+  onTransaction?: () => void;
+  embedHandler?: TEmbedConfig;
+  fileHandler: TFileHandler;
+  forwardedRef?: React.MutableRefObject<EditorRefApi | null>;
+  mentionHandler: TMentionHandler;
+  placeholder?: string | ((isFocused: boolean, value: string) => string);
+  tabIndex?: number;
+};
+
+export type TReadOnlyCollaborativeEditorProps = TCollaborativeEditorHookProps & {
+  fileHandler: TReadOnlyFileHandler;
+  forwardedRef?: React.MutableRefObject<EditorReadOnlyRefApi | null>;
+  mentionHandler: TReadOnlyMentionHandler;
+};

packages/editor/src/core/types/config.ts

@@ -1,6 +1,3 @@
-// plane imports
-import { TWebhookConnectionQueryParams } from "@plane/types";
-
 export type TReadOnlyFileHandler = {
   checkIfAssetExists: (assetId: string) => Promise<boolean>;
   getAssetSrc: (path: string) => Promise<string>;
@@ -33,15 +30,3 @@ export type TDisplayConfig = {
   lineSpacing?: TEditorLineSpacing;
   wideLayout?: boolean;
 };
-
-export type TUserDetails = {
-  color: string;
-  id: string;
-  name: string;
-  cookie?: string;
-};
-
-export type TRealtimeConfig = {
-  url: string;
-  queryParams: TWebhookConnectionQueryParams;
-};

packages/editor/src/core/types/editor.ts

@@ -1,11 +1,13 @@
-import type { Extensions, JSONContent } from "@tiptap/core";
-import type { Selection } from "@tiptap/pm/state";
+import { Extensions, JSONContent } from "@tiptap/core";
+import { Selection } from "@tiptap/pm/state";
+// plane types
+import { TWebhookConnectionQueryParams } from "@plane/types";
 // extension types
-import type { TTextAlign } from "@/extensions";
+import { TTextAlign } from "@/extensions";
 // helpers
-import type { IMarking } from "@/helpers/scroll-to-node";
+import { IMarking } from "@/helpers/scroll-to-node";
 // types
-import type {
+import {
   TAIHandler,
   TDisplayConfig,
   TDocumentEventEmitter,
@@ -16,9 +18,7 @@ import type {
   TMentionHandler,
   TReadOnlyFileHandler,
   TReadOnlyMentionHandler,
-  TRealtimeConfig,
   TServerHandler,
-  TUserDetails,
 } from "@/types";
 
 export type TEditorCommands =
@@ -114,70 +114,89 @@ export interface EditorRefApi extends EditorReadOnlyRefApi {
 
 // editor props
 export interface IEditorProps {
-  autofocus?: boolean;
-  bubbleMenuEnabled?: boolean;
   containerClassName?: string;
   displayConfig?: TDisplayConfig;
   disabledExtensions: TExtensions[];
   editorClassName?: string;
-  extensions?: Extensions;
-  flaggedExtensions: TExtensions[];
   fileHandler: TFileHandler;
   forwardedRef?: React.MutableRefObject<EditorRefApi | null>;
-  handleEditorReady?: (value: boolean) => void;
   id: string;
   initialValue: string;
   mentionHandler: TMentionHandler;
   onChange?: (json: object, html: string) => void;
-  onEnterKeyPress?: (e?: any) => void;
   onTransaction?: () => void;
+  handleEditorReady?: (value: boolean) => void;
+  autofocus?: boolean;
+  onEnterKeyPress?: (e?: any) => void;
   placeholder?: string | ((isFocused: boolean, value: string) => string);
   tabIndex?: number;
   value?: string | null;
+  bubbleMenuEnabled?: boolean;
 }
-
-export type ILiteTextEditorProps = IEditorProps;
-export interface IRichTextEditorProps extends IEditorProps {
+export interface ILiteTextEditor extends IEditorProps {
+  extensions?: Extensions;
+}
+export interface IRichTextEditor extends IEditorProps {
+  extensions?: Extensions;
   dragDropEnabled?: boolean;
 }
 
-export interface ICollaborativeDocumentEditorProps
-  extends Omit<IEditorProps, "extensions" | "initialValue" | "onEnterKeyPress" | "value"> {
+export interface ICollaborativeDocumentEditor
+  extends Omit<IEditorProps, "initialValue" | "onChange" | "onEnterKeyPress" | "value"> {
   aiHandler?: TAIHandler;
+  bubbleMenuEnabled?: boolean;
   editable: boolean;
   embedHandler: TEmbedConfig;
+  handleEditorReady?: (value: boolean) => void;
+  id: string;
   realtimeConfig: TRealtimeConfig;
   serverHandler?: TServerHandler;
   user: TUserDetails;
 }
 
 // read only editor props
-export interface IReadOnlyEditorProps
-  extends Pick<
-    IEditorProps,
-    | "containerClassName"
-    | "disabledExtensions"
-    | "flaggedExtensions"
-    | "displayConfig"
-    | "editorClassName"
-    | "extensions"
-    | "handleEditorReady"
-    | "id"
-    | "initialValue"
-  > {
+export interface IReadOnlyEditorProps {
+  containerClassName?: string;
+  disabledExtensions: TExtensions[];
+  displayConfig?: TDisplayConfig;
+  editorClassName?: string;
   fileHandler: TReadOnlyFileHandler;
   forwardedRef?: React.MutableRefObject<EditorReadOnlyRefApi | null>;
+  id: string;
+  initialValue: string;
   mentionHandler: TReadOnlyMentionHandler;
 }
 
-export type ILiteTextReadOnlyEditorProps = IReadOnlyEditorProps;
+export type ILiteTextReadOnlyEditor = IReadOnlyEditorProps;
 
-export type IRichTextReadOnlyEditorProps = IReadOnlyEditorProps;
+export type IRichTextReadOnlyEditor = IReadOnlyEditorProps;
 
-export interface IDocumentReadOnlyEditorProps extends IReadOnlyEditorProps {
+export interface ICollaborativeDocumentReadOnlyEditor extends Omit<IReadOnlyEditorProps, "initialValue"> {
   embedHandler: TEmbedConfig;
+  handleEditorReady?: (value: boolean) => void;
+  id: string;
+  realtimeConfig: TRealtimeConfig;
+  serverHandler?: TServerHandler;
+  user: TUserDetails;
 }
 
+export interface IDocumentReadOnlyEditor extends IReadOnlyEditorProps {
+  embedHandler: TEmbedConfig;
+  handleEditorReady?: (value: boolean) => void;
+}
+
+export type TUserDetails = {
+  color: string;
+  id: string;
+  name: string;
+  cookie?: string;
+};
+
+export type TRealtimeConfig = {
+  url: string;
+  queryParams: TWebhookConnectionQueryParams;
+};
+
 export interface EditorEvents {
   beforeCreate: never;
   create: never;

packages/editor/src/core/types/hook.ts

@@ -1,50 +0,0 @@
-import type { HocuspocusProvider } from "@hocuspocus/provider";
-import type { EditorProps } from "@tiptap/pm/view";
-// local imports
-import type { ICollaborativeDocumentEditorProps, IEditorProps, IReadOnlyEditorProps } from "./editor";
-
-type TCoreHookProps = Pick<
-  IEditorProps,
-  "disabledExtensions" | "editorClassName" | "extensions" | "flaggedExtensions" | "handleEditorReady"
-> & {
-  editorProps?: EditorProps;
-};
-
-export type TEditorHookProps = TCoreHookProps &
-  Pick<
-    IEditorProps,
-    | "autofocus"
-    | "fileHandler"
-    | "forwardedRef"
-    | "id"
-    | "mentionHandler"
-    | "onChange"
-    | "onTransaction"
-    | "placeholder"
-    | "tabIndex"
-    | "value"
-  > & {
-    editable: boolean;
-    enableHistory: boolean;
-    initialValue?: string;
-    provider?: HocuspocusProvider;
-  };
-
-export type TCollaborativeEditorHookProps = TCoreHookProps &
-  Pick<
-    TEditorHookProps,
-    | "editable"
-    | "fileHandler"
-    | "forwardedRef"
-    | "id"
-    | "mentionHandler"
-    | "onChange"
-    | "onTransaction"
-    | "placeholder"
-    | "tabIndex"
-  > &
-  Pick<ICollaborativeDocumentEditorProps, "embedHandler" | "realtimeConfig" | "serverHandler" | "user">;
-
-export type TReadOnlyEditorHookProps = TCoreHookProps &
-  Pick<TEditorHookProps, "initialValue" | "provider"> &
-  Pick<IReadOnlyEditorProps, "fileHandler" | "forwardedRef" | "mentionHandler">;

packages/editor/src/core/types/index.ts

@@ -4,7 +4,6 @@ export * from "./config";
 export * from "./editor";
 export * from "./embed";
 export * from "./extensions";
-export * from "./hook";
 export * from "./mention";
 export * from "./slash-commands-suggestion";
 export * from "@/plane-editor/types";

packages/editor/src/index.ts

@@ -36,4 +36,5 @@ export { type IMarking, useEditorMarkings } from "@/hooks/use-editor-markings";
 export { useReadOnlyEditor } from "@/hooks/use-read-only-editor";
 
 // types
+export type { CustomEditorProps } from "@/hooks/use-editor";
 export * from "@/types";

packages/eslint-config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@plane/eslint-config",
   "private": true,
-  "version": "0.26.1",
+  "version": "0.26.0",
   "license": "AGPL-3.0",
   "files": [
     "library.js",
@@ -18,6 +18,6 @@
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^5.2.0",
-    "typescript": "5.8.3"
+    "typescript": "5.3.3"
   }
 }

packages/hooks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/hooks",
-  "version": "0.26.1",
+  "version": "0.26.0",
   "license": "AGPL-3.0",
   "description": "React hooks that are shared across multiple apps internally",
   "private": true,
@@ -23,6 +23,6 @@
     "@types/node": "^22.5.4",
     "@types/react": "^18.3.11",
     "tsup": "8.4.0",
-    "typescript": "5.8.3"
+    "typescript": "^5.3.3"
   }
 }

packages/i18n/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/i18n",
-  "version": "0.26.1",
+  "version": "0.26.0",
   "license": "AGPL-3.0",
   "description": "I18n shared across multiple apps internally",
   "private": true,
@@ -17,6 +17,6 @@
   "devDependencies": {
     "@plane/eslint-config": "*",
     "@types/node": "^22.5.4",
-    "typescript": "5.8.3"
+    "typescript": "^5.3.3"
   }
 }