Potential fix for code scanning alert no. 590: URL redirection from remote source

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

.env.example

@@ -38,9 +38,3 @@ USE_MINIO=1
 
 # Nginx Configuration
 NGINX_PORT=80
-
-# Force HTTPS for handling SSL Termination
-MINIO_ENDPOINT_SSL=0
-
-# API key rate limit
-API_KEY_RATE_LIMIT="60/minute"

.github/workflows/build-aio-branch.yml

@@ -88,7 +88,7 @@ jobs:
 
   full_build_push:
     if: ${{ needs.branch_build_setup.outputs.do_full_build == 'true' }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
       BUILD_TYPE: full
@@ -148,7 +148,7 @@ jobs:
 
   slim_build_push:
     if: ${{ needs.branch_build_setup.outputs.do_slim_build == 'true' }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
       BUILD_TYPE: slim

.github/workflows/build-branch.yml

@@ -47,6 +47,12 @@ jobs:
       gh_buildx_version: ${{ steps.set_env_variables.outputs.BUILDX_VERSION }}
       gh_buildx_platforms: ${{ steps.set_env_variables.outputs.BUILDX_PLATFORMS }}
       gh_buildx_endpoint: ${{ steps.set_env_variables.outputs.BUILDX_ENDPOINT }}
+      build_proxy: ${{ steps.changed_files.outputs.proxy_any_changed }}
+      build_apiserver: ${{ steps.changed_files.outputs.apiserver_any_changed }}
+      build_admin: ${{ steps.changed_files.outputs.admin_any_changed }}
+      build_space: ${{ steps.changed_files.outputs.space_any_changed }}
+      build_web: ${{ steps.changed_files.outputs.web_any_changed }}
+      build_live: ${{ steps.changed_files.outputs.live_any_changed }}
 
       dh_img_web: ${{ steps.set_env_variables.outputs.DH_IMG_WEB }}
       dh_img_space: ${{ steps.set_env_variables.outputs.DH_IMG_SPACE }}
@@ -117,7 +123,46 @@ 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:
+              - nginx/**
+            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:
+    if: ${{ needs.branch_build_setup.outputs.build_admin == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     name: Build-Push Admin Docker Image
     runs-on: ubuntu-22.04
     needs: [branch_build_setup]
@@ -140,6 +185,7 @@ jobs:
           buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
 
   branch_build_push_web:
+    if: ${{ needs.branch_build_setup.outputs.build_web == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     name: Build-Push Web Docker Image
     runs-on: ubuntu-22.04
     needs: [branch_build_setup]
@@ -162,6 +208,7 @@ jobs:
           buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
 
   branch_build_push_space:
+    if: ${{ needs.branch_build_setup.outputs.build_space == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     name: Build-Push Space Docker Image
     runs-on: ubuntu-22.04
     needs: [branch_build_setup]
@@ -184,6 +231,7 @@ jobs:
           buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
 
   branch_build_push_live:
+    if: ${{ needs.branch_build_setup.outputs.build_live == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     name: Build-Push Live Collaboration Docker Image
     runs-on: ubuntu-22.04
     needs: [branch_build_setup]
@@ -206,6 +254,7 @@ jobs:
           buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
 
   branch_build_push_apiserver:
+    if: ${{ needs.branch_build_setup.outputs.build_apiserver == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     name: Build-Push API Server Docker Image
     runs-on: ubuntu-22.04
     needs: [branch_build_setup]
@@ -228,6 +277,7 @@ jobs:
           buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
 
   branch_build_push_proxy:
+    if: ${{ needs.branch_build_setup.outputs.build_proxy == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     name: Build-Push Proxy Docker Image
     runs-on: ubuntu-22.04
     needs: [branch_build_setup]
@@ -249,6 +299,31 @@ jobs:
           buildx-platforms: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }}
           buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
 
+  attach_assets_to_build:
+    if: ${{ needs.branch_build_setup.outputs.build_type == 'Release' }}
+    name: Attach Assets to Release
+    runs-on: ubuntu-22.04
+    needs: [branch_build_setup]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Update Assets
+        run: |
+          cp ./deploy/selfhost/install.sh deploy/selfhost/setup.sh
+
+      - name: Attach Assets
+        id: attach_assets
+        uses: actions/upload-artifact@v4
+        with:
+          name: selfhost-assets
+          retention-days: 2
+          path: |
+            ${{ github.workspace }}/deploy/selfhost/setup.sh
+            ${{ github.workspace }}/deploy/selfhost/restore.sh
+            ${{ github.workspace }}/deploy/selfhost/docker-compose.yml
+            ${{ github.workspace }}/deploy/selfhost/variables.env
+
   publish_release:
     if: ${{ needs.branch_build_setup.outputs.build_type == 'Release' }}
     name: Build Release
@@ -262,6 +337,7 @@ jobs:
         branch_build_push_live,
         branch_build_push_apiserver,
         branch_build_push_proxy,
+        attach_assets_to_build,
       ]
     env:
       REL_VERSION: ${{ needs.branch_build_setup.outputs.release_version }}
@@ -272,8 +348,6 @@ jobs:
       - name: Update Assets
         run: |
           cp ./deploy/selfhost/install.sh deploy/selfhost/setup.sh
-          sed -i 's/${APP_RELEASE:-stable}/${APP_RELEASE:-'${REL_VERSION}'}/g' deploy/selfhost/docker-compose.yml
-          sed -i 's/APP_RELEASE=stable/APP_RELEASE='${REL_VERSION}'/g' deploy/selfhost/variables.env
 
       - name: Create Release
         id: create_release
@@ -288,7 +362,6 @@ jobs:
           generate_release_notes: true
           files: |
             ${{ github.workspace }}/deploy/selfhost/setup.sh
-            ${{ github.workspace }}/deploy/selfhost/swarm.sh
             ${{ github.workspace }}/deploy/selfhost/restore.sh
             ${{ github.workspace }}/deploy/selfhost/docker-compose.yml
             ${{ github.workspace }}/deploy/selfhost/variables.env

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

@@ -6,9 +6,49 @@ on:
     types: ["opened", "synchronize", "ready_for_review"]
 
 jobs:
-  lint-apiserver:
+  get-changed-files:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
+    outputs:
+      apiserver_changed: ${{ steps.changed-files.outputs.apiserver_any_changed }}
+      admin_changed: ${{ steps.changed-files.outputs.admin_any_changed }}
+      space_changed: ${{ steps.changed-files.outputs.space_any_changed }}
+      web_changed: ${{ steps.changed-files.outputs.web_any_changed }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v44
+        with:
+          files_yaml: |
+            apiserver:
+              - apiserver/**
+            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'
+
+  lint-apiserver:
+    needs: get-changed-files
+    runs-on: ubuntu-latest
+    if: needs.get-changed-files.outputs.apiserver_changed == 'true'
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
@@ -23,7 +63,8 @@ jobs:
         run: ruff check --fix apiserver
 
   lint-admin:
-    if: github.event.pull_request.draft == false
+    needs: get-changed-files
+    if: needs.get-changed-files.outputs.admin_changed == 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -35,7 +76,8 @@ jobs:
       - run: yarn lint --filter=admin
 
   lint-space:
-    if: github.event.pull_request.draft == false
+    needs: get-changed-files
+    if: needs.get-changed-files.outputs.space_changed == 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -47,7 +89,8 @@ jobs:
       - run: yarn lint --filter=space
 
   lint-web:
-    if: github.event.pull_request.draft == false
+    needs: get-changed-files
+    if: needs.get-changed-files.outputs.web_changed == 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.github/workflows/feature-deployment.yml

@@ -51,7 +51,7 @@ jobs:
         uses: actions/checkout@v4
 
   full_build_push:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: [branch_build_setup]
     env:
       BUILD_TYPE: full

.github/workflows/sync-repo.yml

@@ -11,7 +11,7 @@ env:
 
 jobs:
   sync_changes:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     permissions:
       pull-requests: write
       contents: read

admin/package.json

@@ -1,8 +1,6 @@
 {
   "name": "admin",
-  "description": "Admin UI for Plane",
-  "version": "0.25.2",
-  "license": "AGPL-3.0",
+  "version": "0.24.1",
   "private": true,
   "scripts": {
     "dev": "turbo run develop",
@@ -25,7 +23,7 @@
     "@tailwindcss/typography": "^0.5.9",
     "@types/lodash": "^4.17.0",
     "autoprefixer": "10.4.14",
-    "axios": "^1.8.3",
+    "axios": "^1.7.9",
     "lodash": "^4.17.21",
     "lucide-react": "^0.469.0",
     "mobx": "^6.12.0",

apiserver/.env.example

@@ -59,10 +59,4 @@ APP_BASE_URL=
 
 
 # Hard delete files after days
-HARD_DELETE_AFTER_DAYS=60
-
-# Force HTTPS for handling SSL Termination
-MINIO_ENDPOINT_SSL=0
-
-# API key rate limit
-API_KEY_RATE_LIMIT="60/minute"
+HARD_DELETE_AFTER_DAYS=60

apiserver/package.json

@@ -1,7 +1,4 @@
 {
   "name": "plane-api",
-  "version": "0.25.2",
-  "license": "AGPL-3.0",
-  "private": true,
-  "description": "API server powering Plane's backend"
+  "version": "0.24.1"
 }

apiserver/plane/api/rate_limit.py

@@ -1,13 +1,9 @@
-# python imports
-import os
-
-# Third party imports
 from rest_framework.throttling import SimpleRateThrottle
 
 
 class ApiKeyRateThrottle(SimpleRateThrottle):
     scope = "api_key"
-    rate = os.environ.get("API_KEY_RATE_LIMIT", "60/minute")
+    rate = "60/minute"
 
     def get_cache_key(self, request, view):
         # Retrieve the API key from the request header

apiserver/plane/api/serializers/issue.py

@@ -80,7 +80,6 @@ class IssueSerializer(BaseSerializer):
             data["assignees"] = ProjectMember.objects.filter(
                 project_id=self.context.get("project_id"),
                 is_active=True,
-                role__gte=15,
                 member_id__in=data["assignees"],
             ).values_list("member_id", flat=True)
 
@@ -159,13 +158,8 @@ class IssueSerializer(BaseSerializer):
                 pass
         else:
             try:
-                # Then assign it to default assignee, if it is a valid assignee
-                if default_assignee_id is not None and ProjectMember.objects.filter(
-                    member_id=default_assignee_id,
-                    project_id=project_id,
-                    role__gte=15,
-                    is_active=True
-                ).exists():
+                # Then assign it to default assignee
+                if default_assignee_id is not None:
                     IssueAssignee.objects.create(
                         assignee_id=default_assignee_id,
                         issue=issue,

apiserver/plane/app/serializers/__init__.py

@@ -121,6 +121,8 @@ from .exporter import ExporterHistorySerializer
 
 from .webhook import WebhookSerializer, WebhookLogSerializer
 
+from .dashboard import DashboardSerializer, WidgetSerializer
+
 from .favorite import UserFavoriteSerializer
 
 from .draft import (

apiserver/plane/app/serializers/dashboard.py

@@ -0,0 +1,21 @@
+# Module imports
+from .base import BaseSerializer
+from plane.db.models import DeprecatedDashboard, DeprecatedWidget
+
+# Third party frameworks
+from rest_framework import serializers
+
+
+class DashboardSerializer(BaseSerializer):
+    class Meta:
+        model = DeprecatedDashboard
+        fields = "__all__"
+
+
+class WidgetSerializer(BaseSerializer):
+    is_visible = serializers.BooleanField(read_only=True)
+    widget_filters = serializers.JSONField(read_only=True)
+
+    class Meta:
+        model = DeprecatedWidget
+        fields = ["id", "key", "is_visible", "widget_filters"]

apiserver/plane/app/serializers/issue.py

@@ -36,7 +36,6 @@ from plane.db.models import (
     State,
     IssueVersion,
     IssueDescriptionVersion,
-    ProjectMember,
 )
 
 
@@ -111,23 +110,14 @@ class IssueCreateSerializer(BaseSerializer):
         data["label_ids"] = label_ids if label_ids else []
         return data
 
-    def validate(self, attrs):
+    def validate(self, data):
         if (
-            attrs.get("start_date", None) is not None
-            and attrs.get("target_date", None) is not None
-            and attrs.get("start_date", None) > attrs.get("target_date", None)
+            data.get("start_date", None) is not None
+            and data.get("target_date", None) is not None
+            and data.get("start_date", None) > data.get("target_date", None)
         ):
             raise serializers.ValidationError("Start date cannot exceed target date")
-
-        if attrs.get("assignee_ids", []):
-            attrs["assignee_ids"] = ProjectMember.objects.filter(
-                project_id=self.context["project_id"],
-                role__gte=15,
-                is_active=True,
-                member_id__in=attrs["assignee_ids"],
-            ).values_list("member_id", flat=True)
-
-        return attrs
+        return data
 
     def create(self, validated_data):
         assignees = validated_data.pop("assignee_ids", None)
@@ -149,30 +139,22 @@ class IssueCreateSerializer(BaseSerializer):
                 IssueAssignee.objects.bulk_create(
                     [
                         IssueAssignee(
-                            assignee_id=assignee_id,
+                            assignee=user,
                             issue=issue,
                             project_id=project_id,
                             workspace_id=workspace_id,
                             created_by_id=created_by_id,
                             updated_by_id=updated_by_id,
                         )
-                        for assignee_id in assignees
+                        for user in assignees
                     ],
                     batch_size=10,
                 )
             except IntegrityError:
                 pass
         else:
-            # Then assign it to default assignee, if it is a valid assignee
-            if (
-                default_assignee_id is not None
-                and ProjectMember.objects.filter(
-                    member_id=default_assignee_id,
-                    project_id=project_id,
-                    role__gte=15,
-                    is_active=True,
-                ).exists()
-            ):
+            # Then assign it to default assignee
+            if default_assignee_id is not None:
                 try:
                     IssueAssignee.objects.create(
                         assignee_id=default_assignee_id,
@@ -222,14 +204,14 @@ class IssueCreateSerializer(BaseSerializer):
                 IssueAssignee.objects.bulk_create(
                     [
                         IssueAssignee(
-                            assignee_id=assignee_id,
+                            assignee=user,
                             issue=instance,
                             project_id=project_id,
                             workspace_id=workspace_id,
                             created_by_id=created_by_id,
                             updated_by_id=updated_by_id,
                         )
-                        for assignee_id in assignees
+                        for user in assignees
                     ],
                     batch_size=10,
                     ignore_conflicts=True,

apiserver/plane/app/urls/__init__.py

@@ -2,6 +2,7 @@ from .analytic import urlpatterns as analytic_urls
 from .api import urlpatterns as api_urls
 from .asset import urlpatterns as asset_urls
 from .cycle import urlpatterns as cycle_urls
+from .dashboard import urlpatterns as dashboard_urls
 from .estimate import urlpatterns as estimate_urls
 from .external import urlpatterns as external_urls
 from .intake import urlpatterns as intake_urls
@@ -22,6 +23,7 @@ urlpatterns = [
     *analytic_urls,
     *asset_urls,
     *cycle_urls,
+    *dashboard_urls,
     *estimate_urls,
     *external_urls,
     *intake_urls,

apiserver/plane/app/urls/dashboard.py

@@ -0,0 +1,23 @@
+from django.urls import path
+
+
+from plane.app.views import DashboardEndpoint, WidgetsEndpoint
+
+
+urlpatterns = [
+    path(
+        "workspaces/<str:slug>/dashboard/",
+        DashboardEndpoint.as_view(),
+        name="dashboard",
+    ),
+    path(
+        "workspaces/<str:slug>/dashboard/<uuid:dashboard_id>/",
+        DashboardEndpoint.as_view(),
+        name="dashboard",
+    ),
+    path(
+        "dashboard/<uuid:dashboard_id>/widgets/<uuid:widget_id>/",
+        WidgetsEndpoint.as_view(),
+        name="widgets",
+    ),
+]

apiserver/plane/app/views/__init__.py

@@ -210,6 +210,8 @@ from .webhook.base import (
     WebhookSecretRegenerateEndpoint,
 )
 
+from .dashboard.base import DashboardEndpoint, WidgetsEndpoint
+
 from .error_404 import custom_404_view
 
 from .notification.base import MarkAllReadNotificationViewSet

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

@@ -0,0 +1,812 @@
+# Django imports
+from django.contrib.postgres.aggregates import ArrayAgg
+from django.contrib.postgres.fields import ArrayField
+from django.db.models import (
+    Case,
+    CharField,
+    Count,
+    Exists,
+    F,
+    Func,
+    IntegerField,
+    JSONField,
+    OuterRef,
+    Prefetch,
+    Q,
+    Subquery,
+    UUIDField,
+    Value,
+    When,
+)
+from django.db.models.functions import Coalesce
+from django.utils import timezone
+from rest_framework import status
+
+# Third Party imports
+from rest_framework.response import Response
+
+from plane.app.serializers import (
+    DashboardSerializer,
+    IssueActivitySerializer,
+    IssueSerializer,
+    WidgetSerializer,
+)
+from plane.db.models import (
+    DeprecatedDashboard,
+    DeprecatedDashboardWidget,
+    Issue,
+    IssueActivity,
+    FileAsset,
+    IssueLink,
+    IssueRelation,
+    Project,
+    DeprecatedWidget,
+    WorkspaceMember,
+    CycleIssue,
+)
+from plane.utils.issue_filters import issue_filters
+
+# Module imports
+from .. import BaseAPIView
+
+
+def dashboard_overview_stats(self, request, slug):
+    assigned_issues = (
+        Issue.issue_objects.filter(
+            (Q(assignees__in=[request.user]) & Q(issue_assignee__deleted_at__isnull=True)),
+            project__project_projectmember__is_active=True,
+            project__project_projectmember__member=request.user,
+            workspace__slug=slug,
+        )
+        .filter(
+            Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=True,
+            )
+            | Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=False,
+                created_by=self.request.user,
+            )
+            |
+            # For other roles (role < 5), show all issues
+            Q(project__project_projectmember__role__gt=5),
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
+        )
+        .count()
+    )
+
+    pending_issues_count = (
+        Issue.issue_objects.filter(
+            ~Q(state__group__in=["completed", "cancelled"]),
+            target_date__lt=timezone.now().date(),
+            project__project_projectmember__is_active=True,
+            project__project_projectmember__member=request.user,
+            workspace__slug=slug,
+            assignees__in=[request.user],
+        )
+        .filter(
+            Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=True,
+            )
+            | Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=False,
+                created_by=self.request.user,
+            )
+            |
+            # For other roles (role < 5), show all issues
+            Q(project__project_projectmember__role__gt=5),
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
+        )
+        .count()
+    )
+
+    created_issues_count = (
+        Issue.issue_objects.filter(
+            workspace__slug=slug,
+            project__project_projectmember__is_active=True,
+            project__project_projectmember__member=request.user,
+            created_by_id=request.user.id,
+        )
+        .filter(
+            Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=True,
+            )
+            | Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=False,
+                created_by=self.request.user,
+            )
+            |
+            # For other roles (role < 5), show all issues
+            Q(project__project_projectmember__role__gt=5),
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
+        )
+        .count()
+    )
+
+    completed_issues_count = (
+        Issue.issue_objects.filter(
+            (
+                Q(assignees__in=[request.user])
+                & Q(issue_assignee__deleted_at__isnull=True)
+            ),
+            workspace__slug=slug,
+            project__project_projectmember__is_active=True,
+            project__project_projectmember__member=request.user,
+            state__group="completed",
+        )
+        .filter(
+            Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=True,
+            )
+            | Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=False,
+                created_by=self.request.user,
+            )
+            |
+            # For other roles (role < 5), show all issues
+            Q(project__project_projectmember__role__gt=5),
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
+        )
+        .count()
+    )
+
+    return Response(
+        {
+            "assigned_issues_count": assigned_issues,
+            "pending_issues_count": pending_issues_count,
+            "completed_issues_count": completed_issues_count,
+            "created_issues_count": created_issues_count,
+        },
+        status=status.HTTP_200_OK,
+    )
+
+
+def dashboard_assigned_issues(self, request, slug):
+    filters = issue_filters(request.query_params, "GET")
+    issue_type = request.GET.get("issue_type", None)
+
+    # get all the assigned issues
+    assigned_issues = (
+        Issue.issue_objects.filter(
+            (
+                Q(assignees__in=[request.user])
+                & Q(issue_assignee__deleted_at__isnull=True)
+            ),
+            workspace__slug=slug,
+            project__project_projectmember__member=request.user,
+            project__project_projectmember__is_active=True,
+        )
+        .filter(**filters)
+        .select_related("workspace", "project", "state", "parent")
+        .prefetch_related("assignees", "labels", "issue_module__module")
+        .prefetch_related(
+            Prefetch(
+                "issue_relation",
+                queryset=IssueRelation.objects.select_related(
+                    "related_issue"
+                ).select_related("issue"),
+            )
+        )
+        .annotate(
+            cycle_id=Subquery(
+                CycleIssue.objects.filter(
+                    issue=OuterRef("id"), deleted_at__isnull=True
+                ).values("cycle_id")[:1]
+            )
+        )
+        .annotate(
+            link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+            .order_by()
+            .annotate(count=Func(F("id"), function="Count"))
+            .values("count")
+        )
+        .annotate(
+            attachment_count=FileAsset.objects.filter(
+                issue_id=OuterRef("id"),
+                entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
+            )
+            .order_by()
+            .annotate(count=Func(F("id"), function="Count"))
+            .values("count")
+        )
+        .annotate(
+            sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
+            .order_by()
+            .annotate(count=Func(F("id"), function="Count"))
+            .values("count")
+        )
+        .annotate(
+            label_ids=Coalesce(
+                ArrayAgg(
+                    "labels__id",
+                    distinct=True,
+                    filter=Q(
+                        ~Q(labels__id__isnull=True)
+                        & Q(label_issue__deleted_at__isnull=True)
+                    ),
+                ),
+                Value([], output_field=ArrayField(UUIDField())),
+            ),
+            assignee_ids=Coalesce(
+                ArrayAgg(
+                    "assignees__id",
+                    distinct=True,
+                    filter=Q(
+                        ~Q(assignees__id__isnull=True)
+                        & Q(assignees__member_project__is_active=True)
+                        & Q(issue_assignee__deleted_at__isnull=True)
+                    ),
+                ),
+                Value([], output_field=ArrayField(UUIDField())),
+            ),
+            module_ids=Coalesce(
+                ArrayAgg(
+                    "issue_module__module_id",
+                    distinct=True,
+                    filter=Q(
+                        ~Q(issue_module__module_id__isnull=True)
+                        & Q(issue_module__module__archived_at__isnull=True)
+                        & Q(issue_module__deleted_at__isnull=True)
+                    ),
+                ),
+                Value([], output_field=ArrayField(UUIDField())),
+            ),
+        )
+    )
+
+    if WorkspaceMember.objects.filter(
+        workspace__slug=slug, member=request.user, role=5, is_active=True
+    ).exists():
+        assigned_issues = assigned_issues.filter(created_by=request.user)
+
+    # Priority Ordering
+    priority_order = ["urgent", "high", "medium", "low", "none"]
+    assigned_issues = assigned_issues.annotate(
+        priority_order=Case(
+            *[When(priority=p, then=Value(i)) for i, p in enumerate(priority_order)],
+            output_field=CharField(),
+        )
+    ).order_by("priority_order")
+
+    if issue_type == "pending":
+        pending_issues_count = assigned_issues.filter(
+            state__group__in=["backlog", "started", "unstarted"]
+        ).count()
+        pending_issues = assigned_issues.filter(
+            state__group__in=["backlog", "started", "unstarted"]
+        )[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(
+                    pending_issues, many=True, expand=self.expand
+                ).data,
+                "count": pending_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    if issue_type == "completed":
+        completed_issues_count = assigned_issues.filter(
+            state__group__in=["completed"]
+        ).count()
+        completed_issues = assigned_issues.filter(state__group__in=["completed"])[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(
+                    completed_issues, many=True, expand=self.expand
+                ).data,
+                "count": completed_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    if issue_type == "overdue":
+        overdue_issues_count = assigned_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__lt=timezone.now(),
+        ).count()
+        overdue_issues = assigned_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__lt=timezone.now(),
+        )[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(
+                    overdue_issues, many=True, expand=self.expand
+                ).data,
+                "count": overdue_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    if issue_type == "upcoming":
+        upcoming_issues_count = assigned_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__gte=timezone.now(),
+        ).count()
+        upcoming_issues = assigned_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__gte=timezone.now(),
+        )[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(
+                    upcoming_issues, many=True, expand=self.expand
+                ).data,
+                "count": upcoming_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    return Response(
+        {"error": "Please specify a valid issue type"},
+        status=status.HTTP_400_BAD_REQUEST,
+    )
+
+
+def dashboard_created_issues(self, request, slug):
+    filters = issue_filters(request.query_params, "GET")
+    issue_type = request.GET.get("issue_type", None)
+
+    # get all the assigned issues
+    created_issues = (
+        Issue.issue_objects.filter(
+            workspace__slug=slug,
+            project__project_projectmember__member=request.user,
+            project__project_projectmember__is_active=True,
+            created_by=request.user,
+        )
+        .filter(**filters)
+        .select_related("workspace", "project", "state", "parent")
+        .prefetch_related("assignees", "labels", "issue_module__module")
+        .annotate(
+            cycle_id=Subquery(
+                CycleIssue.objects.filter(
+                    issue=OuterRef("id"), deleted_at__isnull=True
+                ).values("cycle_id")[:1]
+            )
+        )
+        .annotate(
+            link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+            .order_by()
+            .annotate(count=Func(F("id"), function="Count"))
+            .values("count")
+        )
+        .annotate(
+            attachment_count=FileAsset.objects.filter(
+                issue_id=OuterRef("id"),
+                entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
+            )
+            .order_by()
+            .annotate(count=Func(F("id"), function="Count"))
+            .values("count")
+        )
+        .annotate(
+            sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
+            .order_by()
+            .annotate(count=Func(F("id"), function="Count"))
+            .values("count")
+        )
+        .annotate(
+            label_ids=Coalesce(
+                ArrayAgg(
+                    "labels__id",
+                    distinct=True,
+                    filter=Q(
+                        ~Q(labels__id__isnull=True)
+                        & Q(label_issue__deleted_at__isnull=True)
+                    ),
+                ),
+                Value([], output_field=ArrayField(UUIDField())),
+            ),
+            assignee_ids=Coalesce(
+                ArrayAgg(
+                    "assignees__id",
+                    distinct=True,
+                    filter=Q(
+                        ~Q(assignees__id__isnull=True)
+                        & Q(assignees__member_project__is_active=True)
+                        & Q(issue_assignee__deleted_at__isnull=True)
+                    ),
+                ),
+                Value([], output_field=ArrayField(UUIDField())),
+            ),
+            module_ids=Coalesce(
+                ArrayAgg(
+                    "issue_module__module_id",
+                    distinct=True,
+                    filter=Q(
+                        ~Q(issue_module__module_id__isnull=True)
+                        & Q(issue_module__module__archived_at__isnull=True)
+                        & Q(issue_module__deleted_at__isnull=True)
+                    ),
+                ),
+                Value([], output_field=ArrayField(UUIDField())),
+            ),
+        )
+        .order_by("created_at")
+    )
+
+    # Priority Ordering
+    priority_order = ["urgent", "high", "medium", "low", "none"]
+    created_issues = created_issues.annotate(
+        priority_order=Case(
+            *[When(priority=p, then=Value(i)) for i, p in enumerate(priority_order)],
+            output_field=CharField(),
+        )
+    ).order_by("priority_order")
+
+    if issue_type == "pending":
+        pending_issues_count = created_issues.filter(
+            state__group__in=["backlog", "started", "unstarted"]
+        ).count()
+        pending_issues = created_issues.filter(
+            state__group__in=["backlog", "started", "unstarted"]
+        )[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(
+                    pending_issues, many=True, expand=self.expand
+                ).data,
+                "count": pending_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    if issue_type == "completed":
+        completed_issues_count = created_issues.filter(
+            state__group__in=["completed"]
+        ).count()
+        completed_issues = created_issues.filter(state__group__in=["completed"])[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(completed_issues, many=True).data,
+                "count": completed_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    if issue_type == "overdue":
+        overdue_issues_count = created_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__lt=timezone.now(),
+        ).count()
+        overdue_issues = created_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__lt=timezone.now(),
+        )[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(overdue_issues, many=True).data,
+                "count": overdue_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    if issue_type == "upcoming":
+        upcoming_issues_count = created_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__gte=timezone.now(),
+        ).count()
+        upcoming_issues = created_issues.filter(
+            state__group__in=["backlog", "unstarted", "started"],
+            target_date__gte=timezone.now(),
+        )[:5]
+        return Response(
+            {
+                "issues": IssueSerializer(upcoming_issues, many=True).data,
+                "count": upcoming_issues_count,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    return Response(
+        {"error": "Please specify a valid issue type"},
+        status=status.HTTP_400_BAD_REQUEST,
+    )
+
+
+def dashboard_issues_by_state_groups(self, request, slug):
+    filters = issue_filters(request.query_params, "GET")
+    state_order = ["backlog", "unstarted", "started", "completed", "cancelled"]
+    extra_filters = {}
+
+    if WorkspaceMember.objects.filter(
+        workspace__slug=slug, member=request.user, role=5, is_active=True
+    ).exists():
+        extra_filters = {"created_by": request.user}
+
+    issues_by_state_groups = (
+        Issue.issue_objects.filter(
+            workspace__slug=slug,
+            project__project_projectmember__is_active=True,
+            project__project_projectmember__member=request.user,
+            assignees__in=[request.user],
+        )
+        .filter(**filters, **extra_filters)
+        .values("state__group")
+        .annotate(count=Count("id"))
+    )
+
+    # default state
+    all_groups = {state: 0 for state in state_order}
+
+    # Update counts for existing groups
+    for entry in issues_by_state_groups:
+        all_groups[entry["state__group"]] = entry["count"]
+
+    # Prepare output including all groups with their counts
+    output_data = [
+        {"state": group, "count": count} for group, count in all_groups.items()
+    ]
+
+    return Response(output_data, status=status.HTTP_200_OK)
+
+
+def dashboard_issues_by_priority(self, request, slug):
+    filters = issue_filters(request.query_params, "GET")
+    priority_order = ["urgent", "high", "medium", "low", "none"]
+    extra_filters = {}
+
+    if WorkspaceMember.objects.filter(
+        workspace__slug=slug, member=request.user, role=5, is_active=True
+    ).exists():
+        extra_filters = {"created_by": request.user}
+
+    issues_by_priority = (
+        Issue.issue_objects.filter(
+            workspace__slug=slug,
+            project__project_projectmember__is_active=True,
+            project__project_projectmember__member=request.user,
+            assignees__in=[request.user],
+        )
+        .filter(**filters, **extra_filters)
+        .values("priority")
+        .annotate(count=Count("id"))
+    )
+
+    # default priority
+    all_groups = {priority: 0 for priority in priority_order}
+
+    # Update counts for existing groups
+    for entry in issues_by_priority:
+        all_groups[entry["priority"]] = entry["count"]
+
+    # Prepare output including all groups with their counts
+    output_data = [
+        {"priority": group, "count": count} for group, count in all_groups.items()
+    ]
+
+    return Response(output_data, status=status.HTTP_200_OK)
+
+
+def dashboard_recent_activity(self, request, slug):
+    queryset = IssueActivity.objects.filter(
+        ~Q(field__in=["comment", "vote", "reaction", "draft"]),
+        workspace__slug=slug,
+        project__project_projectmember__member=request.user,
+        project__project_projectmember__is_active=True,
+        project__archived_at__isnull=True,
+        actor=request.user,
+    ).select_related("actor", "workspace", "issue", "project")[:8]
+
+    return Response(
+        IssueActivitySerializer(queryset, many=True).data, status=status.HTTP_200_OK
+    )
+
+
+def dashboard_recent_projects(self, request, slug):
+    project_ids = (
+        IssueActivity.objects.filter(
+            workspace__slug=slug,
+            project__project_projectmember__member=request.user,
+            project__project_projectmember__is_active=True,
+            project__archived_at__isnull=True,
+            actor=request.user,
+        )
+        .values_list("project_id", flat=True)
+        .distinct()
+    )
+
+    # Extract project IDs from the recent projects
+    unique_project_ids = set(project_id for project_id in project_ids)
+
+    # Fetch additional projects only if needed
+    if len(unique_project_ids) < 4:
+        additional_projects = Project.objects.filter(
+            project_projectmember__member=request.user,
+            project_projectmember__is_active=True,
+            archived_at__isnull=True,
+            workspace__slug=slug,
+        ).exclude(id__in=unique_project_ids)
+
+        # Append additional project IDs to the existing list
+        unique_project_ids.update(additional_projects.values_list("id", flat=True))
+
+    return Response(list(unique_project_ids)[:4], status=status.HTTP_200_OK)
+
+
+def dashboard_recent_collaborators(self, request, slug):
+    project_members_with_activities = (
+        WorkspaceMember.objects.filter(workspace__slug=slug, is_active=True)
+        .annotate(
+            active_issue_count=Count(
+                Case(
+                    When(
+                        member__issue_assignee__issue__state__group__in=[
+                            "unstarted",
+                            "started",
+                        ],
+                        member__issue_assignee__issue__workspace__slug=slug,
+                        member__issue_assignee__issue__project__project_projectmember__member=request.user,
+                        member__issue_assignee__issue__project__project_projectmember__is_active=True,
+                        then=F("member__issue_assignee__issue__id"),
+                    ),
+                    distinct=True,
+                    output_field=IntegerField(),
+                ),
+                distinct=True,
+            ),
+            user_id=F("member_id"),
+        )
+        .values("user_id", "active_issue_count")
+        .order_by("-active_issue_count")
+        .distinct()
+    )
+    return Response((project_members_with_activities), status=status.HTTP_200_OK)
+
+
+class DashboardEndpoint(BaseAPIView):
+    def create(self, request, slug):
+        serializer = DashboardSerializer(data=request.data)
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def patch(self, request, slug, pk):
+        serializer = DashboardSerializer(data=request.data, partial=True)
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_200_OK)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def delete(self, request, slug, pk):
+        serializer = DashboardSerializer(data=request.data, partial=True)
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_204_NO_CONTENT)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def get(self, request, slug, dashboard_id=None):
+        if not dashboard_id:
+            dashboard_type = request.GET.get("dashboard_type", None)
+            if dashboard_type == "home":
+                dashboard, created = DeprecatedDashboard.objects.get_or_create(
+                    type_identifier=dashboard_type,
+                    owned_by=request.user,
+                    is_default=True,
+                )
+
+                if created:
+                    widgets_to_fetch = [
+                        "overview_stats",
+                        "assigned_issues",
+                        "created_issues",
+                        "issues_by_state_groups",
+                        "issues_by_priority",
+                        "recent_activity",
+                        "recent_projects",
+                        "recent_collaborators",
+                    ]
+
+                    updated_dashboard_widgets = []
+                    for widget_key in widgets_to_fetch:
+                        widget = DeprecatedWidget.objects.filter(
+                            key=widget_key
+                        ).values_list("id", flat=True)
+                        if widget:
+                            updated_dashboard_widgets.append(
+                                DeprecatedDashboardWidget(
+                                    widget_id=widget, dashboard_id=dashboard.id
+                                )
+                            )
+
+                    DeprecatedDashboardWidget.objects.bulk_create(
+                        updated_dashboard_widgets, batch_size=100
+                    )
+
+                widgets = (
+                    DeprecatedWidget.objects.annotate(
+                        is_visible=Exists(
+                            DeprecatedDashboardWidget.objects.filter(
+                                widget_id=OuterRef("pk"),
+                                dashboard_id=dashboard.id,
+                                is_visible=True,
+                            )
+                        )
+                    )
+                    .annotate(
+                        dashboard_filters=Subquery(
+                            DeprecatedDashboardWidget.objects.filter(
+                                widget_id=OuterRef("pk"),
+                                dashboard_id=dashboard.id,
+                                filters__isnull=False,
+                            )
+                            .exclude(filters={})
+                            .values("filters")[:1]
+                        )
+                    )
+                    .annotate(
+                        widget_filters=Case(
+                            When(
+                                dashboard_filters__isnull=False,
+                                then=F("dashboard_filters"),
+                            ),
+                            default=F("filters"),
+                            output_field=JSONField(),
+                        )
+                    )
+                )
+                return Response(
+                    {
+                        "dashboard": DashboardSerializer(dashboard).data,
+                        "widgets": WidgetSerializer(widgets, many=True).data,
+                    },
+                    status=status.HTTP_200_OK,
+                )
+            return Response(
+                {"error": "Please specify a valid dashboard type"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        widget_key = request.GET.get("widget_key", "overview_stats")
+
+        WIDGETS_MAPPER = {
+            "overview_stats": dashboard_overview_stats,
+            "assigned_issues": dashboard_assigned_issues,
+            "created_issues": dashboard_created_issues,
+            "issues_by_state_groups": dashboard_issues_by_state_groups,
+            "issues_by_priority": dashboard_issues_by_priority,
+            "recent_activity": dashboard_recent_activity,
+            "recent_projects": dashboard_recent_projects,
+            "recent_collaborators": dashboard_recent_collaborators,
+        }
+
+        func = WIDGETS_MAPPER.get(widget_key)
+        if func is not None:
+            response = func(self, request=request, slug=slug)
+            if isinstance(response, Response):
+                return response
+
+        return Response(
+            {"error": "Please specify a valid widget key"},
+            status=status.HTTP_400_BAD_REQUEST,
+        )
+
+
+class WidgetsEndpoint(BaseAPIView):
+    def patch(self, request, dashboard_id, widget_id):
+        dashboard_widget = DeprecatedDashboardWidget.objects.filter(
+            widget_id=widget_id, dashboard_id=dashboard_id
+        ).first()
+        dashboard_widget.is_visible = request.data.get(
+            "is_visible", dashboard_widget.is_visible
+        )
+        dashboard_widget.sort_order = request.data.get(
+            "sort_order", dashboard_widget.sort_order
+        )
+        dashboard_widget.filters = request.data.get("filters", dashboard_widget.filters)
+        dashboard_widget.save()
+        return Response({"message": "successfully updated"}, status=status.HTTP_200_OK)

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

@@ -3,7 +3,7 @@ import os
 from typing import List, Dict, Tuple
 
 # Third party import
-from openai import OpenAI
+import litellm
 import requests
 
 from rest_framework import status
@@ -116,14 +116,12 @@ def get_llm_response(task, prompt, api_key: str, model: str, provider: str) -> T
         if provider.lower() == "gemini":
             model = f"gemini/{model}"
 
-        client = OpenAI(api_key=api_key)
-        chat_completion = client.chat.completions.create(
+        response = litellm.completion(
             model=model,
-            messages=[
-                {"role": "user", "content": final_text}
-            ]
+            messages=[{"role": "user", "content": final_text}],
+            api_key=api_key,
         )
-        text = chat_completion.choices[0].message.content
+        text = response.choices[0].message.content.strip()
         return text, None
     except Exception as e:
         log_exception(e)
@@ -177,7 +175,7 @@ class WorkspaceGPTIntegrationEndpoint(BaseAPIView):
     @allow_permission(allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")
     def post(self, request, slug):
         api_key, model, provider = get_llm_config()
-
+        
         if not api_key or not model or not provider:
             return Response(
                 {"error": "LLM provider API key and model are required"},

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

@@ -174,19 +174,14 @@ class IntakeIssueViewSet(BaseViewSet):
 
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def list(self, request, slug, project_id):
-        intake = Intake.objects.filter(
+        intake_id = Intake.objects.filter(
             workspace__slug=slug, project_id=project_id
         ).first()
-        if not intake:
-            return Response(
-                {"error": "Intake not found"}, status=status.HTTP_404_NOT_FOUND
-            )
-
         project = Project.objects.get(pk=project_id)
         filters = issue_filters(request.GET, "GET", "issue__")
         intake_issue = (
             IntakeIssue.objects.filter(
-                intake_id=intake.id, project_id=project_id, **filters
+                intake_id=intake_id.id, project_id=project_id, **filters
             )
             .select_related("issue")
             .prefetch_related("issue__labels")
@@ -387,7 +382,7 @@ class IntakeIssueViewSet(BaseViewSet):
                 }
 
             issue_serializer = IssueCreateSerializer(
-                issue, data=issue_data, partial=True, context={"project_id": project_id}
+                issue, data=issue_data, partial=True
             )
 
             if issue_serializer.is_valid():

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

@@ -547,7 +547,7 @@ class IssueViewSet(BaseViewSet):
             )
 
         """
-        if the role is guest and guest_view_all_features is false and owned by is not
+        if the role is guest and guest_view_all_features is false and owned by is not 
         the requesting user then dont show the issue
         """
 
@@ -635,9 +635,7 @@ class IssueViewSet(BaseViewSet):
         )
 
         requested_data = json.dumps(self.request.data, cls=DjangoJSONEncoder)
-        serializer = IssueCreateSerializer(
-            issue, data=request.data, partial=True, context={"project_id": project_id}
-        )
+        serializer = IssueCreateSerializer(issue, data=request.data, partial=True)
         if serializer.is_valid():
             serializer.save()
             issue_activity.delay(
@@ -1101,6 +1099,7 @@ class IssueBulkUpdateDateEndpoint(BaseAPIView):
 
 
 class IssueMetaEndpoint(BaseAPIView):
+
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="PROJECT")
     def get(self, request, slug, project_id, issue_id):
         issue = Issue.issue_objects.only("sequence_id", "project__identifier").get(
@@ -1116,24 +1115,13 @@ class IssueMetaEndpoint(BaseAPIView):
 
 
 class IssueDetailIdentifierEndpoint(BaseAPIView):
-    def strict_str_to_int(self, s):
-        if not s.isdigit() and not (s.startswith("-") and s[1:].isdigit()):
-            raise ValueError("Invalid integer string")
-        return int(s)
 
     def get(self, request, slug, project_identifier, issue_identifier):
-        # Check if the issue identifier is a valid integer
-        try:
-            issue_identifier = self.strict_str_to_int(issue_identifier)
-        except ValueError:
-            return Response(
-                {"error": "Invalid issue identifier"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
+        
         # Fetch the project
         project = Project.objects.get(
-            identifier__iexact=project_identifier, workspace__slug=slug
+            identifier__iexact=project_identifier,
+            workspace__slug=slug,
         )
 
         # Check if the user is a member of the project
@@ -1235,8 +1223,8 @@ class IssueDetailIdentifierEndpoint(BaseAPIView):
             .annotate(
                 is_subscribed=Exists(
                     IssueSubscriber.objects.filter(
-                        workspace__slug=slug,
-                        project_id=project.id,
+                            workspace__slug=slug,
+                            project_id=project.id,
                         issue__sequence_id=issue_identifier,
                         subscriber=request.user,
                     )
@@ -1252,7 +1240,7 @@ class IssueDetailIdentifierEndpoint(BaseAPIView):
             )
 
         """
-        if the role is guest and guest_view_all_features is false and owned by is not
+        if the role is guest and guest_view_all_features is false and owned by is not 
         the requesting user then dont show the issue
         """
 

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

@@ -280,7 +280,7 @@ class ModuleIssueViewSet(BaseViewSet):
                 issue_id=str(issue_id),
                 project_id=str(project_id),
                 current_instance=json.dumps(
-                    {"module_name": module_issue.first().module.name if (module_issue.first() and module_issue.first().module) else None}
+                    {"module_name": module_issue.first().module.name}
                 ),
                 epoch=int(timezone.now().timestamp()),
                 notification=True,

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

@@ -34,22 +34,6 @@ class WorkspaceFavoriteEndpoint(BaseAPIView):
     def post(self, request, slug):
         try:
             workspace = Workspace.objects.get(slug=slug)
-
-            # If the favorite exists return
-            if request.data.get("entity_identifier"):
-                user_favorites = UserFavorite.objects.filter(
-                    workspace=workspace,
-                    user_id=request.user.id,
-                    entity_type=request.data.get("entity_type"),
-                    entity_identifier=request.data.get("entity_identifier"),
-                ).first()
-
-                # If the favorite exists return
-                if user_favorites:
-                    serializer = UserFavoriteSerializer(user_favorites)
-                    return Response(serializer.data, status=status.HTTP_200_OK)
-
-            # else create a new favorite
             serializer = UserFavoriteSerializer(data=request.data)
             if serializer.is_valid():
                 serializer.save(

apiserver/plane/authentication/views/app/password_management.py

@@ -100,20 +100,8 @@ class ResetPasswordEndpoint(View):
     def post(self, request, uidb64, token):
         try:
             # Decode the id from the uidb64
-            try:
-                id = smart_str(urlsafe_base64_decode(uidb64))
-                user = User.objects.get(id=id)
-            except (ValueError, User.DoesNotExist):
-                exc = AuthenticationException(
-                    error_code=AUTHENTICATION_ERROR_CODES["INVALID_PASSWORD_TOKEN"],
-                    error_message="INVALID_PASSWORD_TOKEN",
-                )
-                params = exc.get_error_dict()
-                url = urljoin(
-                    base_host(request=request, is_app=True),
-                    "accounts/reset-password?" + urlencode(params),
-                )
-                return HttpResponseRedirect(url)
+            id = smart_str(urlsafe_base64_decode(uidb64))
+            user = User.objects.get(id=id)
 
             # check if the token is valid for the user
             if not PasswordResetTokenGenerator().check_token(user, token):

apiserver/plane/bgtasks/issue_activities_task.py

@@ -9,10 +9,10 @@ from celery import shared_task
 from django.core.serializers.json import DjangoJSONEncoder
 from django.utils import timezone
 
-
-# Module imports
 from plane.app.serializers import IssueActivitySerializer
 from plane.bgtasks.notification_task import notifications
+
+# Module imports
 from plane.db.models import (
     CommentReaction,
     Cycle,
@@ -32,7 +32,6 @@ from plane.settings.redis import redis_instance
 from plane.utils.exception_logger import log_exception
 from plane.bgtasks.webhook_task import webhook_activity
 from plane.utils.issue_relation_mapper import get_inverse_relation
-from plane.utils.valid_uuid import is_valid_uuid
 
 
 # Track Changes in name
@@ -853,7 +852,7 @@ def delete_cycle_issue_activity(
     issues = requested_data.get("issues")
     for issue in issues:
         current_issue = Issue.objects.filter(pk=issue).first()
-        if current_issue:
+        if issue:
             current_issue.updated_at = timezone.now()
             current_issue.save(update_fields=["updated_at"])
         issue_activities.append(
@@ -1569,10 +1568,6 @@ def issue_activity(
     try:
         issue_activities = []
 
-        # check if project_id is valid
-        if not is_valid_uuid(str(project_id)):
-            return
-
         project = Project.objects.get(pk=project_id)
         workspace_id = project.workspace_id
 

apiserver/plane/db/migrations/0092_alter_deprecateddashboardwidget_unique_together_and_more.py

@@ -1,41 +0,0 @@
-# Generated by Django 4.2.18 on 2025-02-25 15:48
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("db", "0091_issuecomment_edited_at_and_more"),
-    ]
-
-    operations = [
-        migrations.AlterUniqueTogether(
-            name="deprecateddashboardwidget",
-            unique_together=None,
-        ),
-        migrations.RemoveField(
-            model_name="deprecateddashboardwidget",
-            name="created_by",
-        ),
-        migrations.RemoveField(
-            model_name="deprecateddashboardwidget",
-            name="dashboard",
-        ),
-        migrations.RemoveField(
-            model_name="deprecateddashboardwidget",
-            name="updated_by",
-        ),
-        migrations.RemoveField(
-            model_name="deprecateddashboardwidget",
-            name="widget",
-        ),
-        migrations.DeleteModel(
-            name="DeprecatedDashboard",
-        ),
-        migrations.DeleteModel(
-            name="DeprecatedDashboardWidget",
-        ),
-        migrations.DeleteModel(
-            name="DeprecatedWidget",
-        ),
-    ]

apiserver/plane/db/models/__init__.py

@@ -3,6 +3,7 @@ from .api import APIActivityLog, APIToken
 from .asset import FileAsset
 from .base import BaseModel
 from .cycle import Cycle, CycleIssue, CycleUserProperties
+from .dashboard import DeprecatedDashboard, DeprecatedDashboardWidget, DeprecatedWidget
 from .deploy_board import DeployBoard
 from .draft import (
     DraftIssue,

apiserver/plane/db/models/dashboard.py

@@ -0,0 +1,92 @@
+import uuid
+
+# Django imports
+from django.db import models
+
+# Module imports
+from ..mixins import TimeAuditModel
+from .base import BaseModel
+
+
+class DeprecatedDashboard(BaseModel):
+    DASHBOARD_CHOICES = (
+        ("workspace", "Workspace"),
+        ("project", "Project"),
+        ("home", "Home"),
+        ("team", "Team"),
+        ("user", "User"),
+    )
+    name = models.CharField(max_length=255)
+    description_html = models.TextField(blank=True, default="<p></p>")
+    identifier = models.UUIDField(null=True)
+    owned_by = models.ForeignKey(
+        "db.User", on_delete=models.CASCADE, related_name="dashboards"
+    )
+    is_default = models.BooleanField(default=False)
+    type_identifier = models.CharField(
+        max_length=30,
+        choices=DASHBOARD_CHOICES,
+        verbose_name="Dashboard Type",
+        default="home",
+    )
+    logo_props = models.JSONField(default=dict)
+
+    def __str__(self):
+        """Return name of the dashboard"""
+        return f"{self.name}"
+
+    class Meta:
+        verbose_name = "DeprecatedDashboard"
+        verbose_name_plural = "DeprecatedDashboards"
+        db_table = "deprecated_dashboards"
+        ordering = ("-created_at",)
+
+
+class DeprecatedWidget(TimeAuditModel):
+    id = models.UUIDField(
+        default=uuid.uuid4, unique=True, editable=False, db_index=True, primary_key=True
+    )
+    key = models.CharField(max_length=255)
+    filters = models.JSONField(default=dict)
+    logo_props = models.JSONField(default=dict)
+
+    def __str__(self):
+        """Return name of the widget"""
+        return f"{self.key}"
+
+    class Meta:
+        verbose_name = "DeprecatedWidget"
+        verbose_name_plural = "DeprecatedWidgets"
+        db_table = "deprecated_widgets"
+        ordering = ("-created_at",)
+
+
+class DeprecatedDashboardWidget(BaseModel):
+    widget = models.ForeignKey(
+        DeprecatedWidget, on_delete=models.CASCADE, related_name="dashboard_widgets"
+    )
+    dashboard = models.ForeignKey(
+        DeprecatedDashboard, on_delete=models.CASCADE, related_name="dashboard_widgets"
+    )
+    is_visible = models.BooleanField(default=True)
+    sort_order = models.FloatField(default=65535)
+    filters = models.JSONField(default=dict)
+    properties = models.JSONField(default=dict)
+
+    def __str__(self):
+        """Return name of the dashboard"""
+        return f"{self.dashboard.name} {self.widget.key}"
+
+    class Meta:
+        unique_together = ("widget", "dashboard", "deleted_at")
+        constraints = [
+            models.UniqueConstraint(
+                fields=["widget", "dashboard"],
+                condition=models.Q(deleted_at__isnull=True),
+                name="dashboard_widget_unique_widget_dashboard_when_deleted_at_null",
+            )
+        ]
+        verbose_name = "Deprecated Dashboard Widget"
+        verbose_name_plural = "Deprecated Dashboard Widgets"
+        db_table = "deprecated_dashboard_widgets"
+        ordering = ("-created_at",)

apiserver/plane/license/api/views/admin.py

@@ -11,6 +11,7 @@ from django.core.exceptions import ValidationError
 from django.utils import timezone
 from django.contrib.auth.hashers import make_password
 from django.contrib.auth import logout
+from django.utils.http import url_has_allowed_host_and_scheme
 
 # Third party imports
 from rest_framework.response import Response
@@ -248,11 +249,12 @@ class InstanceAdminSignInEndpoint(View):
                 error_code=AUTHENTICATION_ERROR_CODES["INSTANCE_NOT_CONFIGURED"],
                 error_message="INSTANCE_NOT_CONFIGURED",
             )
-            url = urljoin(
-                base_host(request=request, is_admin=True),
-                "?" + urlencode(exc.get_error_dict()),
-            )
-            return HttpResponseRedirect(url)
+            base_url = base_host(request=request, is_admin=True)
+            redirect_url = urljoin(base_url, "?" + urlencode(exc.get_error_dict()))
+            if url_has_allowed_host_and_scheme(redirect_url, allowed_hosts=None):
+                return HttpResponseRedirect(redirect_url)
+            else:
+                return HttpResponseRedirect('/')
 
         # Get email and password
         email = request.POST.get("email", False)
@@ -265,11 +267,12 @@ class InstanceAdminSignInEndpoint(View):
                 error_message="REQUIRED_ADMIN_EMAIL_PASSWORD",
                 payload={"email": email},
             )
-            url = urljoin(
-                base_host(request=request, is_admin=True),
-                "?" + urlencode(exc.get_error_dict()),
-            )
-            return HttpResponseRedirect(url)
+            base_url = base_host(request=request, is_admin=True)
+            redirect_url = urljoin(base_url, "?" + urlencode(exc.get_error_dict()))
+            if url_has_allowed_host_and_scheme(redirect_url, allowed_hosts=None):
+                return HttpResponseRedirect(redirect_url)
+            else:
+                return HttpResponseRedirect('/')
 
         # Validate the email
         email = email.strip().lower()
@@ -281,11 +284,12 @@ class InstanceAdminSignInEndpoint(View):
                 error_message="INVALID_ADMIN_EMAIL",
                 payload={"email": email},
             )
-            url = urljoin(
-                base_host(request=request, is_admin=True),
-                "?" + urlencode(exc.get_error_dict()),
-            )
-            return HttpResponseRedirect(url)
+            base_url = base_host(request=request, is_admin=True)
+            redirect_url = urljoin(base_url, "?" + urlencode(exc.get_error_dict()))
+            if url_has_allowed_host_and_scheme(redirect_url, allowed_hosts=None):
+                return HttpResponseRedirect(redirect_url)
+            else:
+                return HttpResponseRedirect('/')
 
         # Fetch the user
         user = User.objects.filter(email=email).first()
@@ -297,11 +301,12 @@ class InstanceAdminSignInEndpoint(View):
                 error_message="ADMIN_USER_DOES_NOT_EXIST",
                 payload={"email": email},
             )
-            url = urljoin(
-                base_host(request=request, is_admin=True),
-                "?" + urlencode(exc.get_error_dict()),
-            )
-            return HttpResponseRedirect(url)
+            base_url = base_host(request=request, is_admin=True)
+            redirect_url = urljoin(base_url, "?" + urlencode(exc.get_error_dict()))
+            if url_has_allowed_host_and_scheme(redirect_url, allowed_hosts=None):
+                return HttpResponseRedirect(redirect_url)
+            else:
+                return HttpResponseRedirect('/')
 
         # is_active
         if not user.is_active:
@@ -309,11 +314,12 @@ class InstanceAdminSignInEndpoint(View):
                 error_code=AUTHENTICATION_ERROR_CODES["ADMIN_USER_DEACTIVATED"],
                 error_message="ADMIN_USER_DEACTIVATED",
             )
-            url = urljoin(
-                base_host(request=request, is_admin=True),
-                "?" + urlencode(exc.get_error_dict()),
-            )
-            return HttpResponseRedirect(url)
+            base_url = base_host(request=request, is_admin=True)
+            redirect_url = urljoin(base_url, "?" + urlencode(exc.get_error_dict()))
+            if url_has_allowed_host_and_scheme(redirect_url, allowed_hosts=None):
+                return HttpResponseRedirect(redirect_url)
+            else:
+                return HttpResponseRedirect('/')
 
         # Check password of the user
         if not user.check_password(password):

apiserver/plane/settings/storage.py

@@ -32,12 +32,6 @@ class S3Storage(S3Boto3Storage):
         ) or os.environ.get("MINIO_ENDPOINT_URL")
 
         if os.environ.get("USE_MINIO") == "1":
-
-            # Determine protocol based on environment variable
-            if os.environ.get("MINIO_ENDPOINT_SSL") == "1":
-                endpoint_protocol = "https"
-            else:
-                endpoint_protocol = request.scheme if request else "http"
             # Create an S3 client for MinIO
             self.s3_client = boto3.client(
                 "s3",
@@ -45,7 +39,7 @@ class S3Storage(S3Boto3Storage):
                 aws_secret_access_key=self.aws_secret_access_key,
                 region_name=self.aws_region,
                 endpoint_url=(
-                    f"{endpoint_protocol}://{request.get_host()}"
+                    f"{request.scheme}://{request.get_host()}"
                     if request
                     else self.aws_s3_endpoint_url
                 ),

apiserver/plane/space/views/intake.py

@@ -12,7 +12,7 @@ from rest_framework.response import Response
 
 # Module imports
 from .base import BaseViewSet
-from plane.db.models import IntakeIssue, Issue, IssueLink, FileAsset, DeployBoard
+from plane.db.models import IntakeIssue, Issue, State, IssueLink, FileAsset, DeployBoard
 from plane.app.serializers import (
     IssueSerializer,
     IntakeIssueSerializer,
@@ -202,12 +202,7 @@ class IntakeIssuePublicViewSet(BaseViewSet):
             "description": issue_data.get("description", issue.description),
         }
 
-        issue_serializer = IssueCreateSerializer(
-            issue,
-            data=issue_data,
-            partial=True,
-            context={"project_id": project_deploy_board.project_id},
-        )
+        issue_serializer = IssueCreateSerializer(issue, data=issue_data, partial=True)
 
         if issue_serializer.is_valid():
             current_instance = issue

apiserver/plane/utils/timezone_converter.py

@@ -77,7 +77,7 @@ def convert_to_utc(
         current_datetime_in_project_tz = timezone.now().astimezone(local_tz)
         current_datetime_in_utc = current_datetime_in_project_tz.astimezone(pytz.utc)
 
-        if localized_datetime.date() == current_datetime_in_project_tz.date():
+        if utc_datetime.date() == current_datetime_in_utc.date():
             return current_datetime_in_utc
 
         return utc_datetime

apiserver/plane/utils/valid_uuid.py

@@ -1,8 +0,0 @@
-import uuid
-
-def is_valid_uuid(uuid_str):
-    try:
-        uuid.UUID(uuid_str, version=4)
-        return True
-    except ValueError:
-        return False

apiserver/requirements/base.txt

@@ -1,10 +1,10 @@
 # base requirements
 
 # django
-Django==4.2.20
+Django==4.2.18
 # rest framework
 djangorestframework==3.15.2
-# postgres
+# postgres 
 psycopg==3.1.18
 psycopg-binary==3.1.18
 psycopg-c==3.1.18
@@ -37,7 +37,7 @@ uvicorn==0.29.0
 # sockets
 channels==4.1.0
 # ai
-openai==1.63.2
+litellm==1.51.0
 # slack
 slack-sdk==3.27.1
 # apm
@@ -66,4 +66,4 @@ PyJWT==2.8.0
 opentelemetry-api==1.28.1
 opentelemetry-sdk==1.28.1
 opentelemetry-instrumentation-django==0.49b1
-opentelemetry-exporter-otlp==1.28.1
+opentelemetry-exporter-otlp==1.28.1

apiserver/requirements/local.txt

@@ -2,4 +2,4 @@
 # debug toolbar
 django-debug-toolbar==4.3.0
 # formatter
-ruff==0.9.7
+ruff==0.4.2

deploy/selfhost/README.md

@@ -55,30 +55,18 @@ Installing plane is a very easy and minimal step process.
 - User context used must have access to docker services. In most cases, use sudo su to switch as root user
 - Use the terminal (or gitbash) window to run all the future steps
 
-### Downloading Latest Release
+### Downloading Latest Stable Release
 
 ```
 mkdir plane-selfhost
 
 cd plane-selfhost
-```
 
-#### For *Docker Compose* based setup
-
-```
 curl -fsSL -o setup.sh https://github.com/makeplane/plane/releases/latest/download/setup.sh
 
 chmod +x setup.sh
 ```
 
-#### For *Docker Swarm* based setup
-
-```
-curl -fsSL -o setup.sh https://github.com/makeplane/plane/releases/latest/download/swarm.sh
-
-chmod +x setup.sh
-```
-
 ---
 
 ### Proceed with setup
@@ -89,9 +77,8 @@ Lets get started by running the `./setup.sh` command.
 
 This will prompt you with the below options.
 
-#### Docker Compose 
 ```bash
-Select an Action you want to perform:
+Select a Action you want to perform:
    1) Install (x86_64)
    2) Start
    3) Stop
@@ -100,42 +87,17 @@ Select an Action you want to perform:
    6) View Logs
    7) Backup Data
    8) Exit
-
 Action [2]: 1
 ```
 
 For the 1st time setup, type "1" as action input.
 
-This will create a folder `plane-app` and will download 2 files inside that
+This will create a create a folder `plane-app` or `plane-app-preview` (in case of preview deployment) and will download 2 files inside that
 
 - `docker-compose.yaml`
 - `plane.env`
 
-Again the `options [1-8]` will be popped up, and this time hit `8` to exit.
-
-#### Docker Swarm
-
-```bash
-Select an Action you want to perform:
-   1) Deploy Stack
-   2) Remove Stack
-   3) View Stack Status
-   4) Redeploy Stack
-   5) Upgrade
-   6) View Logs
-   7) Exit
-
-Action [3]: 1
-```
-
-For the 1st time setup, type "1" as action input.
-
-This will create a create a folder `plane-app` and will download 2 files inside that
-
-- `docker-compose.yaml`
-- `plane.env`
-
-Again the `options [1-7]` will be popped up, and this time hit `7` to exit.
+Again the `options [1-8]` will be popped up and this time hit `8` to exit.
 
 ---
 
@@ -154,7 +116,7 @@ There are many other settings you can play with, but we suggest you configure `E
 
 ---
 
-### Continue with setup - Start Server (Docker Compose)
+### Continue with setup - Start Server
 
 Lets again run the `./setup.sh` command. You will again be prompted with the below options. This time select `2` to start the sevices
 
@@ -185,11 +147,9 @@ You have successfully self hosted `Plane` instance. Access the application by go
 
 ---
 
-### Stopping the Server / Remove Stack
+### Stopping the Server
 
-In case you want to make changes to `plane.env` variables, we suggest you to stop the services before doing that.
-
-#### Docker Compose 
+In case you want to make changes to `.env` variables, we suggest you to stop the services before doing that.
 
 Lets again run the `./setup.sh` command. You will again be prompted with the below options. This time select `3` to stop the sevices
 
@@ -211,34 +171,14 @@ If all goes well, you must see something like this
 
 ![Stop Services](images/stopped.png)
 
-#### Docker Swarm
-
-Lets again run the `./setup.sh` command. You will again be prompted with the below options. This time select `2` to stop the sevices
-
-```bash
-Select an Action you want to perform:
-   1) Deploy Stack
-   2) Remove Stack
-   3) View Stack Status
-   4) Redeploy Stack
-   5) Upgrade
-   6) View Logs
-   7) Exit
-
-Action [3]: 2
-```
-
-If all goes well, you will see the confirmation from docker cli
-
 ---
 
-### Restarting the Server / Redeploy Stack
+### Restarting the Server
 
-In case you want to make changes to `plane.env` variables, without stopping the server or you noticed some abnormalies in services, you can restart the services with `RESTART` / `REDEPLOY` option.
+In case you want to make changes to `.env` variables, without stopping the server or you noticed some abnormalies in services, you can restart the services with RESTART option.
 
 Lets again run the `./setup.sh` command. You will again be prompted with the below options. This time select `4` to restart the sevices
 
-#### Docker Compose
 ```bash
 Select a Action you want to perform:
    1) Install (x86_64)
@@ -257,32 +197,14 @@ If all goes well, you must see something like this
 
 ![Restart Services](images/restart.png)
 
-#### Docker Swarm
-
-```bash
-   1) Deploy Stack
-   2) Remove Stack
-   3) View Stack Status
-   4) Redeploy Stack
-   5) Upgrade
-   6) View Logs
-   7) Exit
-
-Action [3]: 4
-```
-
-If all goes well, you will see the confirmation from docker cli
-
 ---
 
-### Upgrading Plane Version 
+### Upgrading Plane Version
 
 It is always advised to keep Plane up to date with the latest release.
 
 Lets again run the `./setup.sh` command. You will again be prompted with the below options. This time select `5` to upgrade the release.
 
-#### Docker Compose
-
 ```bash
 Select a Action you want to perform:
    1) Install (x86_64)
@@ -309,41 +231,13 @@ Once done, choose `8` to exit from prompt.
 
 Once done with making changes in `plane.env` file, jump on to `Start Server`
 
-#### Docker Swarm
-
-Lets again run the `./setup.sh` command. You will again be prompted with the below options. This time select `5` to upgrade the release.
-
-```bash
-   1) Deploy Stack
-   2) Remove Stack
-   3) View Stack Status
-   4) Redeploy Stack
-   5) Upgrade
-   6) View Logs
-   7) Exit
-
-Action [3]: 5
-```
-
-By choosing this, it will stop the services and then will download the latest `docker-compose.yaml` and `plane.env`.
-
-Once done, choose `7` to exit from prompt.
-
-> It is very important for you to validate the `plane.env` for the new changes.
-
-Once done with making changes in `plane.env` file, jump on to `Redeploy Stack`
-
 ---
 
 ### View Logs
 
 There would a time when you might want to check what is happening inside the API, Worker or any other container.  
 
-Lets again run the `./setup.sh` command. You will again be prompted with the below options. 
-
-This time select `6` to view logs.
-
-#### Docker Compose
+Lets again run the `./setup.sh` command. You will again be prompted with the below options. This time select `6` to view logs.
 
 ```bash
 Select a Action you want to perform:
@@ -359,22 +253,7 @@ Select a Action you want to perform:
 Action [2]: 6
 ```
 
-#### Docker Swarm
 
-
-```bash
-   1) Deploy Stack
-   2) Remove Stack
-   3) View Stack Status
-   4) Redeploy Stack
-   5) Upgrade
-   6) View Logs
-   7) Exit
-
-Action [3]: 6
-```
-
-#### Service Menu Options for Logs
 This will further open sub-menu with list of services
 ```bash
 Select a Service you want to view the logs for:
@@ -388,10 +267,9 @@ Select a Service you want to view the logs for:
    8) Redis
    9) Postgres
    10) Minio
-   11) RabbitMQ
    0) Back to Main Menu
 
-Service: 3
+Service: 
 ```
 
 Select any of the service to view the logs e.g. `3`. Expect something similar to this
@@ -445,7 +323,7 @@ Similarly, you can view the logs of other services.
 
 ---
 
-### Backup Data (Docker Compose)
+### Backup Data
 
 There would a time when you might want to backup your data from docker volumes to external storage like S3 or drives.
 
@@ -477,7 +355,7 @@ Backup completed successfully. Backup files are stored in /....../plane-app/back
 
 ---
 
-### Restore Data (Docker Compose)
+### Restore Data
 
 When you want to restore the previously backed-up data, follow the instructions below.
 

deploy/selfhost/docker-compose.yml

@@ -15,7 +15,7 @@ x-redis-env: &redis-env
 x-minio-env: &minio-env
   MINIO_ROOT_USER: ${AWS_ACCESS_KEY_ID:-access-key}
   MINIO_ROOT_PASSWORD: ${AWS_SECRET_ACCESS_KEY:-secret-key}
-
+  
 x-aws-s3-env: &aws-s3-env
   AWS_REGION: ${AWS_REGION:-}
   AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID:-access-key}
@@ -28,7 +28,8 @@ x-proxy-env: &proxy-env
   BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads}
   FILE_SIZE_LIMIT: ${FILE_SIZE_LIMIT:-5242880}
 
-x-mq-env: &mq-env # RabbitMQ Settings
+x-mq-env: &mq-env
+  # RabbitMQ Settings
   RABBITMQ_HOST: ${RABBITMQ_HOST:-plane-mq}
   RABBITMQ_PORT: ${RABBITMQ_PORT:-5672}
   RABBITMQ_DEFAULT_USER: ${RABBITMQ_USER:-plane}
@@ -49,29 +50,33 @@ x-app-env: &app-env
   USE_MINIO: ${USE_MINIO:-1}
   DATABASE_URL: ${DATABASE_URL:-postgresql://plane:plane@plane-db/plane}
   SECRET_KEY: ${SECRET_KEY:-60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5}
+  ADMIN_BASE_URL: ${ADMIN_BASE_URL}
+  SPACE_BASE_URL: ${SPACE_BASE_URL}
+  APP_BASE_URL: ${APP_BASE_URL}
   AMQP_URL: ${AMQP_URL:-amqp://plane:plane@plane-mq:5672/plane}
-  API_KEY_RATE_LIMIT: ${API_KEY_RATE_LIMIT:-60/minute}
-  MINIO_ENDPOINT_SSL: ${MINIO_ENDPOINT_SSL:-0}
+
 
 services:
   web:
     image: ${DOCKERHUB_USER:-makeplane}/plane-frontend:${APP_RELEASE:-stable}
+    platform: ${DOCKER_PLATFORM:-}
+    pull_policy: if_not_present
+    restart: unless-stopped
     command: node web/server.js web
     deploy:
       replicas: ${WEB_REPLICAS:-1}
-      restart_policy:
-        condition: on-failure
     depends_on:
       - api
       - worker
 
   space:
     image: ${DOCKERHUB_USER:-makeplane}/plane-space:${APP_RELEASE:-stable}
+    platform: ${DOCKER_PLATFORM:-}
+    pull_policy: if_not_present
+    restart: unless-stopped
     command: node space/server.js space
     deploy:
       replicas: ${SPACE_REPLICAS:-1}
-      restart_policy:
-        condition: on-failure
     depends_on:
       - api
       - worker
@@ -79,39 +84,42 @@ services:
 
   admin:
     image: ${DOCKERHUB_USER:-makeplane}/plane-admin:${APP_RELEASE:-stable}
+    platform: ${DOCKER_PLATFORM:-}
+    pull_policy: if_not_present
+    restart: unless-stopped
     command: node admin/server.js admin
     deploy:
       replicas: ${ADMIN_REPLICAS:-1}
-      restart_policy:
-        condition: on-failure
     depends_on:
       - api
       - web
 
   live:
     image: ${DOCKERHUB_USER:-makeplane}/plane-live:${APP_RELEASE:-stable}
+    platform: ${DOCKER_PLATFORM:-}
+    pull_policy: if_not_present
+    restart: unless-stopped
     command: node live/dist/server.js live
     environment:
-      <<: [*live-env]
+      <<: [ *live-env ]
     deploy:
       replicas: ${LIVE_REPLICAS:-1}
-      restart_policy:
-        condition: on-failure
     depends_on:
       - api
       - web
 
   api:
     image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-stable}
+    platform: ${DOCKER_PLATFORM:-}
+    pull_policy: if_not_present
+    restart: unless-stopped
     command: ./bin/docker-entrypoint-api.sh
     deploy:
       replicas: ${API_REPLICAS:-1}
-      restart_policy:
-        condition: on-failure
     volumes:
       - logs_api:/code/plane/logs
     environment:
-      <<: [*app-env, *db-env, *redis-env, *minio-env, *aws-s3-env, *proxy-env]
+      <<: [ *app-env, *db-env, *redis-env, *minio-env, *aws-s3-env, *proxy-env ]
     depends_on:
       - plane-db
       - plane-redis
@@ -119,15 +127,14 @@ services:
 
   worker:
     image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-stable}
+    platform: ${DOCKER_PLATFORM:-}
+    pull_policy: if_not_present
+    restart: unless-stopped
     command: ./bin/docker-entrypoint-worker.sh
-    deploy:
-      replicas: ${WORKER_REPLICAS:-1}
-      restart_policy:
-        condition: on-failure
     volumes:
       - logs_worker:/code/plane/logs
     environment:
-      <<: [*app-env, *db-env, *redis-env, *minio-env, *aws-s3-env, *proxy-env]
+      <<: [ *app-env, *db-env, *redis-env, *minio-env, *aws-s3-env, *proxy-env ]
     depends_on:
       - api
       - plane-db
@@ -136,15 +143,14 @@ services:
 
   beat-worker:
     image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-stable}
+    platform: ${DOCKER_PLATFORM:-}
+    pull_policy: if_not_present
+    restart: unless-stopped
     command: ./bin/docker-entrypoint-beat.sh
-    deploy:
-      replicas: ${BEAT_WORKER_REPLICAS:-1}
-      restart_policy:
-        condition: on-failure
     volumes:
       - logs_beat-worker:/code/plane/logs
     environment:
-      <<: [*app-env, *db-env, *redis-env, *minio-env, *aws-s3-env, *proxy-env]
+      <<: [ *app-env, *db-env, *redis-env, *minio-env, *aws-s3-env, *proxy-env ]
     depends_on:
       - api
       - plane-db
@@ -153,27 +159,23 @@ services:
 
   migrator:
     image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-stable}
+    platform: ${DOCKER_PLATFORM:-}
+    pull_policy: if_not_present
+    restart: "no"
     command: ./bin/docker-entrypoint-migrator.sh
-    deploy:
-      replicas: 1
-      restart_policy:
-        condition: on-failure
     volumes:
       - logs_migrator:/code/plane/logs
     environment:
-      <<: [*app-env, *db-env, *redis-env, *minio-env, *aws-s3-env, *proxy-env]
+      <<: [ *app-env, *db-env, *redis-env, *minio-env, *aws-s3-env, *proxy-env ]
     depends_on:
       - plane-db
       - plane-redis
 
-  # Comment this if you already have a database running
   plane-db:
     image: postgres:15.7-alpine
+    pull_policy: if_not_present
+    restart: unless-stopped
     command: postgres -c 'max_connections=1000'
-    deploy:
-      replicas: 1
-      restart_policy:
-        condition: on-failure
     environment:
       <<: *db-env
     volumes:
@@ -181,32 +183,24 @@ services:
 
   plane-redis:
     image: valkey/valkey:7.2.5-alpine
-    deploy:
-      replicas: 1
-      restart_policy:
-        condition: on-failure
+    pull_policy: if_not_present
+    restart: unless-stopped
     volumes:
       - redisdata:/data
 
   plane-mq:
     image: rabbitmq:3.13.6-management-alpine
-    deploy:
-      replicas: 1
-      restart_policy:
-        condition: on-failure
+    restart: always
     environment:
       <<: *mq-env
     volumes:
       - rabbitmq_data:/var/lib/rabbitmq
 
-  # Comment this if you using any external s3 compatible storage
   plane-minio:
     image: minio/minio:latest
+    pull_policy: if_not_present
+    restart: unless-stopped
     command: server /export --console-address ":9090"
-    deploy:
-      replicas: 1
-      restart_policy:
-        condition: on-failure
     environment:
       <<: *minio-env
     volumes:
@@ -215,17 +209,13 @@ services:
   # Comment this if you already have a reverse proxy running
   proxy:
     image: ${DOCKERHUB_USER:-makeplane}/plane-proxy:${APP_RELEASE:-stable}
+    platform: ${DOCKER_PLATFORM:-}
+    pull_policy: if_not_present
+    restart: unless-stopped
     ports:
-      - target: 80
-        published: ${NGINX_PORT:-80}
-        protocol: tcp
-        mode: host
+      - ${NGINX_PORT}:80
     environment:
       <<: *proxy-env
-    deploy:
-      replicas: 1
-      restart_policy:
-        condition: on-failure
     depends_on:
       - web
       - api
@@ -234,6 +224,7 @@ services:
 volumes:
   pgdata:
   redisdata:
+  
   uploads:
   logs_api:
   logs_worker:

deploy/selfhost/install.sh

@@ -457,13 +457,12 @@ function viewLogs(){
         echo "   8) Redis"
         echo "   9) Postgres"
         echo "   10) Minio"
-        echo "   11) RabbitMQ"
         echo "   0) Back to Main Menu"
         echo 
         read -p "Service: " DOCKER_SERVICE_NAME
 
-        until (( DOCKER_SERVICE_NAME >= 0 && DOCKER_SERVICE_NAME <= 11 )); do
-            echo "Invalid selection. Please enter a number between 0 and 11."
+        until (( DOCKER_SERVICE_NAME >= 0 && DOCKER_SERVICE_NAME <= 10 )); do
+            echo "Invalid selection. Please enter a number between 1 and 11."
             read -p "Service: " DOCKER_SERVICE_NAME
         done
 
@@ -482,7 +481,6 @@ function viewLogs(){
                 8) viewSpecificLogs "plane-redis";;
                 9) viewSpecificLogs "plane-db";;
                 10) viewSpecificLogs "plane-minio";;
-                11) viewSpecificLogs "plane-mq";;
                 0) askForAction;;
                 *) echo "INVALID SERVICE NAME SUPPLIED";;
             esac
@@ -501,7 +499,6 @@ function viewLogs(){
             redis) viewSpecificLogs "plane-redis";;
             postgres) viewSpecificLogs "plane-db";;
             minio) viewSpecificLogs "plane-minio";;
-            rabbitmq) viewSpecificLogs "plane-mq";;
             *) echo "INVALID SERVICE NAME SUPPLIED";;
         esac
     else

deploy/selfhost/swarm.sh

@@ -1,612 +0,0 @@
-#!/bin/bash
-
-BRANCH=${BRANCH:-master}
-SERVICE_FOLDER=plane-app
-SCRIPT_DIR=$PWD
-PLANE_INSTALL_DIR=$PWD/$SERVICE_FOLDER
-export APP_RELEASE="stable"
-export DOCKERHUB_USER=makeplane
-
-export GH_REPO=makeplane/plane
-export RELEASE_DOWNLOAD_URL="https://github.com/$GH_REPO/releases/download"
-export FALLBACK_DOWNLOAD_URL="https://raw.githubusercontent.com/$GH_REPO/$BRANCH/deploy/selfhost"
-
-OS_NAME=$(uname)
-
-# Create necessary directories
-mkdir -p $PLANE_INSTALL_DIR/archive
-
-DOCKER_FILE_PATH=$PLANE_INSTALL_DIR/docker-compose.yml
-DOCKER_ENV_PATH=$PLANE_INSTALL_DIR/plane.env
-
-function print_header() {
-clear
-
-cat <<"EOF"
---------------------------------------------
- ____  _                          ///////// 
-|  _ \| | __ _ _ __   ___         ///////// 
-| |_) | |/ _` | '_ \ / _ \   /////    ///// 
-|  __/| | (_| | | | |  __/   /////    ///// 
-|_|   |_|\__,_|_| |_|\___|        ////      
-                                  ////      
---------------------------------------------
-Project management tool from the future
---------------------------------------------
-EOF
-}
-
-function checkLatestRelease(){
-    echo "Checking for the latest release..." >&2
-    local latest_release=$(curl -s https://api.github.com/repos/$GH_REPO/releases/latest |  grep -o '"tag_name": "[^"]*"' | sed 's/"tag_name": "//;s/"//g')
-    if [ -z "$latest_release" ]; then
-        echo "Failed to check for the latest release. Exiting..." >&2
-        exit 1
-    fi
-
-    echo $latest_release    
-}
-
-# Function to read stack name from env file
-function readStackName() {
-    if [ -f "$DOCKER_ENV_PATH" ]; then
-        local saved_stack_name=$(grep "^STACK_NAME=" "$DOCKER_ENV_PATH" | cut -d'=' -f2)
-        if [ -n "$saved_stack_name" ]; then
-            stack_name=$saved_stack_name
-            return 1
-        fi
-    fi
-    return 0
-}
-
-# Function to get stack name (either from env or user input)
-function getStackName() {
-    read -p "Enter stack name [plane]: " input_stack_name
-    if [ -z "$input_stack_name" ]; then
-        input_stack_name="plane"
-    fi
-    stack_name=$input_stack_name
-    updateEnvFile "STACK_NAME" "$stack_name" "$DOCKER_ENV_PATH"
-    echo "Using stack name: $stack_name"
-}
-
-function syncEnvFile(){
-    echo "Syncing environment variables..." >&2
-    if [ -f "$PLANE_INSTALL_DIR/plane.env.bak" ]; then        
-        # READ keys of plane.env and update the values from plane.env.bak
-        while IFS= read -r line
-        do
-            # ignore if the line is empty or starts with #
-            if [ -z "$line" ] || [[ $line == \#* ]]; then
-                continue
-            fi
-            key=$(echo "$line" | cut -d'=' -f1)
-            value=$(getEnvValue "$key" "$PLANE_INSTALL_DIR/plane.env.bak")
-            if [ -n "$value" ]; then
-                updateEnvFile "$key" "$value" "$DOCKER_ENV_PATH"
-            fi
-        done < "$DOCKER_ENV_PATH"
-
-        value=$(getEnvValue "STACK_NAME" "$PLANE_INSTALL_DIR/plane.env.bak")
-        if [ -n "$value" ]; then
-            updateEnvFile "STACK_NAME" "$value" "$DOCKER_ENV_PATH"
-        fi
-    fi
-    echo "Environment variables synced successfully" >&2
-    rm -f $PLANE_INSTALL_DIR/plane.env.bak
-}
-
-function getEnvValue() {
-    local key=$1
-    local file=$2
-
-    if [ -z "$key" ] || [ -z "$file" ]; then
-        echo "Invalid arguments supplied"
-        exit 1
-    fi
-
-    if [ -f "$file" ]; then
-        grep -q "^$key=" "$file"
-        if [ $? -eq 0 ]; then
-            local value
-            value=$(grep "^$key=" "$file" | cut -d'=' -f2)
-            echo "$value"
-        else
-            echo ""
-        fi
-    fi
-}
-
-function updateEnvFile() {
-    local key=$1
-    local value=$2
-    local file=$3
-
-    if [ -z "$key" ] || [ -z "$value" ] || [ -z "$file" ]; then
-        echo "Invalid arguments supplied"
-        exit 1
-    fi
-
-    if [ -f "$file" ]; then
-        # check if key exists in the file
-        grep -q "^$key=" "$file"
-        if [ $? -ne 0 ]; then
-            echo "$key=$value" >> "$file"
-            return
-        else 
-            if [ "$OS_NAME" == "Darwin" ]; then
-                value=$(echo "$value" | sed 's/|/\\|/g')
-                sed -i '' "s|^$key=.*|$key=$value|g" "$file"
-            else
-                sed -i "s/^$key=.*/$key=$value/g" "$file"
-            fi
-        fi
-    else
-        echo "File not found: $file"
-        exit 1
-    fi
-}
-
-function download() {
-    cd $SCRIPT_DIR || exit 1  
-    TS=$(date +%s)
-    if [ -f "$PLANE_INSTALL_DIR/docker-compose.yml" ]
-    then
-        mv $PLANE_INSTALL_DIR/docker-compose.yml $PLANE_INSTALL_DIR/archive/$TS.docker-compose.yml
-    fi
-
-    echo $RELEASE_DOWNLOAD_URL
-    echo $FALLBACK_DOWNLOAD_URL
-    echo $APP_RELEASE
-
-    RESPONSE=$(curl -H 'Cache-Control: no-cache, no-store' -s -w "HTTPSTATUS:%{http_code}" "$RELEASE_DOWNLOAD_URL/$APP_RELEASE/docker-compose.yml?$(date +%s)")
-    BODY=$(echo "$RESPONSE" | sed -e 's/HTTPSTATUS\:.*//g')
-    STATUS=$(echo "$RESPONSE" | tr -d '\n' | sed -e 's/.*HTTPSTATUS://')
-
-    if [ "$STATUS" -eq 200 ]; then
-        echo "$BODY" > $PLANE_INSTALL_DIR/docker-compose.yml
-    else
-        # Fallback to download from the raw github url
-        RESPONSE=$(curl -H 'Cache-Control: no-cache, no-store' -s -w "HTTPSTATUS:%{http_code}" "$FALLBACK_DOWNLOAD_URL/docker-compose.yml?$(date +%s)")
-        BODY=$(echo "$RESPONSE" | sed -e 's/HTTPSTATUS\:.*//g')
-        STATUS=$(echo "$RESPONSE" | tr -d '\n' | sed -e 's/.*HTTPSTATUS://')
-
-        if [ "$STATUS" -eq 200 ]; then
-            echo "$BODY" > $PLANE_INSTALL_DIR/docker-compose.yml
-        else
-            echo "Failed to download docker-compose.yml. HTTP Status: $STATUS"
-            echo "URL: $RELEASE_DOWNLOAD_URL/$APP_RELEASE/docker-compose.yml"
-            mv $PLANE_INSTALL_DIR/archive/$TS.docker-compose.yml $PLANE_INSTALL_DIR/docker-compose.yml
-            exit 1
-        fi
-    fi
-
-    RESPONSE=$(curl -H 'Cache-Control: no-cache, no-store' -s -w "HTTPSTATUS:%{http_code}" "$RELEASE_DOWNLOAD_URL/$APP_RELEASE/variables.env?$(date +%s)")
-    BODY=$(echo "$RESPONSE" | sed -e 's/HTTPSTATUS\:.*//g')
-    STATUS=$(echo "$RESPONSE" | tr -d '\n' | sed -e 's/.*HTTPSTATUS://')
-
-    if [ "$STATUS" -eq 200 ]; then
-        echo "$BODY" > $PLANE_INSTALL_DIR/variables-upgrade.env
-    else
-        # Fallback to download from the raw github url
-        RESPONSE=$(curl -H 'Cache-Control: no-cache, no-store' -s -w "HTTPSTATUS:%{http_code}" "$FALLBACK_DOWNLOAD_URL/variables.env?$(date +%s)")
-        BODY=$(echo "$RESPONSE" | sed -e 's/HTTPSTATUS\:.*//g')
-        STATUS=$(echo "$RESPONSE" | tr -d '\n' | sed -e 's/.*HTTPSTATUS://')
-
-        if [ "$STATUS" -eq 200 ]; then
-            echo "$BODY" > $PLANE_INSTALL_DIR/variables-upgrade.env
-        else
-            echo "Failed to download variables.env. HTTP Status: $STATUS"
-            echo "URL: $RELEASE_DOWNLOAD_URL/$APP_RELEASE/variables.env"
-            mv $PLANE_INSTALL_DIR/archive/$TS.docker-compose.yml $PLANE_INSTALL_DIR/docker-compose.yml
-            exit 1
-        fi
-    fi
-
-    if [ -f "$DOCKER_ENV_PATH" ];
-    then
-        cp "$DOCKER_ENV_PATH" "$PLANE_INSTALL_DIR/archive/$TS.env"
-        cp "$DOCKER_ENV_PATH" "$PLANE_INSTALL_DIR/plane.env.bak"
-    fi
-
-    mv $PLANE_INSTALL_DIR/variables-upgrade.env $DOCKER_ENV_PATH
-
-    syncEnvFile
-
-    updateEnvFile "APP_RELEASE" "$APP_RELEASE" "$DOCKER_ENV_PATH"
-
-}
-function deployStack() {   
-    # Check if docker compose file and env file exist
-    if [ ! -f "$DOCKER_FILE_PATH" ] || [ ! -f "$DOCKER_ENV_PATH" ]; then
-        echo "Configuration files not found"
-        echo "Downloading it now......"
-        APP_RELEASE=$(checkLatestRelease)
-        download
-    fi
-    if [ -z "$stack_name" ]; then
-        getStackName
-    fi
-    echo "Starting ${stack_name} stack..."
-
-    # Pull envs 
-    if [ -f "$DOCKER_ENV_PATH" ]; then
-        set -o allexport; source $DOCKER_ENV_PATH; set +o allexport;
-    else
-        echo "Environment file not found: $DOCKER_ENV_PATH"
-        exit 1
-    fi
-
-    # Deploy the stack
-    docker stack deploy -c $DOCKER_FILE_PATH $stack_name
-
-    echo "Waiting for services to be deployed..."
-    sleep 10
-
-    # Check migrator service
-    local migrator_service=$(docker service ls --filter name=${stack_name}_migrator -q)
-    if [ -n "$migrator_service" ]; then
-        echo ">> Waiting for Data Migration to finish"
-        while docker service ls --filter name=${stack_name}_migrator | grep -q "running"; do
-            echo -n "."
-            sleep 1
-        done
-        echo ""
-        
-        # Get the most recent container for the migrator service
-        local migrator_container=$(docker ps -a --filter name=${stack_name}_migrator --latest -q)
-        
-        if [ -n "$migrator_container" ]; then
-            # Get the exit code of the container
-            local exit_code=$(docker inspect --format='{{.State.ExitCode}}' $migrator_container)
-            
-            if [ "$exit_code" != "0" ]; then
-                echo "Server failed to start ❌"
-                echo "Migration failed with exit code: $exit_code"
-                echo "Please check the logs for the 'migrator' service and resolve the issue(s)."
-                echo "Stop the services by running the command: ./swarm.sh stop"
-                exit 1
-            else
-                echo "   Data Migration completed successfully ✅"
-            fi
-        else
-            echo "Warning: Could not find migrator container to check exit status"
-        fi
-    fi
-
-    # Check API service
-    local api_service=$(docker service ls --filter name=${stack_name}_api -q)
-    while docker service ls --filter name=${stack_name}_api | grep -q "running"; do
-        local running_container=$(docker ps --filter "name=${stack_name}_api" --filter "status=running" -q)
-        if [ -n "$running_container" ]; then
-            if docker container logs $running_container 2>/dev/null | grep -q "Application Startup Complete"; then
-                break
-            fi
-        fi
-        sleep 2
-    done
-
-    if [ -z "$api_service" ]; then
-        echo "Plane Server failed to start ❌"
-        echo "Please check the logs for the 'api' service and resolve the issue(s)."
-        echo "Stop the services by running the command: ./swarm.sh stop"
-        exit 1
-    fi
-    echo "   Plane Server started successfully ✅"
-    echo ""
-    echo "   You can access the application at $WEB_URL"
-    echo ""
-}
-
-function removeStack() {
-    if [ -z "$stack_name" ]; then
-        echo "Stack name not found"
-        exit 1
-    fi
-    echo "Removing ${stack_name} stack..."
-    docker stack rm "$stack_name"
-    echo "Waiting for services to be removed..."
-    while docker stack ls | grep -q "$stack_name"; do
-        sleep 1
-    done
-    sleep 20
-    echo "Services stopped successfully ✅"
-}
-
-function viewStatus() {
-    echo "Checking status of ${stack_name} stack..."
-    if [ -z "$stack_name" ]; then
-        echo "Stack name not found"
-        exit 1
-    fi
-    docker stack ps "$stack_name"
-}
-
-function redeployStack() {   
-    removeStack
-    echo "ReDeploying ${stack_name} stack..."
-    deployStack
-}
-
-function upgrade() {
-
-    echo "Checking status of ${stack_name} stack..."
-    if [ -z "$stack_name" ]; then
-        echo "Stack name not found"
-        exit 1
-    fi
-    
-    local latest_release=$(checkLatestRelease)
-
-    echo ""
-    echo "Current release: $APP_RELEASE"
-
-    if [ "$latest_release" == "$APP_RELEASE" ]; then
-        echo ""
-        echo "You are already using the latest release"
-        exit 0
-    fi
-
-    echo "Latest release: $latest_release"
-    echo ""
-
-    # Check for confirmation to upgrade
-    echo "Do you want to upgrade to the latest release ($latest_release)?"
-    read -p "Continue? [y/N]: " confirm
-
-    if [[ ! "$confirm" =~ ^[Yy]$ ]]; then
-        echo "Exiting..."
-        exit 0
-    fi
-
-    export APP_RELEASE=$latest_release
-
-    # check if stack exists
-    echo "Upgrading ${stack_name} stack..."
-
-    # check env file and take backup
-    if [ -f "$DOCKER_ENV_PATH" ]; then
-        cp "$DOCKER_ENV_PATH" "${DOCKER_ENV_PATH}.bak"
-    fi
-
-    download
-    redeployStack
-}
-
-function viewSpecificLogs() {
-    local service=$1
-    
-    # Input validation
-    if [ -z "$service" ]; then
-        echo "Error: Please specify a service name"
-        return 1
-    fi
-
-    # Main loop for service logs
-    while true; do
-        # Get all running containers for the service
-        local running_containers=$(docker ps --filter "name=${stack_name}_${service}" --filter "status=running" -q)
-
-        # If no running containers found, try service logs
-        if [ -z "$running_containers" ]; then
-            echo "No running containers found for ${stack_name}_${service}, checking service logs..."
-            if docker service inspect ${stack_name}_${service} >/dev/null 2>&1; then
-                echo "Press Ctrl+C or 'q' to exit logs"
-                docker service logs ${stack_name}_${service} -f
-                break
-            else
-                echo "Error: No running containers or services found for ${stack_name}_${service}"
-                return 1
-            fi
-            return
-        fi
-
-        # If multiple containers are running, let user choose
-        if [ $(echo "$running_containers" | grep -v '^$' | wc -l) -gt 1 ]; then
-            clear
-            echo "Multiple containers found for ${stack_name}_${service}:"
-            local i=1
-            # Use regular arrays instead of associative arrays
-            container_ids=()
-            container_names=()
-            
-            while read -r container_id; do
-                if [ -n "$container_id" ]; then
-                    local container_name=$(docker inspect --format '{{.Name}}' "$container_id" | sed 's/\///')
-                    container_ids[$i]=$container_id
-                    container_names[$i]=$container_name
-                    echo "[$i] ${container_names[$i]} (${container_ids[$i]})"
-                    i=$((i+1))
-                fi
-            done <<< "$running_containers"
-            
-            echo -e "\nPlease select a container number:"
-            read -r selection
-
-            if [[ "$selection" =~ ^[0-9]+$ ]] && [ -n "${container_ids[$selection]}" ]; then
-                local selected_container=${container_ids[$selection]}
-                clear
-                echo "Showing logs for container: ${container_names[$selection]}"
-                echo "Press Ctrl+C or 'q' to return to container selection"
-                
-                # Start watching logs in the background
-                docker container logs -f "$selected_container" &
-                local log_pid=$!
-                
-                while true; do
-                    read -r -n 1 input
-                    if [[ $input == "q" ]]; then
-                        kill $log_pid 2>/dev/null
-                        wait $log_pid 2>/dev/null
-                        break
-                    fi
-                done
-                clear
-            else
-                echo "Error: Invalid selection"
-                sleep 2
-            fi
-        else
-            # Single container case
-            local container_name=$(docker inspect --format '{{.Name}}' "$running_containers" | sed 's/\///')
-            echo "Showing logs for container: $container_name"
-            echo "Press Ctrl+C or 'q' to exit logs"
-            docker container logs -f "$running_containers" &
-            local log_pid=$!
-            
-            while true; do
-                read -r -n 1 input
-                if [[ $input == "q" ]]; then
-                    kill $log_pid 2>/dev/null
-                    wait $log_pid 2>/dev/null
-                    break
-                fi
-            done
-            break
-        fi
-    done
-}
-
-function viewLogs(){
-    
-    ARG_SERVICE_NAME=$2
-    if [ -z "$ARG_SERVICE_NAME" ];
-    then
-        echo
-        echo "Select a Service you want to view the logs for:"
-        echo "   1) Web"
-        echo "   2) Space"
-        echo "   3) API"
-        echo "   4) Worker"
-        echo "   5) Beat-Worker"
-        echo "   6) Migrator"
-        echo "   7) Proxy"
-        echo "   8) Redis"
-        echo "   9) Postgres"
-        echo "   10) Minio"
-        echo "   11) RabbitMQ"
-        echo "   0) Back to Main Menu"
-        echo 
-        read -p "Service: " DOCKER_SERVICE_NAME 
-
-        until (( DOCKER_SERVICE_NAME >= 0 && DOCKER_SERVICE_NAME <= 11 )); do
-            echo "Invalid selection. Please enter a number between 0 and 11."
-            read -p "Service: " DOCKER_SERVICE_NAME
-        done
-
-        if [ -z "$DOCKER_SERVICE_NAME" ];
-        then
-            echo "INVALID SERVICE NAME SUPPLIED"
-        else
-            case $DOCKER_SERVICE_NAME in
-                1) viewSpecificLogs "web";;
-                2) viewSpecificLogs "space";;
-                3) viewSpecificLogs "api";;
-                4) viewSpecificLogs "worker";;
-                5) viewSpecificLogs "beat-worker";;
-                6) viewSpecificLogs "migrator";;
-                7) viewSpecificLogs "proxy";;
-                8) viewSpecificLogs "plane-redis";;
-                9) viewSpecificLogs "plane-db";;
-                10) viewSpecificLogs "plane-minio";;
-                11) viewSpecificLogs "plane-mq";;
-                0) askForAction;;
-                *) echo "INVALID SERVICE NAME SUPPLIED";;
-            esac
-        fi
-    elif [ -n "$ARG_SERVICE_NAME" ];
-    then
-        ARG_SERVICE_NAME=$(echo "$ARG_SERVICE_NAME" | tr '[:upper:]' '[:lower:]')
-        case $ARG_SERVICE_NAME in
-            web) viewSpecificLogs "web";;
-            space) viewSpecificLogs "space";;
-            api) viewSpecificLogs "api";;
-            worker) viewSpecificLogs "worker";;
-            beat-worker) viewSpecificLogs "beat-worker";;
-            migrator) viewSpecificLogs "migrator";;
-            proxy) viewSpecificLogs "proxy";;
-            redis) viewSpecificLogs "plane-redis";;
-            postgres) viewSpecificLogs "plane-db";;
-            minio) viewSpecificLogs "plane-minio";;
-            rabbitmq) viewSpecificLogs "plane-mq";;
-            *) echo "INVALID SERVICE NAME SUPPLIED";;
-        esac
-    else
-        echo "INVALID SERVICE NAME SUPPLIED"
-    fi
-}
-
-
-
-function askForAction() {
-    # Rest of askForAction remains the same but use $stack_name instead of $STACK_NAME
-    local DEFAULT_ACTION=$1
-
-    if [ -z "$DEFAULT_ACTION" ]; then
-        echo
-        echo "Select an Action you want to perform:"
-        echo "   1) Deploy Stack"
-        echo "   2) Remove Stack"
-        echo "   3) View Stack Status"
-        echo "   4) Redeploy Stack"
-        echo "   5) Upgrade"
-        echo "   6) View Logs"
-        echo "   7) Exit"
-        echo 
-        read -p "Action [3]: " ACTION
-        until [[ -z "$ACTION" || "$ACTION" =~ ^[1-6]$ ]]; do
-            echo "$ACTION: invalid selection."
-            read -p "Action [3]: " ACTION
-        done
-
-        if [ -z "$ACTION" ]; then
-            ACTION=3
-        fi
-        echo
-    fi
-
-    if [ "$ACTION" == "1" ] || [ "$DEFAULT_ACTION" == "deploy" ]; then
-        deployStack
-    elif [ "$ACTION" == "2" ] || [ "$DEFAULT_ACTION" == "remove" ]; then
-        removeStack
-    elif [ "$ACTION" == "3" ] || [ "$DEFAULT_ACTION" == "status" ]; then
-        viewStatus
-    elif [ "$ACTION" == "4" ] || [ "$DEFAULT_ACTION" == "redeploy" ]; then
-        redeployStack
-    elif [ "$ACTION" == "5" ] || [ "$DEFAULT_ACTION" == "upgrade" ]; then
-        upgrade
-    elif [ "$ACTION" == "6" ] || [ "$DEFAULT_ACTION" == "logs" ]; then
-        viewLogs "$@"
-    elif [ "$ACTION" == "7" ] || [ "$DEFAULT_ACTION" == "exit" ]; then
-        exit 0
-    else
-        echo "INVALID ACTION SUPPLIED"
-    fi
-}
-
-# Initialize stack name at script start
-
-if [ -z "$stack_name" ]; then
-    readStackName
-fi
-
-# Sync environment variables
-if [ -f "$DOCKER_ENV_PATH" ]; then
-    DOCKERHUB_USER=$(getEnvValue "DOCKERHUB_USER" "$DOCKER_ENV_PATH")
-    APP_RELEASE=$(getEnvValue "APP_RELEASE" "$DOCKER_ENV_PATH")
-
-    if [ -z "$DOCKERHUB_USER" ]; then
-        DOCKERHUB_USER=makeplane
-        updateEnvFile "DOCKERHUB_USER" "$DOCKERHUB_USER" "$DOCKER_ENV_PATH"
-    fi
-
-    if [ -z "$APP_RELEASE" ]; then
-        APP_RELEASE=stable
-        updateEnvFile "APP_RELEASE" "$APP_RELEASE" "$DOCKER_ENV_PATH"
-    fi
-fi
-
-
-# Main execution
-print_header
-askForAction "$@"

deploy/selfhost/variables.env

@@ -5,9 +5,6 @@ WEB_REPLICAS=1
 SPACE_REPLICAS=1
 ADMIN_REPLICAS=1
 API_REPLICAS=1
-WORKER_REPLICAS=1
-BEAT_WORKER_REPLICAS=1
-LIVE_REPLICAS=1
 
 NGINX_PORT=80
 WEB_URL=http://${APP_DOMAIN}
@@ -58,8 +55,3 @@ GUNICORN_WORKERS=1
 # UNCOMMENT `DOCKER_PLATFORM` IF YOU ARE ON `ARM64` AND DOCKER IMAGE IS NOT AVAILABLE FOR RESPECTIVE `APP_RELEASE`
 # DOCKER_PLATFORM=linux/amd64
 
-# Force HTTPS for handling SSL Termination
-MINIO_ENDPOINT_SSL=0
-
-# API key rate limit
-API_KEY_RATE_LIMIT="60/minute"

live/package.json

@@ -1,13 +1,12 @@
 {
   "name": "live",
-  "version": "0.25.2",
-  "license": "AGPL-3.0",
-  "description": "A realtime collaborative server powers Plane's rich text editor",
+  "version": "0.24.1",
+  "description": "",
   "main": "./src/server.ts",
   "private": true,
   "type": "module",
   "scripts": {
-    "dev": "PORT=3100 concurrently \"babel src --out-dir dist --extensions '.ts,.js' --watch\" \"nodemon dist/server.js\"",
+    "dev": "concurrently \"babel src --out-dir dist --extensions '.ts,.js' --watch\" \"nodemon dist/server.js\"",
     "build": "babel src --out-dir dist --extensions \".ts,.js\"",
     "start": "node dist/server.js",
     "lint": "eslint src --ext .ts,.tsx",
@@ -15,6 +14,7 @@
   },
   "keywords": [],
   "author": "",
+  "license": "ISC",
   "dependencies": {
     "@hocuspocus/extension-database": "^2.15.0",
     "@hocuspocus/extension-logger": "^2.15.0",
@@ -27,7 +27,7 @@
     "@sentry/profiling-node": "^8.28.0",
     "@tiptap/core": "2.10.4",
     "@tiptap/html": "2.11.0",
-    "axios": "^1.8.3",
+    "axios": "^1.7.9",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
@@ -59,7 +59,7 @@
     "concurrently": "^9.0.1",
     "nodemon": "^3.1.7",
     "ts-node": "^10.9.2",
-    "tsup": "^8.4.0",
+    "tsup": "^7.2.0",
     "typescript": "5.3.3"
   }
 }

package.json

@@ -1,8 +1,6 @@
 {
-  "name": "plane",
-  "description": "Open-source project management that unlocks customer value",
   "repository": "https://github.com/makeplane/plane.git",
-  "version": "0.25.2",
+  "version": "0.24.1",
   "license": "AGPL-3.0",
   "private": true,
   "workspaces": [
@@ -28,9 +26,8 @@
   },
   "resolutions": {
     "nanoid": "3.3.8",
-    "esbuild": "0.25.0",
-    "@babel/helpers": "7.26.10",
-    "@babel/runtime": "7.26.10"
+    "esbuild": "0.25.0"
   },
-  "packageManager": "yarn@1.22.22"
+  "packageManager": "yarn@1.22.22",
+  "name": "plane"
 }

packages/constants/package.json

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

packages/constants/src/issue/common.ts

@@ -1,4 +1,8 @@
-import { TIssueGroupByOptions, TIssueOrderByOptions, IIssueDisplayProperties } from "@plane/types";
+import {
+  TIssueGroupByOptions,
+  TIssueOrderByOptions,
+  IIssueDisplayProperties,
+} from "@plane/types";
 
 export const ALL_ISSUES = "All Issues";
 
@@ -145,24 +149,25 @@ export const ISSUE_ORDER_BY_OPTIONS: {
   { key: "-priority", titleTranslationKey: "common.priority" },
 ];
 
-export const ISSUE_DISPLAY_PROPERTIES_KEYS: (keyof IIssueDisplayProperties)[] = [
-  "assignee",
-  "start_date",
-  "due_date",
-  "labels",
-  "key",
-  "priority",
-  "state",
-  "sub_issue_count",
-  "link",
-  "attachment_count",
-  "estimate",
-  "created_on",
-  "updated_on",
-  "modules",
-  "cycle",
-  "issue_type",
-];
+export const ISSUE_DISPLAY_PROPERTIES_KEYS: (keyof IIssueDisplayProperties)[] =
+  [
+    "assignee",
+    "start_date",
+    "due_date",
+    "labels",
+    "key",
+    "priority",
+    "state",
+    "sub_issue_count",
+    "link",
+    "attachment_count",
+    "estimate",
+    "created_on",
+    "updated_on",
+    "modules",
+    "cycle",
+    "issue_type",
+  ];
 
 export const ISSUE_DISPLAY_PROPERTIES: {
   key: keyof IIssueDisplayProperties;
@@ -210,144 +215,3 @@ export const ISSUE_DISPLAY_PROPERTIES: {
   { key: "modules", titleTranslationKey: "common.module" },
   { key: "cycle", titleTranslationKey: "common.cycle" },
 ];
-
-export const SPREADSHEET_PROPERTY_LIST: (keyof IIssueDisplayProperties)[] = [
-  "state",
-  "priority",
-  "assignee",
-  "labels",
-  "modules",
-  "cycle",
-  "start_date",
-  "due_date",
-  "estimate",
-  "created_on",
-  "updated_on",
-  "link",
-  "attachment_count",
-  "sub_issue_count",
-];
-
-export const SPREADSHEET_PROPERTY_DETAILS: {
-  [key in keyof IIssueDisplayProperties]: {
-    i18n_title: string;
-    ascendingOrderKey: TIssueOrderByOptions;
-    ascendingOrderTitle: string;
-    descendingOrderKey: TIssueOrderByOptions;
-    descendingOrderTitle: string;
-    icon: string;
-  };
-} = {
-  assignee: {
-    i18n_title: "common.assignees",
-    ascendingOrderKey: "assignees__first_name",
-    ascendingOrderTitle: "A",
-    descendingOrderKey: "-assignees__first_name",
-    descendingOrderTitle: "Z",
-    icon: "Users",
-  },
-  created_on: {
-    i18n_title: "common.sort.created_on",
-    ascendingOrderKey: "-created_at",
-    ascendingOrderTitle: "New",
-    descendingOrderKey: "created_at",
-    descendingOrderTitle: "Old",
-    icon: "CalendarDays",
-  },
-  due_date: {
-    i18n_title: "common.order_by.due_date",
-    ascendingOrderKey: "-target_date",
-    ascendingOrderTitle: "New",
-    descendingOrderKey: "target_date",
-    descendingOrderTitle: "Old",
-    icon: "CalendarCheck2",
-  },
-  estimate: {
-    i18n_title: "common.estimate",
-    ascendingOrderKey: "estimate_point__key",
-    ascendingOrderTitle: "Low",
-    descendingOrderKey: "-estimate_point__key",
-    descendingOrderTitle: "High",
-    icon: "Triangle",
-  },
-  labels: {
-    i18n_title: "common.labels",
-    ascendingOrderKey: "labels__name",
-    ascendingOrderTitle: "A",
-    descendingOrderKey: "-labels__name",
-    descendingOrderTitle: "Z",
-    icon: "Tag",
-  },
-  modules: {
-    i18n_title: "common.modules",
-    ascendingOrderKey: "issue_module__module__name",
-    ascendingOrderTitle: "A",
-    descendingOrderKey: "-issue_module__module__name",
-    descendingOrderTitle: "Z",
-    icon: "DiceIcon",
-  },
-  cycle: {
-    i18n_title: "common.cycle",
-    ascendingOrderKey: "issue_cycle__cycle__name",
-    ascendingOrderTitle: "A",
-    descendingOrderKey: "-issue_cycle__cycle__name",
-    descendingOrderTitle: "Z",
-    icon: "ContrastIcon",
-  },
-  priority: {
-    i18n_title: "common.priority",
-    ascendingOrderKey: "priority",
-    ascendingOrderTitle: "None",
-    descendingOrderKey: "-priority",
-    descendingOrderTitle: "Urgent",
-    icon: "Signal",
-  },
-  start_date: {
-    i18n_title: "common.order_by.start_date",
-    ascendingOrderKey: "-start_date",
-    ascendingOrderTitle: "New",
-    descendingOrderKey: "start_date",
-    descendingOrderTitle: "Old",
-    icon: "CalendarClock",
-  },
-  state: {
-    i18n_title: "common.state",
-    ascendingOrderKey: "state__name",
-    ascendingOrderTitle: "A",
-    descendingOrderKey: "-state__name",
-    descendingOrderTitle: "Z",
-    icon: "DoubleCircleIcon",
-  },
-  updated_on: {
-    i18n_title: "common.sort.updated_on",
-    ascendingOrderKey: "-updated_at",
-    ascendingOrderTitle: "New",
-    descendingOrderKey: "updated_at",
-    descendingOrderTitle: "Old",
-    icon: "CalendarDays",
-  },
-  link: {
-    i18n_title: "common.link",
-    ascendingOrderKey: "-link_count",
-    ascendingOrderTitle: "Most",
-    descendingOrderKey: "link_count",
-    descendingOrderTitle: "Least",
-    icon: "Link2",
-  },
-  attachment_count: {
-    i18n_title: "common.attachment",
-    ascendingOrderKey: "-attachment_count",
-    ascendingOrderTitle: "Most",
-    descendingOrderKey: "attachment_count",
-    descendingOrderTitle: "Least",
-    icon: "Paperclip",
-  },
-  sub_issue_count: {
-    i18n_title: "issue.display.properties.sub_issue",
-    ascendingOrderKey: "-sub_issues_count",
-    ascendingOrderTitle: "Most",
-    descendingOrderKey: "sub_issues_count",
-    descendingOrderTitle: "Least",
-    icon: "LayersIcon",
-  },
-};

packages/constants/src/issue/index.ts

@@ -1,4 +1,3 @@
 export * from "./common";
 export * from "./filter";
 export * from "./layout";
-export * from "./modal";

packages/constants/src/issue/modal.ts

@@ -1,19 +0,0 @@
-// plane imports
-import { TIssue } from "@plane/types";
-
-export const DEFAULT_WORK_ITEM_FORM_VALUES: Partial<TIssue> = {
-  project_id: "",
-  type_id: null,
-  name: "",
-  description_html: "",
-  estimate_point: null,
-  state_id: "",
-  parent_id: null,
-  priority: "none",
-  assignee_ids: [],
-  label_ids: [],
-  cycle_id: null,
-  module_ids: null,
-  start_date: null,
-  target_date: null,
-};

packages/constants/src/project.ts

@@ -1,5 +1,8 @@
 // icons
-import { TProjectAppliedDisplayFilterKeys, TProjectOrderByOptions } from "@plane/types";
+import {
+  TProjectAppliedDisplayFilterKeys,
+  TProjectOrderByOptions,
+} from "@plane/types";
 
 export type TNetworkChoiceIconKey = "Lock" | "Globe2";
 
@@ -52,11 +55,11 @@ export const GROUP_CHOICES = {
 };
 
 export const PROJECT_AUTOMATION_MONTHS = [
-  { i18n_label: "workspace_projects.common.months_count", value: 1 },
-  { i18n_label: "workspace_projects.common.months_count", value: 3 },
-  { i18n_label: "workspace_projects.common.months_count", value: 6 },
-  { i18n_label: "workspace_projects.common.months_count", value: 9 },
-  { i18n_label: "workspace_projects.common.months_count", value: 12 },
+  { i18n_label: "common.months_count", value: 1 },
+  { i18n_label: "common.months_count", value: 3 },
+  { i18n_label: "common.months_count", value: 6 },
+  { i18n_label: "common.months_count", value: 9 },
+  { i18n_label: "common.months_count", value: 12 },
 ];
 
 export const PROJECT_UNSPLASH_COVERS = [

packages/constants/src/workspace.ts

@@ -1,4 +1,4 @@
-import { TStaticViewTypes, IWorkspaceSearchResults } from "@plane/types";
+import { TStaticViewTypes } from "@plane/types";
 import { EUserWorkspaceRoles } from "./user";
 
 export const ORGANIZATION_SIZE = [
@@ -324,15 +324,3 @@ export const WORKSPACE_SIDEBAR_STATIC_NAVIGATION_ITEMS_LINKS: IWorkspaceSidebarN
   WORKSPACE_SIDEBAR_STATIC_NAVIGATION_ITEMS["inbox"],
   WORKSPACE_SIDEBAR_STATIC_NAVIGATION_ITEMS["projects"],
 ];
-
-export const WORKSPACE_DEFAULT_SEARCH_RESULT: IWorkspaceSearchResults = {
-  results: {
-    workspace: [],
-    project: [],
-    issue: [],
-    cycle: [],
-    module: [],
-    issue_view: [],
-    page: [],
-  },
-};

packages/editor/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@plane/editor",
-  "version": "0.25.2",
+  "version": "0.24.1",
   "description": "Core Editor that powers Plane",
-  "license": "AGPL-3.0",
   "private": true,
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",
@@ -81,7 +80,7 @@
     "@types/react": "^18.3.11",
     "@types/react-dom": "^18.2.18",
     "postcss": "^8.4.38",
-    "tsup": "^8.4.0",
+    "tsup": "^7.2.0",
     "typescript": "5.3.3"
   },
   "keywords": [

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

@@ -1,5 +1,5 @@
-import { Editor } from "@tiptap/react";
 import { FC, ReactNode } from "react";
+import { Editor } from "@tiptap/react";
 // plane utils
 import { cn } from "@plane/utils";
 // constants
@@ -71,7 +71,7 @@ export const EditorContainer: FC<EditorContainerProps> = (props) => {
       onClick={handleContainerClick}
       onMouseLeave={handleContainerMouseLeave}
       className={cn(
-        `editor-container cursor-text relative line-spacing-${displayConfig.lineSpacing ?? DEFAULT_DISPLAY_CONFIG.lineSpacing}`,
+        "editor-container cursor-text relative",
         {
           "active-editor": editor?.isFocused && editor?.isEditable,
         },

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

@@ -4,7 +4,6 @@ import { TDisplayConfig } from "@/types";
 export const DEFAULT_DISPLAY_CONFIG: TDisplayConfig = {
   fontSize: "large-font",
   fontStyle: "sans-serif",
-  lineSpacing: "regular",
 };
 
 export const ACCEPTED_FILE_MIME_TYPES = ["image/jpeg", "image/jpg", "image/png", "image/webp", "image/gif"];

packages/editor/src/core/extensions/core-without-props.ts

@@ -26,12 +26,12 @@ export const CoreEditorExtensionsWithoutProps = [
   StarterKit.configure({
     bulletList: {
       HTMLAttributes: {
-        class: "list-disc pl-7 space-y-[--list-spacing-y]",
+        class: "list-disc pl-7 space-y-2",
       },
     },
     orderedList: {
       HTMLAttributes: {
-        class: "list-decimal pl-7 space-y-[--list-spacing-y]",
+        class: "list-decimal pl-7 space-y-2",
       },
     },
     listItem: {

packages/editor/src/core/extensions/custom-image/components/image-node.tsx

@@ -76,7 +76,7 @@ export const CustomImageNode = (props: CustomImageNodeProps) => {
             failedToLoadImage={failedToLoadImage}
             getPos={getPos}
             loadImageFromFileSystem={setImageFromFileSystem}
-            maxFileSize={editor.storage.imageComponent?.maxFileSize}
+            maxFileSize={editor.storage.imageComponent.maxFileSize}
             node={node}
             setIsUploaded={setIsUploaded}
             selected={selected}

packages/editor/src/core/extensions/custom-image/components/upload-status.tsx

@@ -16,7 +16,7 @@ export const ImageUploadStatus: React.FC<Props> = (props) => {
   // subscribe to image upload status
   const uploadStatus: number | undefined = useEditorState({
     editor,
-    selector: ({ editor }) => editor.storage.imageComponent?.assetsUploadStatus[nodeId],
+    selector: ({ editor }) => editor.storage.imageComponent.assetsUploadStatus[nodeId],
   });
 
   useEffect(() => {

packages/editor/src/core/extensions/custom-image/custom-image.ts

@@ -22,7 +22,7 @@ declare module "@tiptap/core" {
     imageComponent: {
       insertImageComponent: ({ file, pos, event }: InsertImageComponentProps) => ReturnType;
       uploadImage: (blockId: string, file: File) => () => Promise<string> | undefined;
-      updateAssetsUploadStatus?: (updatedStatus: TFileHandler["assetsUploadStatus"]) => () => void;
+      updateAssetsUploadStatus: (updatedStatus: TFileHandler["assetsUploadStatus"]) => () => void;
       getImageSource?: (path: string) => () => Promise<string>;
       restoreImage: (src: string) => () => Promise<void>;
     };

packages/editor/src/core/extensions/extensions.tsx

@@ -50,16 +50,17 @@ type TArguments = {
 export const CoreEditorExtensions = (args: TArguments): Extensions => {
   const { disabledExtensions, enableHistory, fileHandler, mentionHandler, placeholder, tabIndex } = args;
 
-  const extensions = [
+  return [
+    // @ts-expect-error tiptap types are incorrect
     StarterKit.configure({
       bulletList: {
         HTMLAttributes: {
-          class: "list-disc pl-7 space-y-[--list-spacing-y]",
+          class: "list-disc pl-7 space-y-2",
         },
       },
       orderedList: {
         HTMLAttributes: {
-          class: "list-decimal pl-7 space-y-[--list-spacing-y]",
+          class: "list-decimal pl-7 space-y-2",
         },
       },
       listItem: {
@@ -108,6 +109,12 @@ export const CoreEditorExtensions = (args: TArguments): Extensions => {
       },
     }),
     CustomTypographyExtension,
+    ImageExtension(fileHandler).configure({
+      HTMLAttributes: {
+        class: "rounded-md",
+      },
+    }),
+    CustomImageExtension(fileHandler),
     TiptapUnderline,
     TextStyle,
     TaskList.configure({
@@ -130,7 +137,7 @@ export const CoreEditorExtensions = (args: TArguments): Extensions => {
     CustomCodeInlineExtension,
     Markdown.configure({
       html: true,
-      transformCopiedText: false,
+      transformCopiedText: true,
       transformPastedText: true,
       breaks: true,
     }),
@@ -145,7 +152,7 @@ export const CoreEditorExtensions = (args: TArguments): Extensions => {
 
         if (node.type.name === "heading") return `Heading ${node.attrs.level}`;
 
-        if (editor.storage.imageComponent?.uploadInProgress) return "";
+        if (editor.storage.imageComponent.uploadInProgress) return "";
 
         const shouldHidePlaceholder =
           editor.isActive("table") ||
@@ -172,18 +179,4 @@ export const CoreEditorExtensions = (args: TArguments): Extensions => {
       disabledExtensions,
     }),
   ];
-
-  if (!disabledExtensions.includes("image")) {
-    extensions.push(
-      ImageExtension(fileHandler).configure({
-        HTMLAttributes: {
-          class: "rounded-md",
-        },
-      }),
-      CustomImageExtension(fileHandler)
-    );
-  }
-
-  // @ts-expect-error tiptap types are incorrect
-  return extensions;
 };

packages/editor/src/core/extensions/image/image-component-without-props.tsx

@@ -48,7 +48,6 @@ export const CustomImageComponentWithoutProps = () =>
       return {
         fileMap: new Map(),
         deletedImageSet: new Map<string, boolean>(),
-        assetsUploadStatus: {},
       };
     },
   });

packages/editor/src/core/extensions/mentions/extension-config.ts

@@ -1,15 +1,12 @@
 import { mergeAttributes } from "@tiptap/core";
 import Mention, { MentionOptions } from "@tiptap/extension-mention";
-import { MarkdownSerializerState } from "@tiptap/pm/markdown";
-import { Node as NodeType } from "@tiptap/pm/model";
 // types
 import { TMentionHandler } from "@/types";
 // local types
-import { EMentionComponentAttributeNames, TMentionComponentAttributes } from "./types";
+import { EMentionComponentAttributeNames } from "./types";
 
 export type TMentionExtensionOptions = MentionOptions & {
   renderComponent: TMentionHandler["renderComponent"];
-  getMentionedEntityDetails: TMentionHandler["getMentionedEntityDetails"];
 };
 
 export const CustomMentionExtensionConfig = Mention.extend<TMentionExtensionOptions>({
@@ -43,26 +40,9 @@ export const CustomMentionExtensionConfig = Mention.extend<TMentionExtensionOpti
     class: "mention",
   },
 
-  renderText({ node }) {
-    return getMentionDisplayText(this.options, node);
-  },
-
-  addStorage() {
-    const options = this.options;
+  addStorage(this) {
     return {
       mentionsOpen: false,
-      markdown: {
-        serialize(state: MarkdownSerializerState, node: NodeType) {
-          state.write(getMentionDisplayText(options, node));
-        },
-      },
     };
   },
 });
-
-function getMentionDisplayText(options: TMentionExtensionOptions, node: NodeType): string {
-  const attrs = node.attrs as TMentionComponentAttributes;
-  const mentionEntityId = attrs[EMentionComponentAttributeNames.ENTITY_IDENTIFIER];
-  const mentionEntityDetails = options.getMentionedEntityDetails?.(mentionEntityId ?? "");
-  return `@${mentionEntityDetails?.display_name ?? attrs[EMentionComponentAttributeNames.ID] ?? mentionEntityId}`;
-}

packages/editor/src/core/extensions/mentions/extension.tsx

@@ -9,13 +9,12 @@ import { MentionNodeView } from "./mention-node-view";
 import { renderMentionsDropdown } from "./utils";
 
 export const CustomMentionExtension = (props: TMentionHandler) => {
-  const { searchCallback, renderComponent, getMentionedEntityDetails } = props;
+  const { searchCallback, renderComponent } = props;
   return CustomMentionExtensionConfig.extend({
     addOptions(this) {
       return {
         ...this.parent?.(),
         renderComponent,
-        getMentionedEntityDetails,
       };
     },
 

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

@@ -41,16 +41,17 @@ type Props = {
 export const CoreReadOnlyEditorExtensions = (props: Props): Extensions => {
   const { disabledExtensions, fileHandler, mentionHandler } = props;
 
-  const extensions = [
+  return [
+    // @ts-expect-error tiptap types are incorrect
     StarterKit.configure({
       bulletList: {
         HTMLAttributes: {
-          class: "list-disc pl-7 space-y-[--list-spacing-y]",
+          class: "list-disc pl-7 space-y-2",
         },
       },
       orderedList: {
         HTMLAttributes: {
-          class: "list-decimal pl-7 space-y-[--list-spacing-y]",
+          class: "list-decimal pl-7 space-y-2",
         },
       },
       listItem: {
@@ -93,6 +94,12 @@ export const CoreReadOnlyEditorExtensions = (props: Props): Extensions => {
       },
     }),
     CustomTypographyExtension,
+    ReadOnlyImageExtension(fileHandler).configure({
+      HTMLAttributes: {
+        class: "rounded-md",
+      },
+    }),
+    CustomReadOnlyImageExtension(fileHandler),
     TiptapUnderline,
     TextStyle,
     TaskList.configure({
@@ -129,18 +136,4 @@ export const CoreReadOnlyEditorExtensions = (props: Props): Extensions => {
       disabledExtensions,
     }),
   ];
-
-  if (!disabledExtensions.includes("image")) {
-    extensions.push(
-      ReadOnlyImageExtension(fileHandler).configure({
-        HTMLAttributes: {
-          class: "rounded-md",
-        },
-      }),
-      CustomReadOnlyImageExtension(fileHandler)
-    );
-  }
-
-  // @ts-expect-error tiptap types are incorrect
-  return extensions;
 };

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

@@ -43,7 +43,7 @@ import { CommandProps, ISlashCommandItem, TSlashCommandSectionKeys } from "@/typ
 // plane editor extensions
 import { coreEditorAdditionalSlashCommandOptions } from "@/plane-editor/extensions";
 // local types
-import { TExtensionProps, TSlashCommandAdditionalOption } from "./root";
+import { TExtensionProps } from "./root";
 
 export type TSlashCommandSection = {
   key: TSlashCommandSectionKeys;
@@ -54,7 +54,7 @@ export type TSlashCommandSection = {
 export const getSlashCommandFilteredSections =
   (args: TExtensionProps) =>
   ({ query }: { query: string }): TSlashCommandSection[] => {
-    const { additionalOptions: externalAdditionalOptions, disabledExtensions } = args;
+    const { additionalOptions, disabledExtensions } = args;
     const SLASH_COMMAND_SECTIONS: TSlashCommandSection[] = [
       {
         key: "general",
@@ -176,6 +176,15 @@ export const getSlashCommandFilteredSections =
             icon: <Code2 className="size-3.5" />,
             command: ({ editor, range }) => editor.chain().focus().deleteRange(range).toggleCodeBlock().run(),
           },
+          {
+            commandKey: "image",
+            key: "image",
+            title: "Image",
+            icon: <ImageIcon className="size-3.5" />,
+            description: "Insert an image",
+            searchTerms: ["img", "photo", "picture", "media", "upload"],
+            command: ({ editor, range }: CommandProps) => insertImage({ editor, event: "insert", range }),
+          },
           {
             commandKey: "callout",
             key: "callout",
@@ -275,24 +284,8 @@ export const getSlashCommandFilteredSections =
       },
     ];
 
-    const internalAdditionalOptions: TSlashCommandAdditionalOption[] = [];
-    if (!disabledExtensions?.includes("image")) {
-      internalAdditionalOptions.push({
-        commandKey: "image",
-        key: "image",
-        title: "Image",
-        icon: <ImageIcon className="size-3.5" />,
-        description: "Insert an image",
-        searchTerms: ["img", "photo", "picture", "media", "upload"],
-        command: ({ editor, range }: CommandProps) => insertImage({ editor, event: "insert", range }),
-        section: "general",
-        pushAfter: "code",
-      });
-    }
-
     [
-      ...internalAdditionalOptions,
-      ...(externalAdditionalOptions ?? []),
+      ...(additionalOptions ?? []),
       ...coreEditorAdditionalSlashCommandOptions({
         disabledExtensions,
       }),

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

@@ -111,7 +111,7 @@ export const useEditor = (props: CustomEditorProps) => {
     // value is null when intentionally passed where syncing is not yet
     // supported and value is undefined when the data from swr is not populated
     if (value == null) return;
-    if (editor && !editor.isDestroyed && !editor.storage.imageComponent?.uploadInProgress) {
+    if (editor && !editor.isDestroyed && !editor.storage.imageComponent.uploadInProgress) {
       try {
         editor.commands.setContent(value, false, { preserveWhitespace: "full" });
         if (editor.state.selection) {
@@ -129,7 +129,7 @@ export const useEditor = (props: CustomEditorProps) => {
   useEffect(() => {
     if (!editor) return;
     const assetsUploadStatus = fileHandler.assetsUploadStatus;
-    editor.commands.updateAssetsUploadStatus?.(assetsUploadStatus);
+    editor.commands.updateAssetsUploadStatus(assetsUploadStatus);
   }, [editor, fileHandler.assetsUploadStatus]);
 
   useImperativeHandle(
@@ -221,7 +221,7 @@ export const useEditor = (props: CustomEditorProps) => {
         if (!editor) return;
         scrollSummary(editor, marking);
       },
-      isEditorReadyToDiscard: () => editor?.storage.imageComponent?.uploadInProgress === false,
+      isEditorReadyToDiscard: () => editor?.storage.imageComponent.uploadInProgress === false,
       setFocusAtPosition: (position: number) => {
         if (!editor || editor.isDestroyed) {
           console.error("Editor reference is not available or has been destroyed.");

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

@@ -21,9 +21,7 @@ export const useUploader = (args: TUploaderArgs) => {
   const uploadFile = useCallback(
     async (file: File) => {
       const setImageUploadInProgress = (isUploading: boolean) => {
-        if (editor.storage.imageComponent) {
-          editor.storage.imageComponent.uploadInProgress = isUploading;
-        }
+        editor.storage.imageComponent.uploadInProgress = isUploading;
       };
       setImageUploadInProgress(true);
       setUploading(true);

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

@@ -23,10 +23,7 @@ export type TEditorFontStyle = "sans-serif" | "serif" | "monospace";
 
 export type TEditorFontSize = "small-font" | "large-font";
 
-export type TEditorLineSpacing = "regular" | "small";
-
 export type TDisplayConfig = {
   fontStyle?: TEditorFontStyle;
   fontSize?: TEditorFontSize;
-  lineSpacing?: TEditorLineSpacing;
 };

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

@@ -1 +1 @@
-export type TExtensions = "ai" | "collaboration-cursor" | "issue-embed" | "slash-commands" | "enter-key" | "image";
+export type TExtensions = "ai" | "collaboration-cursor" | "issue-embed" | "slash-commands" | "enter-key";

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

@@ -1,5 +1,5 @@
 // plane types
-import { IUserLite, TSearchEntities } from "@plane/types";
+import { TSearchEntities } from "@plane/types";
 
 export type TMentionSuggestion = {
   entity_identifier: string;
@@ -20,7 +20,6 @@ export type TMentionComponentProps = Pick<TMentionSuggestion, "entity_identifier
 
 export type TReadOnlyMentionHandler = {
   renderComponent: (props: TMentionComponentProps) => React.ReactNode;
-  getMentionedEntityDetails?: (entity_identifier: string) => { display_name: string } | undefined;
 };
 
 export type TMentionHandler = TReadOnlyMentionHandler & {

packages/editor/src/styles/editor.css

@@ -252,7 +252,7 @@ ul[data-type="taskList"] li[data-checked="true"] {
 
 div[data-type="horizontalRule"] {
   line-height: 0;
-  padding: var(--divider-padding-top) 0 var(--divider-padding-bottom) 0;
+  padding: 0.25rem 0;
   margin-top: 0;
   margin-bottom: 0;
 
@@ -335,10 +335,10 @@ p.editor-paragraph-block {
 /* tailwind typography */
 .prose :where(h1.editor-heading-block):not(:where([class~="not-prose"], [class~="not-prose"] *)) {
   &:not(:first-child) {
-    padding-top: var(--heading-1-padding-top);
+    padding-top: 28px;
   }
 
-  padding-bottom: var(--heading-1-padding-bottom);
+  padding-bottom: 4px;
   font-size: var(--font-size-h1);
   line-height: var(--line-height-h1);
   font-weight: 600;
@@ -346,10 +346,10 @@ p.editor-paragraph-block {
 
 .prose :where(h2.editor-heading-block):not(:where([class~="not-prose"], [class~="not-prose"] *)) {
   &:not(:first-child) {
-    padding-top: var(--heading-2-padding-top);
+    padding-top: 28px;
   }
 
-  padding-bottom: var(--heading-2-padding-bottom);
+  padding-bottom: 4px;
   font-size: var(--font-size-h2);
   line-height: var(--line-height-h2);
   font-weight: 600;
@@ -357,10 +357,10 @@ p.editor-paragraph-block {
 
 .prose :where(h3.editor-heading-block):not(:where([class~="not-prose"], [class~="not-prose"] *)) {
   &:not(:first-child) {
-    padding-top: var(--heading-3-padding-top);
+    padding-top: 28px;
   }
 
-  padding-bottom: var(--heading-3-padding-bottom);
+  padding-bottom: 4px;
   font-size: var(--font-size-h3);
   line-height: var(--line-height-h3);
   font-weight: 600;
@@ -368,10 +368,10 @@ p.editor-paragraph-block {
 
 .prose :where(h4.editor-heading-block):not(:where([class~="not-prose"], [class~="not-prose"] *)) {
   &:not(:first-child) {
-    padding-top: var(--heading-4-padding-top);
+    padding-top: 28px;
   }
 
-  padding-bottom: var(--heading-4-padding-bottom);
+  padding-bottom: 4px;
   font-size: var(--font-size-h4);
   line-height: var(--line-height-h4);
   font-weight: 600;
@@ -379,10 +379,10 @@ p.editor-paragraph-block {
 
 .prose :where(h5.editor-heading-block):not(:where([class~="not-prose"], [class~="not-prose"] *)) {
   &:not(:first-child) {
-    padding-top: var(--heading-5-padding-top);
+    padding-top: 20px;
   }
 
-  padding-bottom: var(--heading-5-padding-bottom);
+  padding-bottom: 4px;
   font-size: var(--font-size-h5);
   line-height: var(--line-height-h5);
   font-weight: 600;
@@ -390,10 +390,10 @@ p.editor-paragraph-block {
 
 .prose :where(h6.editor-heading-block):not(:where([class~="not-prose"], [class~="not-prose"] *)) {
   &:not(:first-child) {
-    padding-top: var(--heading-6-padding-top);
+    padding-top: 20px;
   }
 
-  padding-bottom: var(--heading-6-padding-bottom);
+  padding-bottom: 4px;
   font-size: var(--font-size-h6);
   line-height: var(--line-height-h6);
   font-weight: 600;
@@ -405,16 +405,16 @@ p.editor-paragraph-block {
   }
 
   &:not(:first-child) {
-    padding-top: var(--paragraph-padding-top);
+    padding-top: 4px;
   }
 
   &:not(td p.editor-paragraph-block, th p.editor-paragraph-block) {
     &:last-child {
-      padding-bottom: var(--paragraph-padding-bottom);
+      padding-bottom: 4px;
     }
 
     &:not(:last-child) {
-      padding-bottom: var(--paragraph-padding-between);
+      padding-bottom: 8px;
     }
   }
 
@@ -423,7 +423,7 @@ p.editor-paragraph-block {
 }
 
 p.editor-paragraph-block + p.editor-paragraph-block {
-  padding-top: var(--paragraph-padding-between) !important;
+  padding-top: 8px !important;
 }
 
 .prose :where(ol):not(:where([class~="not-prose"], [class~="not-prose"] *)) li p.editor-paragraph-block,

packages/editor/src/styles/variables.css

@@ -57,48 +57,4 @@
     --font-style: monospace;
   }
   /* end font styles */
-
-  /* spacing */
-  &.line-spacing-regular {
-    --heading-1-padding-top: 28px;
-    --heading-1-padding-bottom: 4px;
-    --heading-2-padding-top: 28px;
-    --heading-2-padding-bottom: 4px;
-    --heading-3-padding-top: 28px;
-    --heading-3-padding-bottom: 4px;
-    --heading-4-padding-top: 28px;
-    --heading-4-padding-bottom: 4px;
-    --heading-5-padding-top: 20px;
-    --heading-5-padding-bottom: 4px;
-    --heading-6-padding-top: 20px;
-    --heading-6-padding-bottom: 4px;
-    --paragraph-padding-top: 4px;
-    --paragraph-padding-bottom: 4px;
-    --paragraph-padding-between: 8px;
-    --list-spacing-y: 8px;
-    --divider-padding-top: 4px;
-    --divider-padding-bottom: 4px;
-  }
-
-  &.line-spacing-small {
-    --heading-1-padding-top: 16px;
-    --heading-1-padding-bottom: 4px;
-    --heading-2-padding-top: 16px;
-    --heading-2-padding-bottom: 4px;
-    --heading-3-padding-top: 16px;
-    --heading-3-padding-bottom: 4px;
-    --heading-4-padding-top: 16px;
-    --heading-4-padding-bottom: 4px;
-    --heading-5-padding-top: 12px;
-    --heading-5-padding-bottom: 4px;
-    --heading-6-padding-top: 12px;
-    --heading-6-padding-bottom: 4px;
-    --paragraph-padding-top: 2px;
-    --paragraph-padding-bottom: 2px;
-    --paragraph-padding-between: 4px;
-    --list-spacing-y: 0px;
-    --divider-padding-top: 0px;
-    --divider-padding-bottom: 4px;
-  }
-  /* end spacing */
 }

packages/eslint-config/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@plane/eslint-config",
   "private": true,
-  "version": "0.25.2",
-  "license": "AGPL-3.0",
+  "version": "0.24.1",
   "files": [
     "library.js",
     "next.js",

packages/hooks/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@plane/hooks",
-  "version": "0.25.2",
-  "license": "AGPL-3.0",
+  "version": "0.24.1",
   "description": "React hooks that are shared across multiple apps internally",
   "private": true,
   "main": "./dist/index.js",
@@ -22,7 +21,7 @@
     "@plane/eslint-config": "*",
     "@types/node": "^22.5.4",
     "@types/react": "^18.3.11",
-    "tsup": "^8.4.0",
+    "tsup": "^7.2.0",
     "typescript": "^5.3.3"
   }
 }

packages/i18n/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@plane/i18n",
-  "version": "0.25.2",
-  "license": "AGPL-3.0",
+  "version": "0.24.1",
   "description": "I18n shared across multiple apps internally",
   "private": true,
   "main": "./src/index.ts",

packages/i18n/src/constants/language.ts

@@ -7,16 +7,7 @@ export const SUPPORTED_LANGUAGES: ILanguageOption[] = [
   { label: "Français", value: "fr" },
   { label: "Español", value: "es" },
   { label: "日本語", value: "ja" },
-  { label: "简体中文", value: "zh-CN" },
-  { label: "繁體中文", value: "zh-TW" },
-  { label: "Русский", value: "ru" },
-  { label: "Italian", value: "it" },
-  { label: "Čeština", value: "cs" },
-  { label: "Slovenčina", value: "sk" },
-  { label: "Deutsch", value: "de" },
-  { label: "Українська", value: "ua" },
-  { label: "Polski", value: "pl" },
-  { label: "한국어", value: "ko" },
+  { label: "中文", value: "zh-CN" },
 ];
 
-export const LANGUAGE_STORAGE_KEY = "userLanguage";
+export const STORAGE_KEY = "userLanguage";

packages/i18n/src/hooks/use-translation.ts

@@ -1,8 +1,8 @@
-import { useContext } from "react";
+import { useContext } from 'react';
 // context
-import { TranslationContext } from "../context";
+import { TranslationContext } from '../context';
 // types
-import { ILanguageOption, TLanguage } from "../types";
+import { ILanguageOption, TLanguage } from '../types';
 
 export type TTranslationStore = {
   t: (key: string, params?: Record<string, any>) => string;
@@ -23,7 +23,7 @@ export type TTranslationStore = {
 export function useTranslation(): TTranslationStore {
   const store = useContext(TranslationContext);
   if (!store) {
-    throw new Error("useTranslation must be used within a TranslationProvider");
+    throw new Error('useTranslation must be used within a TranslationProvider');
   }
 
   return {

packages/i18n/src/locales/en/translations.json

@@ -287,7 +287,7 @@
   "Cancel": "Cancel",
   "edit": "Edit",
   "archive": "Archive",
-  "restore": "Restore",
+  "restor": "Restore",
   "open_in_new_tab": "Open in new tab",
   "delete": "Delete",
   "deleting": "Deleting",
@@ -461,8 +461,6 @@
     "states": "States",
     "state": "State",
     "state_groups": "State groups",
-    "state_group": "State group",
-    "priorities": "Priorities",
     "priority": "Priority",
     "team_project": "Team project",
     "project": "Project",
@@ -471,16 +469,12 @@
     "module": "Module",
     "modules": "Modules",
     "labels": "Labels",
-    "label": "Label",
     "assignees": "Assignees",
     "assignee": "Assignee",
     "created_by": "Created by",
     "none": "None",
     "link": "Link",
-    "estimates": "Estimates",
     "estimate": "Estimate",
-    "created_at": "Created at",
-    "completed_at": "Completed at",
     "layout": "Layout",
     "filters": "Filters",
     "display": "Display",
@@ -523,13 +517,13 @@
     "add_more": "Add more",
     "defaults": "Defaults",
     "add_label": "Add label",
+    "estimates": "Estimates",
     "customize_time_range": "Customize time range",
     "loading": "Loading",
     "attachments": "Attachments",
     "property": "Property",
     "properties": "Properties",
     "parent": "Parent",
-    "page": "Page",
     "remove": "Remove",
     "archiving": "Archiving",
     "archive": "Archive",
@@ -619,7 +613,6 @@
       "open_in_new_tab": "Open in new tab",
       "copy_link": "Copy link",
       "archive": "Archive",
-      "restore": "Restore",
       "delete": "Delete",
       "remove_relation": "Remove relation",
       "subscribe": "Subscribe",
@@ -662,6 +655,8 @@
     "select": "Select",
     "upgrade": "Upgrade",
     "add_seats": "Add Seats",
+    "label": "Label",
+    "priorities": "Priorities",
     "projects": "Projects",
     "workspace": "Workspace",
     "workspaces": "Workspaces",
@@ -680,16 +675,6 @@
     "disconnecting": "Disconnecting",
     "installing": "Installing",
     "install": "Install",
-    "reset": "Reset",
-    "live": "Live",
-    "change_history": "Change History",
-    "coming_soon": "Coming soon",
-    "members": "Members",
-    "you": "You",
-    "upgrade_cta": {
-      "higher_subscription": "Upgrade to higher subscription",
-      "talk_to_sales": "Talk to Sales"
-    },
     "category": "Category",
     "categories": "Categories",
     "saving": "Saving",
@@ -697,8 +682,7 @@
     "delete": "Delete",
     "deleting": "Deleting",
     "pending": "Pending",
-    "invite": "Invite",
-    "view": "View"
+    "invite": "Invite"
   },
 
   "chart": {
@@ -816,8 +800,7 @@
         "sub_issue_count": "Sub-work item count",
         "attachment_count": "Attachment count",
         "created_on": "Created on",
-        "sub_issue": "Sub-work item",
-        "work_item_count": "Work item count"
+        "sub_issue": "Sub-work item"
       },
       "extra": {
         "show_sub_issues": "Show sub-work items",
@@ -1305,8 +1288,7 @@
             "max_length": "Workspace name should not exceed 80 characters"
           },
           "company_size": {
-            "required": "Company size is required",
-            "select_a_range": "Select organization size"
+            "required": "Company size is required"
           }
         }
       },

packages/i18n/src/locales/es/translations.json

@@ -215,7 +215,6 @@
   "activity": "Actividad",
   "appearance": "Apariencia",
   "notifications": "Notificaciones",
-  "connections": "Conexiones",
   "workspaces": "Espacios de trabajo",
   "create_workspace": "Crear espacio de trabajo",
   "invitations": "Invitaciones",
@@ -292,7 +291,6 @@
   "workspace_logo": "Logo del espacio de trabajo",
   "new_issue": "Nuevo elemento de trabajo",
   "your_work": "Tu trabajo",
-  "workspace_dashboards": "Paneles de control",
   "drafts": "Borradores",
   "projects": "Proyectos",
   "views": "Vistas",
@@ -459,7 +457,7 @@
   "Cancel": "Cancelar",
   "edit": "Editar",
   "archive": "Archivar",
-  "restore": "Restaurar",
+  "restor": "Restaurar",
   "open_in_new_tab": "Abrir en nueva pestaña",
   "delete": "Eliminar",
   "deleting": "Eliminando",
@@ -633,8 +631,6 @@
     "states": "Estados",
     "state": "Estado",
     "state_groups": "Grupos de estados",
-    "state_group": "Grupos de estado",
-    "priorities": "Prioridades",
     "priority": "Prioridad",
     "team_project": "Proyecto de equipo",
     "project": "Proyecto",
@@ -643,16 +639,12 @@
     "module": "Módulo",
     "modules": "Módulos",
     "labels": "Etiquetas",
-    "label": "Etiqueta",
     "assignees": "Asignados",
     "assignee": "Asignado",
     "created_by": "Creado por",
     "none": "Ninguno",
     "link": "Enlace",
-    "estimates": "Estimaciones",
     "estimate": "Estimación",
-    "created_at": "Creado en",
-    "completed_at": "Completado en",
     "layout": "Diseño",
     "filters": "Filtros",
     "display": "Mostrar",
@@ -695,13 +687,13 @@
     "add_more": "Agregar más",
     "defaults": "Valores predeterminados",
     "add_label": "Agregar etiqueta",
+    "estimates": "Estimaciones",
     "customize_time_range": "Personalizar rango de tiempo",
     "loading": "Cargando",
     "attachments": "Archivos adjuntos",
     "property": "Propiedad",
     "properties": "Propiedades",
     "parent": "Padre",
-    "page": "página",
     "remove": "Eliminar",
     "archiving": "Archivando",
     "archive": "Archivar",
@@ -833,6 +825,8 @@
     "select": "Seleccionar",
     "upgrade": "Mejorar",
     "add_seats": "Agregar asientos",
+    "label": "Etiqueta",
+    "priorities": "Prioridades",
     "projects": "Proyectos",
     "workspace": "Espacio de trabajo",
     "workspaces": "Espacios de trabajo",
@@ -851,16 +845,6 @@
     "disconnecting": "Desconectando",
     "installing": "Instalando",
     "install": "Instalar",
-    "reset": "Reiniciar",
-    "live": "En vivo",
-    "change_history": "Historial de cambios",
-    "coming_soon": "Próximamente",
-    "members": "Miembros",
-    "you": "Tú",
-    "upgrade_cta": {
-      "higher_subscription": "Mejorar a una suscripción más alta",
-      "talk_to_sales": "Hablar con ventas"
-    },
     "category": "Categoría",
     "categories": "Categorías",
     "saving": "Guardando",
@@ -868,8 +852,7 @@
     "delete": "Eliminar",
     "deleting": "Eliminando",
     "pending": "Pendiente",
-    "invite": "Invitar",
-    "view": "Ver"
+    "invite": "Invitar"
   },
 
   "chart": {
@@ -987,8 +970,7 @@
         "sub_issue_count": "Cantidad de sub-elementos",
         "attachment_count": "Cantidad de archivos adjuntos",
         "created_on": "Creado el",
-        "sub_issue": "Sub-elemento de trabajo",
-        "work_item_count": "Recuento de elementos de trabajo"
+        "sub_issue": "Sub-elemento de trabajo"
       },
       "extra": {
         "show_sub_issues": "Mostrar sub-elementos",
@@ -1475,8 +1457,7 @@
             "max_length": "El nombre del espacio de trabajo no debe exceder los 80 caracteres"
           },
           "company_size": {
-            "required": "El tamaño de la empresa es obligatorio",
-            "select_a_range": "Seleccionar tamaño de la organización"
+            "required": "El tamaño de la empresa es obligatorio"
           }
         }
       },

packages/i18n/src/locales/fr/translations.json

@@ -457,7 +457,7 @@
   "Cancel": "Annuler",
   "edit": "Modifier",
   "archive": "Archiver",
-  "restore": "Restaurer",
+  "restor": "Restaurer",
   "open_in_new_tab": "Ouvrir dans un nouvel onglet",
   "delete": "Supprimer",
   "deleting": "Suppression",
@@ -631,8 +631,6 @@
     "states": "États",
     "state": "État",
     "state_groups": "Groupes d'états",
-    "state_group": "Groupe d'état",
-    "priorities": "Priorités",
     "priority": "Priorité",
     "team_project": "Projet d'équipe",
     "project": "Projet",
@@ -641,16 +639,12 @@
     "module": "Module",
     "modules": "Modules",
     "labels": "Étiquettes",
-    "label": "Étiquette",
     "assignees": "Assignés",
     "assignee": "Assigné",
     "created_by": "Créé par",
     "none": "Aucun",
     "link": "Lien",
-    "estimates": "Estimations",
     "estimate": "Estimation",
-    "created_at": "Créé le",
-    "completed_at": "Terminé le",
     "layout": "Disposition",
     "filters": "Filtres",
     "display": "Affichage",
@@ -693,13 +687,13 @@
     "add_more": "Ajouter plus",
     "defaults": "Par défaut",
     "add_label": "Ajouter une étiquette",
+    "estimates": "Estimations",
     "customize_time_range": "Personnaliser la plage de temps",
     "loading": "Chargement",
     "attachments": "Pièces jointes",
     "property": "Propriété",
     "properties": "Propriétés",
     "parent": "Parent",
-    "page": "Pâge",
     "remove": "Supprimer",
     "archiving": "Archivage",
     "archive": "Archiver",
@@ -831,6 +825,8 @@
     "select": "Sélectionner",
     "upgrade": "Mettre à niveau",
     "add_seats": "Ajouter des sièges",
+    "label": "Étiquette",
+    "priorities": "Priorités",
     "projects": "Projets",
     "workspace": "Espace de travail",
     "workspaces": "Espaces de travail",
@@ -849,16 +845,6 @@
     "disconnecting": "Déconnexion",
     "installing": "Installation",
     "install": "Installer",
-    "reset": "Réinitialiser",
-    "live": "En direct",
-    "change_history": "Historique des modifications",
-    "coming_soon": "À venir",
-    "members": "Membres",
-    "you": "Vous",
-    "upgrade_cta": {
-      "higher_subscription": "Passer à une abonnement plus élevé",
-      "talk_to_sales": "Parler aux ventes"
-    },
     "category": "Catégorie",
     "categories": "Catégories",
     "saving": "Enregistrement",
@@ -866,8 +852,7 @@
     "delete": "Supprimer",
     "deleting": "Suppression",
     "pending": "En attente",
-    "invite": "Inviter",
-    "view": "Afficher"
+    "invite": "Inviter"
   },
 
   "chart": {
@@ -985,8 +970,7 @@
         "sub_issue_count": "Nombre de sous-éléments",
         "attachment_count": "Nombre de pièces jointes",
         "created_on": "Créé le",
-        "sub_issue": "Sous-élément de travail",
-        "work_item_count": "Nombre d'éléments de travail"
+        "sub_issue": "Sous-élément de travail"
       },
       "extra": {
         "show_sub_issues": "Afficher les sous-éléments",
@@ -1473,8 +1457,7 @@
             "max_length": "Le nom de l'espace de travail ne doit pas dépasser 80 caractères"
           },
           "company_size": {
-            "required": "La taille de l'entreprise est requise",
-            "select_a_range": "Sélectionner la taille de l'organisation"
+            "required": "La taille de l'entreprise est requise"
           }
         }
       },

packages/i18n/src/locales/ja/translations.json

@@ -457,7 +457,7 @@
   "Cancel": "キャンセル",
   "edit": "編集",
   "archive": "アーカイブ",
-  "restore": "復元",
+  "restor": "復元",
   "open_in_new_tab": "新しいタブで開く",
   "delete": "削除",
   "deleting": "削除中",
@@ -631,8 +631,6 @@
     "states": "ステータス",
     "state": "ステータス",
     "state_groups": "ステータスグループ",
-    "state_group": "ステート グループ",
-    "priorities": "優先度",
     "priority": "優先度",
     "team_project": "チームプロジェクト",
     "project": "プロジェクト",
@@ -641,16 +639,12 @@
     "module": "モジュール",
     "modules": "モジュール",
     "labels": "ラベル",
-    "label": "ラベル",
     "assignees": "担当者",
     "assignee": "担当者",
     "created_by": "作成者",
     "none": "なし",
     "link": "リンク",
-    "estimates": "見積もり",
     "estimate": "見積もり",
-    "created_at": "クリエイテッド アット",
-    "completed_at": "コンプリーテッド アット",
     "layout": "レイアウト",
     "filters": "フィルター",
     "display": "表示",
@@ -693,13 +687,13 @@
     "add_more": "さらに追加",
     "defaults": "デフォルト",
     "add_label": "ラベルを追加",
+    "estimates": "見積もり",
     "customize_time_range": "期間をカスタマイズ",
     "loading": "読み込み中",
     "attachments": "添付ファイル",
     "property": "プロパティ",
     "properties": "プロパティ",
     "parent": "親",
-    "page": "ページ",
     "remove": "削除",
     "archiving": "アーカイブ中",
     "archive": "アーカイブ",
@@ -831,6 +825,8 @@
     "select": "選択",
     "upgrade": "アップグレード",
     "add_seats": "シートを追加",
+    "label": "ラベル",
+    "priorities": "優先度",
     "projects": "プロジェクト",
     "workspace": "ワークスペース",
     "workspaces": "ワークスペース",
@@ -849,16 +845,6 @@
     "disconnecting": "切断中",
     "installing": "インストール中",
     "install": "インストール",
-    "reset": "リセット",
-    "live": "ライブ",
-    "change_history": "変更履歴",
-    "coming_soon": "近日公開",
-    "members": "メンバー",
-    "you": "あなた",
-    "upgrade_cta": {
-      "higher_subscription": "高いサブスクリプションにアップグレード",
-      "talk_to_sales": "トーク トゥ セールス"
-    },
     "category": "カテゴリー",
     "categories": "カテゴリーズ",
     "saving": "セービング",
@@ -866,8 +852,7 @@
     "delete": "デリート",
     "deleting": "デリーティング",
     "pending": "保留中",
-    "invite": "招待",
-    "view": "ビュー"
+    "invite": "招待"
   },
 
   "chart": {
@@ -985,8 +970,7 @@
         "sub_issue_count": "サブ作業項目数",
         "attachment_count": "添付ファイル数",
         "created_on": "作成日",
-        "sub_issue": "サブ作業項目",
-        "work_item_count": "作業項目数"
+        "sub_issue": "サブ作業項目"
       },
       "extra": {
         "show_sub_issues": "サブ作業項目を表示",
@@ -1473,8 +1457,7 @@
             "max_length": "ワークスペース名は80文字を超えることはできません"
           },
           "company_size": {
-            "required": "会社の規模は必須です",
-            "select_a_range": "組織の規模を選択"
+            "required": "会社の規模は必須です"
           }
         }
       },

packages/i18n/src/locales/zh-CN/translations.json

@@ -457,7 +457,7 @@
   "Cancel": "取消",
   "edit": "编辑",
   "archive": "归档",
-  "restore": "恢复",
+  "restor": "恢复",
   "open_in_new_tab": "在新标签页中打开",
   "delete": "删除",
   "deleting": "删除中",
@@ -631,8 +631,6 @@
     "states": "状态",
     "state": "状态",
     "state_groups": "状态组",
-    "state_group": "状态组",
-    "priorities": "优先级",
     "priority": "优先级",
     "team_project": "团队项目",
     "project": "项目",
@@ -641,16 +639,12 @@
     "module": "模块",
     "modules": "模块",
     "labels": "标签",
-    "label": "标签",
     "assignees": "负责人",
     "assignee": "负责人",
     "created_by": "创建者",
     "none": "无",
     "link": "链接",
-    "estimates": "估算",
     "estimate": "估算",
-    "created_at": "创建于",
-    "completed_at": "完成于",
     "layout": "布局",
     "filters": "筛选",
     "display": "显示",
@@ -693,13 +687,13 @@
     "add_more": "添加更多",
     "defaults": "默认值",
     "add_label": "添加标签",
+    "estimates": "估算",
     "customize_time_range": "自定义时间范围",
     "loading": "加载中",
     "attachments": "附件",
     "property": "属性",
     "properties": "属性",
     "parent": "父项",
-    "page": "页面",
     "remove": "移除",
     "archiving": "归档中",
     "archive": "归档",
@@ -831,6 +825,8 @@
     "select": "选择",
     "upgrade": "升级",
     "add_seats": "添加席位",
+    "label": "标签",
+    "priorities": "优先级",
     "projects": "项目",
     "workspace": "工作区",
     "workspaces": "工作区",
@@ -849,16 +845,6 @@
     "disconnecting": "正在断开连接",
     "installing": "正在安装",
     "install": "安装",
-    "reset": "重置",
-    "live": "实时",
-    "change_history": "变更历史",
-    "coming_soon": "即将推出",
-    "members": "成员",
-    "you": "你",
-    "upgrade_cta": {
-      "higher_subscription": "升级到更高订阅",
-      "talk_to_sales": "联系销售"
-    },
     "category": "类别",
     "categories": "类别",
     "saving": "保存中",
@@ -866,8 +852,7 @@
     "delete": "删除",
     "deleting": "删除中",
     "pending": "待处理",
-    "invite": "邀请",
-    "view": "查看"
+    "invite": "邀请"
   },
 
   "chart": {
@@ -985,8 +970,7 @@
         "sub_issue_count": "子工作项数量",
         "attachment_count": "附件数量",
         "created_on": "创建于",
-        "sub_issue": "子工作项",
-        "work_item_count": "工作项数量"
+        "sub_issue": "子工作项"
       },
       "extra": {
         "show_sub_issues": "显示子工作项",
@@ -1473,8 +1457,7 @@
             "max_length": "工作区名称不应超过80个字符"
           },
           "company_size": {
-            "required": "公司规模为必填项",
-            "select_a_range": "选择组织规模"
+            "required": "公司规模为必填项"
           }
         }
       },

packages/i18n/src/store/index.ts

@@ -3,7 +3,7 @@ import get from "lodash/get";
 import merge from "lodash/merge";
 import { makeAutoObservable, runInAction } from "mobx";
 // constants
-import { FALLBACK_LANGUAGE, SUPPORTED_LANGUAGES, LANGUAGE_STORAGE_KEY } from "../constants";
+import { FALLBACK_LANGUAGE, SUPPORTED_LANGUAGES, STORAGE_KEY } from "../constants";
 // core translations imports
 import coreEn from "../locales/en/core.json";
 // types
@@ -48,14 +48,14 @@ export class TranslationStore {
   private initializeLanguage() {
     if (typeof window === "undefined") return;
 
-    const savedLocale = localStorage.getItem(LANGUAGE_STORAGE_KEY) as TLanguage;
+    const savedLocale = localStorage.getItem(STORAGE_KEY) as TLanguage;
     if (this.isValidLanguage(savedLocale)) {
       this.setLanguage(savedLocale);
       return;
     }
 
-    // Fallback to default language
-    this.setLanguage(FALLBACK_LANGUAGE);
+    const browserLang = this.getBrowserLanguage();
+    this.setLanguage(browserLang);
   }
 
   /** Loads the translations for the current language */
@@ -147,24 +147,6 @@ export class TranslationStore {
         return import("../locales/ja/translations.json");
       case "zh-CN":
         return import("../locales/zh-CN/translations.json");
-      case "zh-TW":
-        return import("../locales/zh-TW/translations.json");
-      case "ru":
-        return import("../locales/ru/translations.json");
-      case "it":
-        return import("../locales/it/translations.json");
-      case "cs":
-        return import("../locales/cs/translations.json");
-      case "sk":
-        return import("../locales/sk/translations.json");
-      case "de":
-        return import("../locales/de/translations.json");
-      case "ua":
-        return import("../locales/ua/translations.json");
-      case "pl":
-        return import("../locales/pl/translations.json");
-      case "ko":
-        return import("../locales/ko/translations.json");
       default:
         throw new Error(`Unsupported language: ${language}`);
     }
@@ -175,6 +157,40 @@ export class TranslationStore {
     return lang !== null && this.availableLanguages.some((l) => l.value === lang);
   }
 
+  /** Checks if a language code is similar to any supported language */
+  private findSimilarLanguage(lang: string): TLanguage | null {
+    // Convert to lowercase for case-insensitive comparison
+    const normalizedLang = lang.toLowerCase();
+
+    // Find a supported language that includes or is included in the browser language
+    const similarLang = this.availableLanguages.find(
+      (l) => normalizedLang.includes(l.value.toLowerCase()) || l.value.toLowerCase().includes(normalizedLang)
+    );
+
+    return similarLang ? similarLang.value : null;
+  }
+
+  /** Gets the browser language based on the navigator.language */
+  private getBrowserLanguage(): TLanguage {
+    const browserLang = navigator.language;
+
+    // Check exact match first
+    if (this.isValidLanguage(browserLang)) {
+      return browserLang;
+    }
+
+    // Check base language without region code
+    const baseLang = browserLang.split("-")[0];
+    if (this.isValidLanguage(baseLang)) {
+      return baseLang as TLanguage;
+    }
+
+    // Try to find a similar language
+    const similarLang = this.findSimilarLanguage(browserLang) || this.findSimilarLanguage(baseLang);
+
+    return similarLang || FALLBACK_LANGUAGE;
+  }
+
   /**
    * Gets the cache key for the given key and locale
    * @param key - the key to get the cache key for
@@ -259,7 +275,7 @@ export class TranslationStore {
       }
 
       if (typeof window !== "undefined") {
-        localStorage.setItem(LANGUAGE_STORAGE_KEY, lng);
+        localStorage.setItem(STORAGE_KEY, lng);
         document.documentElement.lang = lng;
       }
 

packages/i18n/src/types/language.ts

@@ -1,4 +1,4 @@
-export type TLanguage = "en" | "fr" | "es" | "ja" | "zh-CN" | "zh-TW" | "ru" | "it" | "cs" | "sk" | "de" | "ua" | "pl" | "ko";
+export type TLanguage = "en" | "fr" | "es" | "ja" | "zh-CN";
 
 export interface ILanguageOption {
   label: string;

packages/logger/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@plane/logger",
-  "version": "0.25.2",
-  "license": "AGPL-3.0",
+  "version": "0.24.1",
   "description": "Logger shared across multiple apps internally",
   "private": true,
   "main": "./src/index.ts",

packages/propel/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@plane/propel",
-  "version": "0.25.2",
+  "version": "0.24.1",
   "private": true,
-  "license": "AGPL-3.0",
   "scripts": {
     "lint": "eslint src --ext .ts,.tsx",
     "lint:errors": "eslint src --ext .ts,.tsx --quiet"

packages/services/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@plane/services",
-  "version": "0.25.2",
-  "license": "AGPL-3.0",
+  "version": "0.24.1",
   "private": true,
   "main": "./src/index.ts",
   "scripts": {
@@ -10,6 +9,6 @@
   },
   "dependencies": {
     "@plane/constants": "*",
-    "axios": "^1.8.3"
+    "axios": "^1.7.9"
   }
 }

packages/shared-state/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@plane/shared-state",
-  "version": "0.25.2",
-  "license": "AGPL-3.0",
+  "version": "0.24.1",
   "description": "Shared state shared across multiple apps internally",
   "private": true,
   "main": "./src/index.ts",

packages/tailwind-config/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@plane/tailwind-config",
-  "version": "0.25.2",
-  "license": "AGPL-3.0",
+  "version": "0.24.1",
   "description": "common tailwind configuration across monorepo",
   "main": "tailwind.config.js",
   "private": true,

packages/types/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@plane/types",
-  "version": "0.25.2",
-  "license": "AGPL-3.0",
+  "version": "0.24.1",
   "private": true,
   "types": "./src/index.d.ts",
   "main": "./src/index.d.ts"

packages/types/src/index.d.ts

@@ -40,4 +40,3 @@ export * from "./epics";
 export * from "./charts";
 export * from "./home";
 export * from "./stickies";
-export * from "./utils";

packages/types/src/utils.d.ts

@@ -1,7 +0,0 @@
-export type PartialDeep<K> = {
-  [attr in keyof K]?: K[attr] extends object ? PartialDeep<K[attr]> : K[attr];
-};
-
-export type CompleteOrEmpty<T> = T | Record<string, never>;
-
-export type MakeOptional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;

packages/types/src/view-props.d.ts

@@ -1,6 +1,9 @@
-import { TIssue } from "./issues/issue";
-
-export type TIssueLayouts = "list" | "kanban" | "calendar" | "spreadsheet" | "gantt_chart";
+export type TIssueLayouts =
+  | "list"
+  | "kanban"
+  | "calendar"
+  | "spreadsheet"
+  | "gantt_chart";
 
 export type TIssueGroupByOptions =
   | "state"
@@ -208,10 +211,3 @@ export interface IssuePaginationOptions {
   subGroupedBy?: TIssueGroupByOptions;
   orderBy?: TIssueOrderByOptions;
 }
-
-export type TSpreadsheetColumn = React.FC<{
-  issue: TIssue;
-  onClose: () => void;
-  onChange: (issue: TIssue, data: Partial<TIssue>, updates: any) => void;
-  disabled: boolean;
-}>;

packages/typescript-config/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@plane/typescript-config",
-  "version": "0.25.2",
-  "license": "AGPL-3.0",
+  "version": "0.24.1",
   "private": true,
   "files": [
     "base.json",

packages/ui/package.json

@@ -2,12 +2,12 @@
   "name": "@plane/ui",
   "description": "UI components shared across multiple apps internally",
   "private": true,
-  "version": "0.25.2",
+  "version": "0.24.1",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "sideEffects": false,
-  "license": "AGPL-3.0",
+  "license": "MIT",
   "files": [
     "dist/**"
   ],
@@ -71,7 +71,10 @@
     "postcss-cli": "^11.0.0",
     "postcss-nested": "^6.0.1",
     "storybook": "^8.1.1",
-    "tsup": "^8.4.0",
+    "tsup": "^7.2.0",
     "typescript": "5.3.3"
+  },
+  "resolutions": {
+    "@types/react": "^18.0.0"
   }
 }