fix: uuid validation error

.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

CONTRIBUTING.md

@@ -62,143 +62,17 @@ To ensure consistency throughout the source code, please keep these rules in min
 - All features or bug fixes must be tested by one or more specs (unit-tests).
 - We use [Eslint default rule guide](https://eslint.org/docs/rules/), with minor changes. An automated formatter is available using prettier.
 
+## Need help? Questions and suggestions
+
+Questions, suggestions, and thoughts are most welcome. We can also be reached in our [Discord Server](https://discord.com/invite/A92xrEGCge).
+
 ## Ways to contribute
 
 - Try Plane Cloud and the self hosting platform and give feedback
 - Add new integrations
-- Add or update translations
 - Help with open [issues](https://github.com/makeplane/plane/issues) or [create your own](https://github.com/makeplane/plane/issues/new/choose)
 - Share your thoughts and suggestions with us
 - Help create tutorials and blog posts
 - Request a feature by submitting a proposal
 - Report a bug
 - **Improve documentation** - fix incomplete or missing [docs](https://docs.plane.so/), bad wording, examples or explanations.
-
-## Contributing to language support
-This guide is designed to help contributors understand how to add or update translations in the application. 
-
-### Understanding translation structure
-
-#### File organization
-Translations are organized by language in the locales directory. Each language has its own folder containing JSON files for translations. Here's how it looks:
-
-```
-packages/i18n/src/locales/
-    ├── en/
-    │   ├── core.json       # Critical translations
-    │   └── translations.json
-    ├── fr/
-    │   └── translations.json
-    └── [language]/
-        └── translations.json   
-```
-#### Nested structure
-To keep translations organized, we use a nested structure for keys. This makes it easier to manage and locate specific translations. For example:
-
-```json
-{
-  "issue": {
-    "label": "Work item",
-    "title": {
-      "label": "Work item title"
-    }
-  }
-}
-```
-
-### Translation formatting guide
-We use [IntlMessageFormat](https://formatjs.github.io/docs/intl-messageformat/) to handle dynamic content, such as variables and pluralization. Here's how to format your translations:
-
-#### Examples
-- **Simple variables** 
-    ```json
-    {
-    "greeting": "Hello, {name}!"
-    }
-    ```
-
-- **Pluralization** 
-    ```json
-    {
-    "items": "{count, plural, one {Work item} other {Work items}}"
-    }
-    ```
-
-### Contributing guidelines
-
-#### Updating existing translations
-1. Locate the key in `locales/<language>/translations.json`.
-
-2. Update the value while ensuring the key structure remains intact.
-3. Preserve any existing ICU formats (e.g., variables, pluralization).
-
-#### Adding new translation keys
-1. When introducing a new key, ensure it is added to **all** language files, even if translations are not immediately available. Use English as a placeholder if needed.
-
-2. Keep the nesting structure consistent across all languages.
-
-3. If the new key requires dynamic content (e.g., variables or pluralization), ensure the ICU format is applied uniformly across all languages.
-
-### Adding new languages
-Adding a new language involves several steps to ensure it integrates seamlessly with the project. Follow these instructions carefully:
-
-1. **Update type definitions**  
-Add the new language to the TLanguage type in the language definitions file:
-
-    ```typescript
-    // types/language.ts
-    export type TLanguage = "en" | "fr" | "your-lang";
-    ``` 
-
-2. **Add language configuration**  
-Include the new language in the list of supported languages:
-
-    ```typescript
-    // constants/language.ts
-    export const SUPPORTED_LANGUAGES: ILanguageOption[] = [
-    { label: "English", value: "en" },
-    { label: "Your Language", value: "your-lang" }
-    ];
-    ```
-
-3. **Create translation files**  
-    1.  Create a new folder for your language under locales (e.g., `locales/your-lang/`).
-
-    2. Add a `translations.json` file inside the folder.
-
-    3. Copy the structure from an existing translation file and translate all keys.
-
-4. **Update import logic**  
-Modify the language import logic to include your new language:
-
-    ```typescript
-    private importLanguageFile(language: TLanguage): Promise<any> {
-    switch (language) {
-        case "your-lang":
-        return import("../locales/your-lang/translations.json");
-        // ...
-    }
-    }
-    ```
-
-### Quality checklist
-Before submitting your contribution, please ensure the following:
-
-- All translation keys exist in every language file.
-- Nested structures match across all language files.
-- ICU message formats are correctly implemented.
-- All languages load without errors in the application.
-- Dynamic values and pluralization work as expected.
-- There are no missing or untranslated keys.
-
-#### Pro tips
-- When in doubt, refer to the English translations for context.
-- Verify pluralization works with different numbers.
-- Ensure dynamic values (e.g., `{name}`) are correctly interpolated.
-- Double-check that nested key access paths are accurate.
-
-Happy translating! 🌍✨
-
-## Need help? Questions and suggestions
-
-Questions, suggestions, and thoughts are most welcome. We can also be reached in our [Discord Server](https://discord.com/invite/A92xrEGCge).

ENV_SETUP.md

@@ -43,6 +43,9 @@ NGINX_PORT=80
 # Debug value for api server use it as 0 for production use
 DEBUG=0
 CORS_ALLOWED_ORIGINS="http://localhost"
+# Error logs
+SENTRY_DSN=""
+SENTRY_ENVIRONMENT="development"
 # Database Settings
 POSTGRES_USER="plane"
 POSTGRES_PASSWORD="plane"

admin/app/authentication/github/form.tsx

@@ -43,7 +43,6 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
     defaultValues: {
       GITHUB_CLIENT_ID: config["GITHUB_CLIENT_ID"],
       GITHUB_CLIENT_SECRET: config["GITHUB_CLIENT_SECRET"],
-      GITHUB_ORGANIZATION_ID: config["GITHUB_ORGANIZATION_ID"],
     },
   });
 
@@ -94,19 +93,6 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
       error: Boolean(errors.GITHUB_CLIENT_SECRET),
       required: true,
     },
-    {
-      key: "GITHUB_ORGANIZATION_ID",
-      type: "text",
-      label: "Organization ID",
-      description: (
-        <>
-          The organization github ID.
-        </>
-      ),
-      placeholder: "123456789",
-      error: Boolean(errors.GITHUB_ORGANIZATION_ID),
-      required: false,
-    },
   ];
 
   const GITHUB_SERVICE_FIELD: TCopyField[] = [
@@ -164,7 +150,6 @@ export const InstanceGithubConfigForm: FC<Props> = (props) => {
         reset({
           GITHUB_CLIENT_ID: response.find((item) => item.key === "GITHUB_CLIENT_ID")?.value,
           GITHUB_CLIENT_SECRET: response.find((item) => item.key === "GITHUB_CLIENT_SECRET")?.value,
-          GITHUB_ORGANIZATION_ID: response.find((item) => item.key === "GITHUB_ORGANIZATION_ID")?.value,
         });
       })
       .catch((err) => console.error(err));

admin/next.config.js

@@ -9,19 +9,6 @@ const nextConfig = {
     unoptimized: true,
   },
   basePath: process.env.NEXT_PUBLIC_ADMIN_BASE_PATH || "",
-  transpilePackages: [
-    "@plane/constants",
-    "@plane/editor",
-    "@plane/hooks",
-    "@plane/i18n",
-    "@plane/logger",
-    "@plane/propel",
-    "@plane/services",
-    "@plane/shared-state",
-    "@plane/types",
-    "@plane/ui",
-    "@plane/utils",
-  ],
 };
 
 module.exports = nextConfig;

admin/package.json

@@ -1,8 +1,6 @@
 {
   "name": "admin",
-  "description": "Admin UI for Plane",
-  "version": "0.25.3",
-  "license": "AGPL-3.0",
+  "version": "0.24.1",
   "private": true,
   "scripts": {
     "dev": "turbo run develop",
@@ -21,15 +19,16 @@
     "@plane/ui": "*",
     "@plane/utils": "*",
     "@plane/services": "*",
+    "@sentry/nextjs": "^8.54.0",
     "@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",
     "mobx-react": "^9.1.1",
-    "next": "^14.2.25",
+    "next": "^14.2.20",
     "next-themes": "^0.2.1",
     "postcss": "^8.4.38",
     "react": "^18.3.1",

aio/Dockerfile-app

@@ -145,8 +145,11 @@ RUN chmod +x /app/pg-setup.sh
 #  APPLICATION ENVIRONMENT SETTINGS
 # *****************************************************************************
 ENV APP_DOMAIN=localhost
+
 ENV WEB_URL=http://${APP_DOMAIN}
 ENV DEBUG=0
+ENV SENTRY_DSN=
+ENV SENTRY_ENVIRONMENT=production
 ENV CORS_ALLOWED_ORIGINS=http://${APP_DOMAIN},https://${APP_DOMAIN}
 # Secret Key
 ENV SECRET_KEY=60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5

apiserver/.env.example

@@ -3,6 +3,10 @@
 DEBUG=0
 CORS_ALLOWED_ORIGINS="http://localhost"
 
+# Error logs
+SENTRY_DSN=""
+SENTRY_ENVIRONMENT="development"
+
 # Database Settings
 POSTGRES_USER="plane"
 POSTGRES_PASSWORD="plane"
@@ -55,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.3",
-  "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/cycle.py

@@ -1,5 +1,4 @@
 # Third party imports
-import pytz
 from rest_framework import serializers
 
 # Module imports
@@ -19,14 +18,6 @@ class CycleSerializer(BaseSerializer):
     completed_estimates = serializers.FloatField(read_only=True)
     started_estimates = serializers.FloatField(read_only=True)
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        project = self.context.get("project")
-        if project and project.timezone:
-            project_timezone = pytz.timezone(project.timezone)
-            self.fields["start_date"].timezone = project_timezone
-            self.fields["end_date"].timezone = project_timezone
-
     def validate(self, data):
         if (
             data.get("start_date", None) is not None

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/api/views/cycle.py

@@ -137,12 +137,10 @@ class CycleAPIEndpoint(BaseAPIView):
         )
 
     def get(self, request, slug, project_id, pk=None):
-        project = Project.objects.get(workspace__slug=slug, pk=project_id)
         if pk:
             queryset = self.get_queryset().filter(archived_at__isnull=True).get(pk=pk)
             data = CycleSerializer(
-                queryset, fields=self.fields,
-                expand=self.expand, context={"project": project}
+                queryset, fields=self.fields, expand=self.expand
             ).data
             return Response(data, status=status.HTTP_200_OK)
         queryset = self.get_queryset().filter(archived_at__isnull=True)
@@ -154,8 +152,7 @@ class CycleAPIEndpoint(BaseAPIView):
                 start_date__lte=timezone.now(), end_date__gte=timezone.now()
             )
             data = CycleSerializer(
-                queryset, many=True, fields=self.fields,
-                expand=self.expand, context={"project": project}
+                queryset, many=True, fields=self.fields, expand=self.expand
             ).data
             return Response(data, status=status.HTTP_200_OK)
 
@@ -166,8 +163,7 @@ class CycleAPIEndpoint(BaseAPIView):
                 request=request,
                 queryset=(queryset),
                 on_results=lambda cycles: CycleSerializer(
-                    cycles, many=True, fields=self.fields,
-                    expand=self.expand, context={"project": project}
+                    cycles, many=True, fields=self.fields, expand=self.expand
                 ).data,
             )
 
@@ -178,8 +174,7 @@ class CycleAPIEndpoint(BaseAPIView):
                 request=request,
                 queryset=(queryset),
                 on_results=lambda cycles: CycleSerializer(
-                    cycles, many=True, fields=self.fields,
-                    expand=self.expand, context={"project": project}
+                    cycles, many=True, fields=self.fields, expand=self.expand
                 ).data,
             )
 
@@ -190,8 +185,7 @@ class CycleAPIEndpoint(BaseAPIView):
                 request=request,
                 queryset=(queryset),
                 on_results=lambda cycles: CycleSerializer(
-                    cycles, many=True, fields=self.fields,
-                    expand=self.expand, context={"project": project}
+                    cycles, many=True, fields=self.fields, expand=self.expand
                 ).data,
             )
 
@@ -204,16 +198,14 @@ class CycleAPIEndpoint(BaseAPIView):
                 request=request,
                 queryset=(queryset),
                 on_results=lambda cycles: CycleSerializer(
-                    cycles, many=True, fields=self.fields,
-                    expand=self.expand, context={"project": project}
+                    cycles, many=True, fields=self.fields, expand=self.expand
                 ).data,
             )
         return self.paginate(
             request=request,
             queryset=(queryset),
             on_results=lambda cycles: CycleSerializer(
-                cycles, many=True, fields=self.fields,
-                expand=self.expand, context={"project": project}
+                cycles, many=True, fields=self.fields, expand=self.expand
             ).data,
         )
 

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,
@@ -268,20 +250,6 @@ class IssueActivitySerializer(BaseSerializer):
     issue_detail = IssueFlatSerializer(read_only=True, source="issue")
     project_detail = ProjectLiteSerializer(read_only=True, source="project")
     workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
-    source_data = serializers.SerializerMethodField()
-
-    def get_source_data(self, obj):
-        if (
-            hasattr(obj, "issue")
-            and hasattr(obj.issue, "source_data")
-            and obj.issue.source_data
-        ):
-            return {
-                "source": obj.issue.source_data[0].source,
-                "source_email": obj.issue.source_data[0].source_email,
-                "extra": obj.issue.source_data[0].extra,
-            }
-        return None
 
     class Meta:
         model = IssueActivity
@@ -554,7 +522,6 @@ class IssueAttachmentLiteSerializer(DynamicBaseSerializer):
             "asset",
             "attributes",
             # "issue_id",
-            "created_by",
             "updated_at",
             "updated_by",
             "asset_url",

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/cycle/base.py

@@ -268,7 +268,7 @@ class CycleViewSet(BaseViewSet):
         )
         datetime_fields = ["start_date", "end_date"]
         data = user_timezone_converter(
-            data, datetime_fields, project_timezone
+            data, datetime_fields, request.user.user_timezone
         )
         return Response(data, status=status.HTTP_200_OK)
 
@@ -318,13 +318,9 @@ class CycleViewSet(BaseViewSet):
                     .first()
                 )
 
-                # Fetch the project timezone
-                project = Project.objects.get(id=self.kwargs.get("project_id"))
-                project_timezone = project.timezone
-
                 datetime_fields = ["start_date", "end_date"]
                 cycle = user_timezone_converter(
-                    cycle, datetime_fields, project_timezone
+                    cycle, datetime_fields, request.user.user_timezone
                 )
 
                 # Send the model activity
@@ -411,13 +407,9 @@ class CycleViewSet(BaseViewSet):
                 "created_by",
             ).first()
 
-            # Fetch the project timezone
-            project = Project.objects.get(id=self.kwargs.get("project_id"))
-            project_timezone = project.timezone
-
             datetime_fields = ["start_date", "end_date"]
             cycle = user_timezone_converter(
-                cycle, datetime_fields, project_timezone
+                cycle, datetime_fields, request.user.user_timezone
             )
 
             # Send the model activity
@@ -488,11 +480,10 @@ class CycleViewSet(BaseViewSet):
             )
 
         queryset = queryset.first()
-        # Fetch the project timezone
-        project = Project.objects.get(id=self.kwargs.get("project_id"))
-        project_timezone = project.timezone
         datetime_fields = ["start_date", "end_date"]
-        data = user_timezone_converter(data, datetime_fields, project_timezone)
+        data = user_timezone_converter(
+            data, datetime_fields, request.user.user_timezone
+        )
 
         recent_visited_task.delay(
             slug=slug,

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

@@ -14,7 +14,7 @@ from rest_framework import status
 from .. import BaseAPIView
 from plane.app.serializers import IssueActivitySerializer, IssueCommentSerializer
 from plane.app.permissions import ProjectEntityPermission, allow_permission, ROLE
-from plane.db.models import IssueActivity, IssueComment, CommentReaction, IntakeIssue
+from plane.db.models import IssueActivity, IssueComment, CommentReaction
 
 
 class IssueActivityEndpoint(BaseAPIView):
@@ -57,22 +57,13 @@ class IssueActivityEndpoint(BaseAPIView):
                 )
             )
         )
+        issue_activities = IssueActivitySerializer(issue_activities, many=True).data
+        issue_comments = IssueCommentSerializer(issue_comments, many=True).data
 
         if request.GET.get("activity_type", None) == "issue-property":
-            issue_activities = issue_activities.prefetch_related(
-                Prefetch(
-                    "issue__issue_intake",
-                    queryset=IntakeIssue.objects.only(
-                        "source_email", "source", "extra"
-                    ),
-                    to_attr="source_data",
-                )
-            )
-            issue_activities = IssueActivitySerializer(issue_activities, many=True).data
             return Response(issue_activities, status=status.HTTP_200_OK)
 
         if request.GET.get("activity_type", None) == "issue-comment":
-            issue_comments = IssueCommentSerializer(issue_comments, many=True).data
             return Response(issue_comments, status=status.HTTP_200_OK)
 
         result_list = sorted(

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

@@ -45,7 +45,6 @@ from plane.db.models import (
     ProjectMember,
     CycleIssue,
     UserRecentVisit,
-    ModuleIssue,
 )
 from plane.utils.grouper import (
     issue_group_values,
@@ -548,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
         """
 
@@ -636,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(
@@ -739,13 +736,6 @@ class BulkDeleteIssuesEndpoint(BaseAPIView):
 
         total_issues = len(issues)
 
-        # First, delete all related cycle issues
-        CycleIssue.objects.filter(issue_id__in=issue_ids).delete()
-
-        # Then, delete all related module issues
-        ModuleIssue.objects.filter(issue_id__in=issue_ids).delete()
-
-        # Finally, delete the issues themselves
         issues.delete()
 
         return Response(
@@ -1109,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(
@@ -1124,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
@@ -1243,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,
                     )
@@ -1260,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/project/base.py

@@ -177,9 +177,7 @@ class ProjectViewSet(BaseViewSet):
             "module_view",
             "page_view",
             "inbox_view",
-            "guest_view_all_features",
             "project_lead",
-            "network",
             "created_at",
             "updated_at",
             "created_by",

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

@@ -16,17 +16,17 @@ from rest_framework.permissions import AllowAny
 # Module imports
 from .base import BaseViewSet, BaseAPIView
 from plane.app.serializers import ProjectMemberInviteSerializer
+
 from plane.app.permissions import allow_permission, ROLE
+
 from plane.db.models import (
     ProjectMember,
     Workspace,
     ProjectMemberInvite,
     User,
     WorkspaceMember,
-    Project,
     IssueUserProperty,
 )
-from plane.db.models.project import ProjectNetwork
 
 
 class ProjectInvitationsViewset(BaseViewSet):
@@ -128,7 +128,6 @@ class UserProjectInvitationsViewset(BaseViewSet):
             .select_related("workspace", "workspace__owner", "project")
         )
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")
     def create(self, request, slug):
         project_ids = request.data.get("project_ids", [])
 
@@ -137,20 +136,11 @@ class UserProjectInvitationsViewset(BaseViewSet):
             member=request.user, workspace__slug=slug, is_active=True
         )
 
-        # Get all the projects
-        projects = Project.objects.filter(
-            id__in=project_ids, workspace__slug=slug
-        ).only("id", "network")
-        # Check if user has permission to join each project
-        for project in projects:
-            if (
-                project.network == ProjectNetwork.SECRET.value
-                and workspace_member.role != ROLE.ADMIN.value
-            ):
-                return Response(
-                    {"error": "Only workspace admins can join private project"},
-                    status=status.HTTP_403_FORBIDDEN,
-                )
+        if workspace_member.role not in [ROLE.ADMIN.value, ROLE.MEMBER.value]:
+            return Response(
+                {"error": "You do not have permission to join the project"},
+                status=status.HTTP_403_FORBIDDEN,
+            )
 
         workspace_role = workspace_member.role
         workspace = workspace_member.workspace

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

@@ -10,7 +10,11 @@ from plane.app.serializers import (
     ProjectMemberRoleSerializer,
 )
 
-from plane.app.permissions import WorkspaceUserPermission
+from plane.app.permissions import (
+    ProjectMemberPermission,
+    ProjectLitePermission,
+    WorkspaceUserPermission,
+)
 
 from plane.db.models import Project, ProjectMember, IssueUserProperty, WorkspaceMember
 from plane.bgtasks.project_add_user_email_task import project_add_user_email
@@ -22,6 +26,14 @@ class ProjectMemberViewSet(BaseViewSet):
     serializer_class = ProjectMemberAdminSerializer
     model = ProjectMember
 
+    def get_permissions(self):
+        if self.action == "leave":
+            self.permission_classes = [ProjectLitePermission]
+        else:
+            self.permission_classes = [ProjectMemberPermission]
+
+        return super(ProjectMemberViewSet, self).get_permissions()
+
     search_fields = ["member__display_name", "member__first_name"]
 
     def get_queryset(self):
@@ -175,20 +187,12 @@ class ProjectMemberViewSet(BaseViewSet):
         )
         return Response(serializer.data, status=status.HTTP_200_OK)
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN])
     def partial_update(self, request, slug, project_id, pk):
         project_member = ProjectMember.objects.get(
             pk=pk, workspace__slug=slug, project_id=project_id, is_active=True
         )
-
-        # Fetch the workspace role of the project member
-        workspace_role = WorkspaceMember.objects.get(
-            workspace__slug=slug, member=project_member.member, is_active=True
-        ).role
-        is_workspace_admin = workspace_role == ROLE.ADMIN.value
-
-        # Check if the user is not editing their own role if they are not an admin
-        if request.user.id == project_member.member_id and not is_workspace_admin:
+        if request.user.id == project_member.member_id:
             return Response(
                 {"error": "You cannot update your own role"},
                 status=status.HTTP_400_BAD_REQUEST,
@@ -201,6 +205,9 @@ class ProjectMemberViewSet(BaseViewSet):
             is_active=True,
         )
 
+        workspace_role = WorkspaceMember.objects.get(
+            workspace__slug=slug, member=project_member.member, is_active=True
+        ).role
         if workspace_role in [5] and int(
             request.data.get("role", project_member.role)
         ) in [15, 20]:
@@ -215,7 +222,6 @@ class ProjectMemberViewSet(BaseViewSet):
             "role" in request.data
             and int(request.data.get("role", project_member.role))
             > requested_project_member.role
-            and not is_workspace_admin
         ):
             return Response(
                 {"error": "You cannot update a role that is higher than your own role"},

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

@@ -117,7 +117,7 @@ class WorkspaceViewViewSet(BaseViewSet):
         return Response(serializer.data, status=status.HTTP_200_OK)
 
     @allow_permission(
-        allowed_roles=[ROLE.ADMIN], level="WORKSPACE", creator=True, model=IssueView
+        allowed_roles=[], level="WORKSPACE", creator=True, model=IssueView
     )
     def destroy(self, request, slug, pk):
         workspace_view = IssueView.objects.get(pk=pk, workspace__slug=slug)

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/app/views/workspace/member.py

@@ -68,11 +68,10 @@ class WorkSpaceMemberViewSet(BaseViewSet):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        # If a user is moved to a guest role he can't have any other role in projects
-        if "role" in request.data and int(request.data.get("role")) == 5:
-            ProjectMember.objects.filter(
+        if workspace_member.role > int(request.data.get("role")):
+            _ = ProjectMember.objects.filter(
                 workspace__slug=slug, member_id=workspace_member.member_id
-            ).update(role=5)
+            ).update(role=int(request.data.get("role")))
 
         serializer = WorkSpaceMemberSerializer(
             workspace_member, data=request.data, partial=True

apiserver/plane/authentication/adapter/error.py

@@ -36,12 +36,10 @@ AUTHENTICATION_ERROR_CODES = {
     "OAUTH_NOT_CONFIGURED": 5104,
     "GOOGLE_NOT_CONFIGURED": 5105,
     "GITHUB_NOT_CONFIGURED": 5110,
-    "GITHUB_USER_NOT_IN_ORG": 5122,
     "GITLAB_NOT_CONFIGURED": 5111,
     "GOOGLE_OAUTH_PROVIDER_ERROR": 5115,
     "GITHUB_OAUTH_PROVIDER_ERROR": 5120,
     "GITLAB_OAUTH_PROVIDER_ERROR": 5121,
-
     # Reset Password
     "INVALID_PASSWORD_TOKEN": 5125,
     "EXPIRED_PASSWORD_TOKEN": 5130,

apiserver/plane/authentication/provider/oauth/github.py

@@ -18,16 +18,11 @@ from plane.authentication.adapter.error import (
 class GitHubOAuthProvider(OauthAdapter):
     token_url = "https://github.com/login/oauth/access_token"
     userinfo_url = "https://api.github.com/user"
-    org_membership_url = f"https://api.github.com/orgs"
-
     provider = "github"
     scope = "read:user user:email"
 
-    organization_scope = "read:org"
-
-
     def __init__(self, request, code=None, state=None, callback=None):
-        GITHUB_CLIENT_ID, GITHUB_CLIENT_SECRET, GITHUB_ORGANIZATION_ID = get_configuration_value(
+        GITHUB_CLIENT_ID, GITHUB_CLIENT_SECRET = get_configuration_value(
             [
                 {
                     "key": "GITHUB_CLIENT_ID",
@@ -37,10 +32,6 @@ class GitHubOAuthProvider(OauthAdapter):
                     "key": "GITHUB_CLIENT_SECRET",
                     "default": os.environ.get("GITHUB_CLIENT_SECRET"),
                 },
-                {
-                    "key": "GITHUB_ORGANIZATION_ID",
-                    "default": os.environ.get("GITHUB_ORGANIZATION_ID"),
-                },
             ]
         )
 
@@ -52,10 +43,6 @@ class GitHubOAuthProvider(OauthAdapter):
 
         client_id = GITHUB_CLIENT_ID
         client_secret = GITHUB_CLIENT_SECRET
-        self.organization_id = GITHUB_ORGANIZATION_ID
-
-        if self.organization_id:
-            self.scope += f" {self.organization_scope}"
 
         redirect_uri = f"""{"https" if request.is_secure() else "http"}://{request.get_host()}/auth/github/callback/"""
         url_params = {
@@ -126,26 +113,12 @@ class GitHubOAuthProvider(OauthAdapter):
                 error_message="GITHUB_OAUTH_PROVIDER_ERROR",
             )
 
-    def is_user_in_organization(self, github_username):
-        headers = {"Authorization": f"Bearer {self.token_data.get('access_token')}"}
-        response = requests.get(f"{self.org_membership_url}/{self.organization_id}/memberships/{github_username}", headers=headers)
-        return response.status_code == 200  # 200 means the user is a member
-
     def set_user_data(self):
         user_info_response = self.get_user_response()
         headers = {
             "Authorization": f"Bearer {self.token_data.get('access_token')}",
             "Accept": "application/json",
         }
-
-        if self.organization_id:
-            if not self.is_user_in_organization(user_info_response.get("login")):
-                raise AuthenticationException(
-                    error_code=AUTHENTICATION_ERROR_CODES["GITHUB_USER_NOT_IN_ORG"],
-                    error_message="GITHUB_USER_NOT_IN_ORG",
-                )
-
-
         email = self.__get_email(headers=headers)
         super().set_user_data(
             {

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

@@ -11,6 +11,7 @@ from django.utils import timezone
 
 
 # Module imports
+from plane.utils.valid_uuid import is_valid_uuid
 from plane.app.serializers import IssueActivitySerializer
 from plane.bgtasks.notification_task import notifications
 from plane.db.models import (
@@ -32,7 +33,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 +853,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,8 +1569,8 @@ def issue_activity(
     try:
         issue_activities = []
 
-        # check if project_id is valid
-        if not is_valid_uuid(str(project_id)):
+        # Validate UUIDs
+        if not is_valid_uuid(project_id):
             return
 
         project = Project.objects.get(pk=project_id)

apiserver/plane/celery.py

@@ -15,35 +15,34 @@ app = Celery("plane")
 app.config_from_object("django.conf:settings", namespace="CELERY")
 
 app.conf.beat_schedule = {
-    # Intra day recurring jobs
-    "check-every-five-minutes-to-send-email-notifications": {
-        "task": "plane.bgtasks.email_notification_task.stack_email_notification",
-        "schedule": crontab(minute="*/5"),  # Every 5 minutes
-    },
-    "run-every-6-hours-for-instance-trace": {
-        "task": "plane.license.bgtasks.tracer.instance_traces",
-        "schedule": crontab(hour="*/6", minute=0),  # Every 6 hours
-    },
-    # Occurs once every day
-    "check-every-day-to-delete-hard-delete": {
-        "task": "plane.bgtasks.deletion_task.hard_delete",
-        "schedule": crontab(hour=0, minute=0),  # UTC 00:00
-    },
+    # Executes every day at 12 AM
     "check-every-day-to-archive-and-close": {
         "task": "plane.bgtasks.issue_automation_task.archive_and_close_old_issues",
-        "schedule": crontab(hour=1, minute=0),  # UTC 01:00
+        "schedule": crontab(hour=0, minute=0),
     },
     "check-every-day-to-delete_exporter_history": {
         "task": "plane.bgtasks.exporter_expired_task.delete_old_s3_link",
-        "schedule": crontab(hour=1, minute=30),  # UTC 01:30
+        "schedule": crontab(hour=0, minute=0),
     },
     "check-every-day-to-delete-file-asset": {
         "task": "plane.bgtasks.file_asset_task.delete_unuploaded_file_asset",
-        "schedule": crontab(hour=2, minute=0),  # UTC 02:00
+        "schedule": crontab(hour=0, minute=0),
+    },
+    "check-every-five-minutes-to-send-email-notifications": {
+        "task": "plane.bgtasks.email_notification_task.stack_email_notification",
+        "schedule": crontab(minute="*/5"),
+    },
+    "check-every-day-to-delete-hard-delete": {
+        "task": "plane.bgtasks.deletion_task.hard_delete",
+        "schedule": crontab(hour=0, minute=0),
     },
     "check-every-day-to-delete-api-logs": {
         "task": "plane.bgtasks.api_logs_task.delete_api_logs",
-        "schedule": crontab(hour=2, minute=30),  # UTC 02:30
+        "schedule": crontab(hour=0, minute=0),
+    },
+    "run-every-6-hours-for-instance-trace": {
+        "task": "plane.license.bgtasks.tracer.instance_traces",
+        "schedule": crontab(hour="*/6", minute=0),
     },
 }
 

apiserver/plane/db/migrations/0043_alter_analyticview_created_by_and_more.py

@@ -3,6 +3,7 @@
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
+from sentry_sdk import capture_exception
 import uuid
 
 
@@ -28,6 +29,7 @@ def create_issue_relation(apps, schema_editor):
         )
     except Exception as e:
         print(e)
+        capture_exception(e)
 
 
 def update_issue_priority_choice(apps, schema_editor):

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/db/models/project.py

@@ -1,7 +1,6 @@
 # Python imports
 import pytz
 from uuid import uuid4
-from enum import Enum
 
 # Django imports
 from django.conf import settings
@@ -18,15 +17,6 @@ from .base import BaseModel
 ROLE_CHOICES = ((20, "Admin"), (15, "Member"), (5, "Guest"))
 
 
-class ProjectNetwork(Enum):
-    SECRET = 0
-    PUBLIC = 2
-
-    @classmethod
-    def choices(cls):
-        return [(0, "Secret"), (2, "Public")]
-
-
 def get_default_props():
     return {
         "filters": {

apiserver/plane/license/management/commands/configure_instance.py

@@ -71,12 +71,6 @@ class Command(BaseCommand):
                 "category": "GITHUB",
                 "is_encrypted": True,
             },
-            {
-                "key": "GITHUB_ORGANIZATION_ID",
-                "value": os.environ.get("GITHUB_ORGANIZATION_ID"),
-                "category": "GITHUB",
-                "is_encrypted": False,
-            },
             {
                 "key": "GITLAB_HOST",
                 "value": os.environ.get("GITLAB_HOST"),

apiserver/plane/settings/common.py

@@ -7,9 +7,13 @@ from urllib.parse import urlparse
 
 # Third party imports
 import dj_database_url
+import sentry_sdk
 
 # Django imports
 from django.core.management.utils import get_random_secret_key
+from sentry_sdk.integrations.celery import CeleryIntegration
+from sentry_sdk.integrations.django import DjangoIntegration
+from sentry_sdk.integrations.redis import RedisIntegration
 from corsheaders.defaults import default_headers
 
 
@@ -263,6 +267,25 @@ CELERY_IMPORTS = (
     "plane.bgtasks.issue_description_version_sync",
 )
 
+# Sentry Settings
+# Enable Sentry Settings
+if bool(os.environ.get("SENTRY_DSN", False)) and os.environ.get(
+    "SENTRY_DSN"
+).startswith("https://"):
+    sentry_sdk.init(
+        dsn=os.environ.get("SENTRY_DSN", ""),
+        integrations=[
+            DjangoIntegration(),
+            RedisIntegration(),
+            CeleryIntegration(monitor_beat_tasks=True),
+        ],
+        traces_sample_rate=1,
+        send_default_pii=True,
+        environment=os.environ.get("SENTRY_ENVIRONMENT", "development"),
+        profiles_sample_rate=float(os.environ.get("SENTRY_PROFILE_SAMPLE_RATE", 0)),
+    )
+
+
 FILE_SIZE_LIMIT = int(os.environ.get("FILE_SIZE_LIMIT", 5242880))
 
 # Unsplash Access key

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

@@ -5,6 +5,9 @@ import traceback
 # Django imports
 from django.conf import settings
 
+# Third party imports
+from sentry_sdk import capture_exception
+
 
 def log_exception(e):
     # Log the error
@@ -15,4 +18,6 @@ def log_exception(e):
         # Print the traceback if in debug mode
         print(traceback.format_exc())
 
+    # Capture in sentry if configured
+    capture_exception(e)
     return

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 +1,9 @@
 import uuid
 
-def is_valid_uuid(uuid_str):
+def is_valid_uuid(uuid_to_test, version=4):
     try:
-        uuid.UUID(uuid_str, version=4)
-        return True
+        # check for validity of Uuid
+        uuid_obj = uuid.UUID(uuid_to_test, version=version)
     except ValueError:
         return False
+    return True

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
@@ -26,6 +26,8 @@ faker==25.0.0
 django-filter==24.2
 # json model
 jsonmodels==2.7.0
+# sentry
+sentry-sdk==2.8.0
 # storage
 django-storages==1.14.2
 # user management
@@ -35,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
@@ -64,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

apiserver/requirements/production.txt

@@ -1,3 +1,3 @@
 -r base.txt
 # server
-gunicorn==23.0.0
+gunicorn==22.0.0

app.json

@@ -6,8 +6,16 @@
   "website": "https://plane.so/",
   "success_url": "/",
   "stack": "heroku-22",
-  "keywords": ["plane", "project management", "django", "next"],
-  "addons": ["heroku-postgresql:mini", "heroku-redis:mini"],
+  "keywords": [
+    "plane",
+    "project management",
+    "django",
+    "next"
+  ],
+  "addons": [
+    "heroku-postgresql:mini",
+    "heroku-redis:mini"
+  ],
   "buildpacks": [
     {
       "url": "https://github.com/heroku/heroku-buildpack-python.git"
@@ -53,6 +61,10 @@
       "description": "AWS Bucket Name to use for S3",
       "value": ""
     },
+    "SENTRY_DSN": {
+      "description": "",
+      "value": ""
+    },
     "WEB_URL": {
       "description": "Web URL for Plane this will be used for redirections in the emails",
       "value": ""
@@ -70,4 +82,4 @@
       "value": ""
     }
   }
-}
+}

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}
@@ -42,34 +43,40 @@ x-live-env: &live-env
 x-app-env: &app-env
   WEB_URL: ${WEB_URL:-http://localhost}
   DEBUG: ${DEBUG:-0}
+  SENTRY_DSN: ${SENTRY_DSN}
+  SENTRY_ENVIRONMENT: ${SENTRY_ENVIRONMENT:-production}
   CORS_ALLOWED_ORIGINS: ${CORS_ALLOWED_ORIGINS}
   GUNICORN_WORKERS: 1
   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
@@ -77,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
@@ -117,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
@@ -134,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
@@ -151,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:
@@ -179,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:
@@ -213,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
@@ -232,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,13 +5,12 @@ 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}
 DEBUG=0
+SENTRY_DSN=
+SENTRY_ENVIRONMENT=production
 CORS_ALLOWED_ORIGINS=http://${APP_DOMAIN}
 API_BASE_URL=http://api:8000
 
@@ -56,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.3",
-  "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",
@@ -23,9 +23,11 @@
     "@plane/constants": "*",
     "@plane/editor": "*",
     "@plane/types": "*",
+    "@sentry/node": "^9.0.1",
+    "@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",
@@ -57,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"
   }
 }

live/src/core/config/sentry-config.ts

@@ -0,0 +1,19 @@
+import * as Sentry from "@sentry/node";
+import { nodeProfilingIntegration } from "@sentry/profiling-node";
+
+// Ensure to call this before importing any other modules!
+Sentry.init({
+  dsn: process.env.LIVE_SENTRY_DSN,
+  environment: process.env.LIVE_SENTRY_ENVIRONMENT || "development",
+
+  integrations: [
+    // Add our Profiling integration
+    nodeProfilingIntegration(),
+  ],
+  // Add Tracing by setting tracesSampleRate
+  // We recommend adjusting this value in production
+  tracesSampleRate: Number(process.env.LIVE_SENTRY_TRACES_SAMPLE_RATE) || 0.5,
+  // Set sampling rate for profiling
+  // This is relative to tracesSampleRate
+  profilesSampleRate: 1.0,
+});

live/src/server.ts

@@ -1,8 +1,11 @@
+import * as Sentry from "@sentry/node";
 import compression from "compression";
 import cors from "cors";
 import expressWs from "express-ws";
 import express from "express";
 import helmet from "helmet";
+// config
+import "@/core/config/sentry-config.js";
 // hocuspocus server
 import { getHocusPocusServer } from "@/core/hocuspocus-server.js";
 // helpers
@@ -12,7 +15,7 @@ import { errorHandler } from "@/core/helpers/error-handler.js";
 // types
 import { TConvertDocumentRequestBody } from "@/core/types/common.js";
 
-const app: any = express();
+const app = express();
 expressWs(app);
 
 app.set("port", process.env.PORT || 3000);
@@ -89,6 +92,8 @@ app.use((_req, res) => {
   res.status(404).send("Not Found");
 });
 
+Sentry.setupExpressErrorHandler(app);
+
 app.use(errorHandler);
 
 const liveServer = app.listen(app.get("port"), () => {

live/tsconfig.json

@@ -16,6 +16,9 @@
     "skipLibCheck": true,
     "sourceMap": true,
     "inlineSources": true,
+    // Set `sourceRoot` to  "/" to strip the build path prefix
+    // from generated source code references.
+    // This improves issue grouping in Sentry.
     "sourceRoot": "/"
   },
   "include": ["src/**/*.ts", "tsup.config.ts"],

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.3",
+  "version": "0.24.1",
   "license": "AGPL-3.0",
   "private": true,
   "workspaces": [
@@ -24,13 +22,12 @@
   "devDependencies": {
     "prettier": "latest",
     "prettier-plugin-tailwindcss": "^0.5.4",
-    "turbo": "^2.4.2"
+    "turbo": "^2.4.1"
   },
   "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.3",
+  "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/filter.ts

@@ -339,7 +339,6 @@ export const ISSUE_DISPLAY_FILTERS_BY_PAGE: TIssueFiltersToDisplayByPageType = {
           "-updated_at",
           "start_date",
           "-priority",
-          "target_date",
         ],
         type: [null, "active", "backlog"],
       },

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 = [
@@ -83,14 +83,14 @@ export const WORKSPACE_SETTINGS = {
     key: "general",
     i18n_label: "workspace_settings.settings.general.title",
     href: `/settings`,
-    access: [EUserWorkspaceRoles.ADMIN, EUserWorkspaceRoles.MEMBER],
+    access: [EUserWorkspaceRoles.ADMIN],
     highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/settings/`,
   },
   members: {
     key: "members",
     i18n_label: "workspace_settings.settings.members.title",
     href: `/settings/members`,
-    access: [EUserWorkspaceRoles.ADMIN, EUserWorkspaceRoles.MEMBER],
+    access: [EUserWorkspaceRoles.ADMIN],
     highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/settings/members/`,
   },
   "billing-and-plans": {
@@ -123,10 +123,6 @@ export const WORKSPACE_SETTINGS = {
   },
 };
 
-export const WORKSPACE_SETTINGS_ACCESS = Object.fromEntries(
-  Object.entries(WORKSPACE_SETTINGS).map(([_, { href, access }]) => [href, access])
-);
-
 export const WORKSPACE_SETTINGS_LINKS: {
   key: string;
   i18n_label: string;
@@ -275,6 +271,12 @@ export const WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS: Record<string, IWorkspa
     href: `/workspace-views/all-issues/`,
     access: [EUserWorkspaceRoles.ADMIN, EUserWorkspaceRoles.MEMBER, EUserWorkspaceRoles.GUEST],
   },
+  "active-cycles": {
+    key: "active_cycles",
+    labelTranslationKey: "cycles",
+    href: `/active-cycles/`,
+    access: [EUserWorkspaceRoles.ADMIN, EUserWorkspaceRoles.MEMBER],
+  },
   analytics: {
     key: "analytics",
     labelTranslationKey: "analytics",
@@ -296,6 +298,7 @@ export const WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS: Record<string, IWorkspa
 };
 export const WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS_LINKS: IWorkspaceSidebarNavigationItem[] = [
   WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS["views"],
+  WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS["active-cycles"],
   WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS["analytics"],
   WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS["your-work"],
   WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS["drafts"],
@@ -309,8 +312,8 @@ export const WORKSPACE_SIDEBAR_STATIC_NAVIGATION_ITEMS: Record<string, IWorkspac
     href: `/`,
     access: [EUserWorkspaceRoles.ADMIN, EUserWorkspaceRoles.MEMBER, EUserWorkspaceRoles.GUEST],
   },
-  inbox: {
-    key: "inbox",
+  notifications: {
+    key: "notifications",
     labelTranslationKey: "notification.label",
     href: `/notifications/`,
     access: [EUserWorkspaceRoles.ADMIN, EUserWorkspaceRoles.MEMBER, EUserWorkspaceRoles.GUEST],
@@ -325,19 +328,6 @@ export const WORKSPACE_SIDEBAR_STATIC_NAVIGATION_ITEMS: Record<string, IWorkspac
 
 export const WORKSPACE_SIDEBAR_STATIC_NAVIGATION_ITEMS_LINKS: IWorkspaceSidebarNavigationItem[] = [
   WORKSPACE_SIDEBAR_STATIC_NAVIGATION_ITEMS["home"],
-  WORKSPACE_SIDEBAR_STATIC_NAVIGATION_ITEMS["inbox"],
+  WORKSPACE_SIDEBAR_STATIC_NAVIGATION_ITEMS["notifications"],
   WORKSPACE_SIDEBAR_STATIC_NAVIGATION_ITEMS["projects"],
 ];
-
-export const IS_FAVORITE_MENU_OPEN = "is_favorite_menu_open";
-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.3",
+  "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/document/collaborative-editor.tsx

@@ -1,4 +1,3 @@
-import { Extensions } from "@tiptap/core";
 import React from "react";
 // components
 import { DocumentContentLoader, PageRenderer } from "@/components/editors";
@@ -36,7 +35,7 @@ const CollaborativeDocumentEditor = (props: ICollaborativeDocumentEditor) => {
     user,
   } = props;
 
-  const extensions: Extensions = [];
+  const extensions = [];
   if (embedHandler?.issue) {
     extensions.push(
       IssueWidget({

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

@@ -1,4 +1,3 @@
-import { Extensions } from "@tiptap/core";
 import { forwardRef, MutableRefObject } from "react";
 // components
 import { PageRenderer } from "@/components/editors";
@@ -11,13 +10,7 @@ import { getEditorClassNames } from "@/helpers/common";
 // hooks
 import { useReadOnlyEditor } from "@/hooks/use-read-only-editor";
 // types
-import {
-  EditorReadOnlyRefApi,
-  TDisplayConfig,
-  TExtensions,
-  TReadOnlyFileHandler,
-  TReadOnlyMentionHandler,
-} from "@/types";
+import { EditorReadOnlyRefApi, TDisplayConfig, TExtensions, TFileHandler, TReadOnlyMentionHandler } from "@/types";
 
 interface IDocumentReadOnlyEditor {
   disabledExtensions: TExtensions[];
@@ -27,7 +20,7 @@ interface IDocumentReadOnlyEditor {
   displayConfig?: TDisplayConfig;
   editorClassName?: string;
   embedHandler: any;
-  fileHandler: TReadOnlyFileHandler;
+  fileHandler: Pick<TFileHandler, "getAssetSrc">;
   tabIndex?: number;
   handleEditorReady?: (value: boolean) => void;
   mentionHandler: TReadOnlyMentionHandler;
@@ -48,7 +41,7 @@ const DocumentReadOnlyEditor = (props: IDocumentReadOnlyEditor) => {
     initialValue,
     mentionHandler,
   } = props;
-  const extensions: Extensions = [];
+  const extensions = [];
   if (embedHandler?.issue) {
     extensions.push(
       IssueWidget({

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/components/menus/ai-menu.tsx

@@ -23,7 +23,6 @@ export const AIFeaturesMenu: React.FC<Props> = (props) => {
     menuRef.current.remove();
     menuRef.current.style.visibility = "visible";
 
-    // @ts-expect-error - Tippy types are incorrect
     popup.current = tippy(document.body, {
       getReferenceClientRect: null,
       content: menuRef.current,

packages/editor/src/core/components/menus/block-menu.tsx

@@ -34,7 +34,6 @@ export const BlockMenu = (props: BlockMenuProps) => {
       menuRef.current.remove();
       menuRef.current.style.visibility = "visible";
 
-      // @ts-expect-error - Tippy types are incorrect
       popup.current = tippy(document.body, {
         getReferenceClientRect: null,
         content: menuRef.current,

packages/editor/src/core/components/menus/bubble-menu/alignment-selector.tsx

@@ -6,15 +6,15 @@ import { cn } from "@plane/utils";
 import { TextAlignItem } from "@/components/menus";
 // types
 import { TEditorCommands } from "@/types";
-import { EditorStateType } from "./root";
 
 type Props = {
   editor: Editor;
-  editorState: EditorStateType;
+  onClose: () => void;
 };
 
 export const TextAlignmentSelector: React.FC<Props> = (props) => {
-  const { editor, editorState } = props;
+  const { editor, onClose } = props;
+
   const menuItem = TextAlignItem(editor);
 
   const textAlignmentOptions: {
@@ -32,7 +32,10 @@ export const TextAlignmentSelector: React.FC<Props> = (props) => {
         menuItem.command({
           alignment: "left",
         }),
-      isActive: () => editorState.left,
+      isActive: () =>
+        menuItem.isActive({
+          alignment: "left",
+        }),
     },
     {
       itemKey: "text-align",
@@ -42,7 +45,10 @@ export const TextAlignmentSelector: React.FC<Props> = (props) => {
         menuItem.command({
           alignment: "center",
         }),
-      isActive: () => editorState.center,
+      isActive: () =>
+        menuItem.isActive({
+          alignment: "center",
+        }),
     },
     {
       itemKey: "text-align",
@@ -52,7 +58,10 @@ export const TextAlignmentSelector: React.FC<Props> = (props) => {
         menuItem.command({
           alignment: "right",
         }),
-      isActive: () => editorState.right,
+      isActive: () =>
+        menuItem.isActive({
+          alignment: "right",
+        }),
     },
   ];
 
@@ -65,6 +74,7 @@ export const TextAlignmentSelector: React.FC<Props> = (props) => {
           onClick={(e) => {
             e.stopPropagation();
             item.command();
+            onClose();
           }}
           className={cn(
             "size-7 grid place-items-center rounded text-custom-text-300 hover:bg-custom-background-80 active:bg-custom-background-80 transition-colors",

packages/editor/src/core/components/menus/bubble-menu/color-selector.tsx

@@ -1,26 +1,24 @@
+import { Dispatch, FC, SetStateAction } from "react";
 import { Editor } from "@tiptap/react";
 import { ALargeSmall, Ban } from "lucide-react";
-import { Dispatch, FC, SetStateAction } from "react";
 // plane utils
 import { cn } from "@plane/utils";
 // constants
 import { COLORS_LIST } from "@/constants/common";
 // helpers
 import { BackgroundColorItem, TextColorItem } from "../menu-items";
-import { EditorStateType } from "./root";
 
 type Props = {
   editor: Editor;
   isOpen: boolean;
   setIsOpen: Dispatch<SetStateAction<boolean>>;
-  editorState: EditorStateType;
 };
 
 export const BubbleMenuColorSelector: FC<Props> = (props) => {
-  const { editor, isOpen, setIsOpen, editorState } = props;
+  const { editor, isOpen, setIsOpen } = props;
 
-  const activeTextColor = editorState.color;
-  const activeBackgroundColor = editorState.backgroundColor;
+  const activeTextColor = COLORS_LIST.find((c) => TextColorItem(editor).isActive({ color: c.key }));
+  const activeBackgroundColor = COLORS_LIST.find((c) => BackgroundColorItem(editor).isActive({ color: c.key }));
 
   return (
     <div className="relative h-full">

packages/editor/src/core/components/menus/bubble-menu/root.tsx

@@ -1,10 +1,9 @@
-import { BubbleMenu, BubbleMenuProps, Editor, isNodeSelection, useEditorState } from "@tiptap/react";
-import { FC, useEffect, useState, useRef } from "react";
+import { FC, useEffect, useState } from "react";
+import { BubbleMenu, BubbleMenuProps, Editor, isNodeSelection } from "@tiptap/react";
 // plane utils
 import { cn } from "@plane/utils";
 // components
 import {
-  BackgroundColorItem,
   BoldItem,
   BubbleMenuColorSelector,
   BubbleMenuLinkSelector,
@@ -12,12 +11,8 @@ import {
   CodeItem,
   ItalicItem,
   StrikeThroughItem,
-  TextAlignItem,
-  TextColorItem,
   UnderLineItem,
 } from "@/components/menus";
-// constants
-import { COLORS_LIST } from "@/constants/common";
 // extensions
 import { isCellSelection } from "@/extensions/table/table/utilities/is-cell-selection";
 // local components
@@ -25,61 +20,16 @@ import { TextAlignmentSelector } from "./alignment-selector";
 
 type EditorBubbleMenuProps = Omit<BubbleMenuProps, "children">;
 
-export interface EditorStateType {
-  code: boolean;
-  bold: boolean;
-  italic: boolean;
-  underline: boolean;
-  strike: boolean;
-  left: boolean;
-  right: boolean;
-  center: boolean;
-  color: { key: string; label: string; textColor: string; backgroundColor: string } | undefined;
-  backgroundColor:
-    | {
-        key: string;
-        label: string;
-        textColor: string;
-        backgroundColor: string;
-      }
-    | undefined;
-}
-
-export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: { editor: Editor }) => {
-  const menuRef = useRef<HTMLDivElement>(null);
+export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: any) => {
+  // states
   const [isNodeSelectorOpen, setIsNodeSelectorOpen] = useState(false);
   const [isLinkSelectorOpen, setIsLinkSelectorOpen] = useState(false);
   const [isColorSelectorOpen, setIsColorSelectorOpen] = useState(false);
   const [isSelecting, setIsSelecting] = useState(false);
 
-  const formattingItems = {
-    code: CodeItem(props.editor),
-    bold: BoldItem(props.editor),
-    italic: ItalicItem(props.editor),
-    underline: UnderLineItem(props.editor),
-    strike: StrikeThroughItem(props.editor),
-    textAlign: TextAlignItem(props.editor),
-  };
-
-  const editorState: EditorStateType = useEditorState({
-    editor: props.editor,
-    selector: ({ editor }: { editor: Editor }) => ({
-      code: formattingItems.code.isActive(),
-      bold: formattingItems.bold.isActive(),
-      italic: formattingItems.italic.isActive(),
-      underline: formattingItems.underline.isActive(),
-      strike: formattingItems.strike.isActive(),
-      left: formattingItems.textAlign.isActive({ alignment: "left" }),
-      right: formattingItems.textAlign.isActive({ alignment: "right" }),
-      center: formattingItems.textAlign.isActive({ alignment: "center" }),
-      color: COLORS_LIST.find((c) => TextColorItem(editor).isActive({ color: c.key })),
-      backgroundColor: COLORS_LIST.find((c) => BackgroundColorItem(editor).isActive({ color: c.key })),
-    }),
-  });
-
-  const basicFormattingOptions = editorState.code
-    ? [formattingItems.code]
-    : [formattingItems.bold, formattingItems.italic, formattingItems.underline, formattingItems.strike];
+  const basicFormattingOptions = props.editor.isActive("code")
+    ? [CodeItem(props.editor)]
+    : [BoldItem(props.editor), ItalicItem(props.editor), UnderLineItem(props.editor), StrikeThroughItem(props.editor)];
 
   const bubbleMenuProps: EditorBubbleMenuProps = {
     ...props,
@@ -101,7 +51,6 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: { editor: Edi
     },
     tippyOptions: {
       moveTransition: "transform 0.15s ease-out",
-      duration: [300, 0],
       onHidden: () => {
         setIsNodeSelectorOpen(false);
         setIsLinkSelectorOpen(false);
@@ -111,9 +60,7 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: { editor: Edi
   };
 
   useEffect(() => {
-    function handleMouseDown(e: MouseEvent) {
-      if (menuRef.current?.contains(e.target as Node)) return;
-
+    function handleMouseDown() {
       function handleMouseMove() {
         if (!props.editor.state.selection.empty) {
           setIsSelecting(true);
@@ -123,6 +70,7 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: { editor: Edi
 
       function handleMouseUp() {
         setIsSelecting(false);
+
         document.removeEventListener("mousemove", handleMouseMove);
         document.removeEventListener("mouseup", handleMouseUp);
       }
@@ -136,28 +84,27 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: { editor: Edi
     return () => {
       document.removeEventListener("mousedown", handleMouseDown);
     };
-  }, [props.editor]);
+  }, []);
 
   return (
     <BubbleMenu {...bubbleMenuProps}>
       {!isSelecting && (
-        <div
-          ref={menuRef}
-          className="flex py-2 divide-x divide-custom-border-200 rounded-lg border border-custom-border-200 bg-custom-background-100 shadow-custom-shadow-rg"
-        >
+        <div className="flex py-2 divide-x divide-custom-border-200 rounded-lg border border-custom-border-200 bg-custom-background-100 shadow-custom-shadow-rg">
           <div className="px-2">
-            <BubbleMenuNodeSelector
-              editor={props.editor!}
-              isOpen={isNodeSelectorOpen}
-              setIsOpen={() => {
-                setIsNodeSelectorOpen((prev) => !prev);
-                setIsLinkSelectorOpen(false);
-                setIsColorSelectorOpen(false);
-              }}
-            />
+            {!props.editor.isActive("table") && (
+              <BubbleMenuNodeSelector
+                editor={props.editor!}
+                isOpen={isNodeSelectorOpen}
+                setIsOpen={() => {
+                  setIsNodeSelectorOpen((prev) => !prev);
+                  setIsLinkSelectorOpen(false);
+                  setIsColorSelectorOpen(false);
+                }}
+              />
+            )}
           </div>
-          {!editorState.code && (
-            <div className="px-2">
+          <div className="px-2">
+            {!props.editor.isActive("code") && (
               <BubbleMenuLinkSelector
                 editor={props.editor}
                 isOpen={isLinkSelectorOpen}
@@ -167,22 +114,21 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: { editor: Edi
                   setIsColorSelectorOpen(false);
                 }}
               />
-            </div>
-          )}
-          {!editorState.code && (
-            <div className="px-2">
+            )}
+          </div>
+          <div className="px-2">
+            {!props.editor.isActive("code") && (
               <BubbleMenuColorSelector
                 editor={props.editor}
                 isOpen={isColorSelectorOpen}
-                editorState={editorState}
                 setIsOpen={() => {
                   setIsColorSelectorOpen((prev) => !prev);
                   setIsNodeSelectorOpen(false);
                   setIsLinkSelectorOpen(false);
                 }}
               />
-            </div>
-          )}
+            )}
+          </div>
           <div className="flex gap-0.5 px-2">
             {basicFormattingOptions.map((item) => (
               <button
@@ -195,7 +141,7 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: { editor: Edi
                 className={cn(
                   "size-7 grid place-items-center rounded text-custom-text-300 hover:bg-custom-background-80 active:bg-custom-background-80 transition-colors",
                   {
-                    "bg-custom-background-80 text-custom-text-100": editorState[item.key],
+                    "bg-custom-background-80 text-custom-text-100": item.isActive(""),
                   }
                 )}
               >
@@ -203,7 +149,15 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: { editor: Edi
               </button>
             ))}
           </div>
-          <TextAlignmentSelector editor={props.editor} editorState={editorState} />
+          <TextAlignmentSelector
+            editor={props.editor}
+            onClose={() => {
+              const editor = props.editor as Editor;
+              if (!editor) return;
+              const pos = editor.state.selection.to;
+              editor.commands.setTextSelection(pos ?? 0);
+            }}
+          />
         </div>
       )}
     </BubbleMenu>

packages/editor/src/core/components/menus/menu-items.ts

@@ -142,8 +142,8 @@ export const UnderLineItem = (editor: Editor): EditorMenuItem<"underline"> => ({
   icon: UnderlineIcon,
 });
 
-export const StrikeThroughItem = (editor: Editor): EditorMenuItem<"strike"> => ({
-  key: "strike",
+export const StrikeThroughItem = (editor: Editor): EditorMenuItem<"strikethrough"> => ({
+  key: "strikethrough",
   name: "Strikethrough",
   isActive: () => editor?.isActive("strike"),
   command: () => toggleStrike(editor),
@@ -218,33 +218,24 @@ export const HorizontalRuleItem = (editor: Editor) =>
 export const TextColorItem = (editor: Editor): EditorMenuItem<"text-color"> => ({
   key: "text-color",
   name: "Color",
-  isActive: (props) => editor.isActive("customColor", { color: props?.color }),
-  command: (props) => {
-    if (!props) return;
-    toggleTextColor(props.color, editor);
-  },
+  isActive: ({ color }) => editor.isActive("customColor", { color }),
+  command: ({ color }) => toggleTextColor(color, editor),
   icon: Palette,
 });
 
 export const BackgroundColorItem = (editor: Editor): EditorMenuItem<"background-color"> => ({
   key: "background-color",
   name: "Background color",
-  isActive: (props) => editor.isActive("customColor", { backgroundColor: props?.color }),
-  command: (props) => {
-    if (!props) return;
-    toggleBackgroundColor(props.color, editor);
-  },
+  isActive: ({ color }) => editor.isActive("customColor", { backgroundColor: color }),
+  command: ({ color }) => toggleBackgroundColor(color, editor),
   icon: Palette,
 });
 
 export const TextAlignItem = (editor: Editor): EditorMenuItem<"text-align"> => ({
   key: "text-align",
   name: "Text align",
-  isActive: (props) => editor.isActive({ textAlign: props?.alignment }),
-  command: (props) => {
-    if (!props) return;
-    setTextAlign(props.alignment, editor);
-  },
+  isActive: ({ alignment }) => editor.isActive({ textAlign: alignment }),
+  command: ({ alignment }) => setTextAlign(alignment, editor),
   icon: AlignCenter,
 });
 

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

@@ -87,7 +87,7 @@ export const TEXT_ALIGNMENT_ITEMS: ToolbarMenuItem<"text-align">[] = [
   },
 ];
 
-const BASIC_MARK_ITEMS: ToolbarMenuItem<"bold" | "italic" | "underline" | "strike">[] = [
+const BASIC_MARK_ITEMS: ToolbarMenuItem<"bold" | "italic" | "underline" | "strikethrough">[] = [
   {
     itemKey: "bold",
     renderKey: "bold",
@@ -113,7 +113,7 @@ const BASIC_MARK_ITEMS: ToolbarMenuItem<"bold" | "italic" | "underline" | "strik
     editors: ["lite", "document"],
   },
   {
-    itemKey: "strike",
+    itemKey: "strikethrough",
     renderKey: "strikethrough",
     name: "Strikethrough",
     icon: Strikethrough,

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/clipboard.ts

@@ -1,89 +0,0 @@
-import { Extension } from "@tiptap/core";
-import { Fragment, Node } from "@tiptap/pm/model";
-import { Plugin, PluginKey } from "@tiptap/pm/state";
-
-export const MarkdownClipboard = Extension.create({
-  name: "markdownClipboard",
-
-  addProseMirrorPlugins() {
-    return [
-      new Plugin({
-        key: new PluginKey("markdownClipboard"),
-        props: {
-          clipboardTextSerializer: (slice) => {
-            const markdownSerializer = this.editor.storage.markdown.serializer;
-            const isTableRow = slice.content.firstChild?.type?.name === "tableRow";
-            const nodeSelect = slice.openStart === 0 && slice.openEnd === 0;
-
-            if (nodeSelect) {
-              return markdownSerializer.serialize(slice.content);
-            }
-
-            const processTableContent = (tableNode: Node | Fragment) => {
-              let result = "";
-              tableNode.content?.forEach?.((tableRowNode: Node | Fragment) => {
-                tableRowNode.content?.forEach?.((cell: Node) => {
-                  const cellContent = cell.content ? markdownSerializer.serialize(cell.content) : "";
-                  result += cellContent + "\n";
-                });
-              });
-              return result;
-            };
-
-            if (isTableRow) {
-              const rowsCount = slice.content?.childCount || 0;
-              const cellsCount = slice.content?.firstChild?.content?.childCount || 0;
-              if (rowsCount === 1 || cellsCount === 1) {
-                return processTableContent(slice.content);
-              } else {
-                return markdownSerializer.serialize(slice.content);
-              }
-            }
-
-            const traverseToParentOfLeaf = (
-              node: Node | null,
-              parent: Fragment | Node,
-              depth: number
-            ): Node | Fragment => {
-              let currentNode = node;
-              let currentParent = parent;
-              let currentDepth = depth;
-
-              while (currentNode && currentDepth > 1 && currentNode.content?.firstChild) {
-                if (currentNode.content?.childCount > 1) {
-                  if (currentNode.content.firstChild?.type?.name === "listItem") {
-                    return currentParent;
-                  } else {
-                    return currentNode.content;
-                  }
-                }
-
-                currentParent = currentNode;
-                currentNode = currentNode.content?.firstChild || null;
-                currentDepth--;
-              }
-
-              return currentParent;
-            };
-
-            if (slice.content.childCount > 1) {
-              return markdownSerializer.serialize(slice.content);
-            } else {
-              const targetNode = traverseToParentOfLeaf(slice.content.firstChild, slice.content, slice.openStart);
-
-              let currentNode = targetNode;
-              while (currentNode && currentNode.content && currentNode.childCount === 1 && currentNode.firstChild) {
-                currentNode = currentNode.firstChild;
-              }
-              if (currentNode instanceof Node && currentNode.isText) {
-                return currentNode.text;
-              }
-
-              return markdownSerializer.serialize(targetNode);
-            }
-          },
-        },
-      }),
-    ];
-  },
-});

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-color.ts

@@ -106,8 +106,6 @@ export const CustomColorExtension = Mark.create({
     };
   },
 
-  // @ts-expect-error types are incorrect
-  // TODO: check this and update types
   parseHTML() {
     return [
       {

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

@@ -1,10 +1,9 @@
-import { NodeSelection } from "@tiptap/pm/state";
 import React, { useRef, useState, useCallback, useLayoutEffect, useEffect } from "react";
+import { NodeSelection } from "@tiptap/pm/state";
 // plane utils
 import { cn } from "@plane/utils";
 // extensions
 import { CustoBaseImageNodeViewProps, ImageToolbarRoot } from "@/extensions/custom-image";
-import { ImageUploadStatus } from "./upload-status";
 
 const MIN_SIZE = 100;
 
@@ -39,11 +38,11 @@ const ensurePixelString = <TDefault,>(value: Pixel | TDefault | number | undefin
 };
 
 type CustomImageBlockProps = CustoBaseImageNodeViewProps & {
-  imageFromFileSystem: string | undefined;
+  imageFromFileSystem: string;
   setFailedToLoadImage: (isError: boolean) => void;
   editorContainer: HTMLDivElement | null;
   setEditorContainer: (editorContainer: HTMLDivElement | null) => void;
-  src: string | undefined;
+  src: string;
 };
 
 export const CustomImageBlock: React.FC<CustomImageBlockProps> = (props) => {
@@ -63,8 +62,8 @@ export const CustomImageBlock: React.FC<CustomImageBlockProps> = (props) => {
   const { width: nodeWidth, height: nodeHeight, aspectRatio: nodeAspectRatio, src: imgNodeSrc } = node.attrs;
   // states
   const [size, setSize] = useState<Size>({
-    width: ensurePixelString(nodeWidth, "35%") ?? "35%",
-    height: ensurePixelString(nodeHeight, "auto") ?? "auto",
+    width: ensurePixelString(nodeWidth, "35%"),
+    height: ensurePixelString(nodeHeight, "auto"),
     aspectRatio: nodeAspectRatio || null,
   });
   const [isResizing, setIsResizing] = useState(false);
@@ -145,8 +144,8 @@ export const CustomImageBlock: React.FC<CustomImageBlockProps> = (props) => {
   useLayoutEffect(() => {
     setSize((prevSize) => ({
       ...prevSize,
-      width: ensurePixelString(nodeWidth) ?? "35%",
-      height: ensurePixelString(nodeHeight) ?? "auto",
+      width: ensurePixelString(nodeWidth),
+      height: ensurePixelString(nodeHeight),
       aspectRatio: nodeAspectRatio,
     }));
   }, [nodeWidth, nodeHeight, nodeAspectRatio]);
@@ -211,8 +210,6 @@ export const CustomImageBlock: React.FC<CustomImageBlockProps> = (props) => {
   // show the image loader if the remote image's src or preview image from filesystem is not set yet (while loading the image post upload) (or)
   // if the initial resize (from 35% width and "auto" height attrs to the actual size in px) is not complete
   const showImageLoader = !(resolvedImageSrc || imageFromFileSystem) || !initialResizeComplete || hasErroredOnFirstLoad;
-  // show the image upload status only when the resolvedImageSrc is not ready
-  const showUploadStatus = !resolvedImageSrc;
   // show the image utils only if the remote image's (post upload) src is set and the initial resize is complete (but not while we're showing the preview imageFromFileSystem)
   const showImageUtils = resolvedImageSrc && initialResizeComplete;
   // show the image resizer only if the editor is editable, the remote image's (post upload) src is set and the initial resize is complete (but not while we're showing the preview imageFromFileSystem)
@@ -250,16 +247,7 @@ export const CustomImageBlock: React.FC<CustomImageBlockProps> = (props) => {
           try {
             setHasErroredOnFirstLoad(true);
             // this is a type error from tiptap, don't remove await until it's fixed
-            if (!imgNodeSrc) {
-              throw new Error("No source image to restore from");
-            }
             await editor?.commands.restoreImage?.(imgNodeSrc);
-            if (!imageRef.current) {
-              throw new Error("Image reference not found");
-            }
-            if (!resolvedImageSrc) {
-              throw new Error("No resolved image source available");
-            }
             imageRef.current.src = resolvedImageSrc;
           } catch {
             // if the image failed to even restore, then show the error state
@@ -282,7 +270,6 @@ export const CustomImageBlock: React.FC<CustomImageBlockProps> = (props) => {
           ...(size.aspectRatio && { aspectRatio: size.aspectRatio }),
         }}
       />
-      {showUploadStatus && node.attrs.id && <ImageUploadStatus editor={editor} nodeId={node.attrs.id} />}
       {showImageUtils && (
         <ImageToolbarRoot
           containerClassName={
@@ -290,7 +277,7 @@ export const CustomImageBlock: React.FC<CustomImageBlockProps> = (props) => {
           }
           image={{
             src: resolvedImageSrc,
-            aspectRatio: size.aspectRatio === null ? 1 : size.aspectRatio,
+            aspectRatio: size.aspectRatio,
             height: size.height,
             width: size.width,
           }}

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/image-uploader.tsx

@@ -1,13 +1,13 @@
-import { ImageIcon } from "lucide-react";
 import { ChangeEvent, useCallback, useEffect, useMemo, useRef } from "react";
+import { ImageIcon } from "lucide-react";
 // plane utils
 import { cn } from "@plane/utils";
 // constants
 import { ACCEPTED_FILE_EXTENSIONS } from "@/constants/config";
-// extensions
-import { CustoBaseImageNodeViewProps, getImageComponentImageFileMap } from "@/extensions/custom-image";
 // hooks
 import { useUploader, useDropZone, uploadFirstImageAndInsertRemaining } from "@/hooks/use-file-upload";
+// extensions
+import { CustoBaseImageNodeViewProps, getImageComponentImageFileMap } from "@/extensions/custom-image";
 
 type CustomImageUploaderProps = CustoBaseImageNodeViewProps & {
   maxFileSize: number;
@@ -38,7 +38,6 @@ export const CustomImageUploader = (props: CustomImageUploaderProps) => {
   const onUpload = useCallback(
     (url: string) => {
       if (url) {
-        if (!imageEntityId) return;
         setIsUploaded(true);
         // Update the node view's src attribute post upload
         updateAttributes({ src: url });
@@ -69,7 +68,6 @@ export const CustomImageUploader = (props: CustomImageUploaderProps) => {
   );
   // hooks
   const { uploading: isImageBeingUploaded, uploadFile } = useUploader({
-    blockId: imageEntityId ?? "",
     editor,
     loadImageFromFileSystem,
     maxFileSize,
@@ -84,7 +82,7 @@ export const CustomImageUploader = (props: CustomImageUploaderProps) => {
 
   // the meta data of the image component
   const meta = useMemo(
-    () => imageComponentImageFileMap?.get(imageEntityId ?? ""),
+    () => imageComponentImageFileMap?.get(imageEntityId),
     [imageComponentImageFileMap, imageEntityId]
   );
 
@@ -98,7 +96,7 @@ export const CustomImageUploader = (props: CustomImageUploaderProps) => {
         if (meta.hasOpenedFileInputOnce) return;
         fileInputRef.current.click();
         hasTriggeredFilePickerRef.current = true;
-        imageComponentImageFileMap?.set(imageEntityId ?? "", { ...meta, hasOpenedFileInputOnce: true });
+        imageComponentImageFileMap?.set(imageEntityId, { ...meta, hasOpenedFileInputOnce: true });
       }
     }
   }, [meta, uploadFile, imageComponentImageFileMap]);

packages/editor/src/core/extensions/custom-image/components/toolbar/full-screen.tsx

@@ -29,7 +29,7 @@ export const ImageFullScreenAction: React.FC<Props> = (props) => {
   const dragStart = useRef({ x: 0, y: 0 });
   const dragOffset = useRef({ x: 0, y: 0 });
   const modalRef = useRef<HTMLDivElement>(null);
-  const imgRef = useRef<HTMLImageElement | null>(null);
+  const imgRef = useRef<HTMLImageElement>(null);
 
   const widthInNumber = useMemo(() => Number(width?.replace("px", "")), [width]);
 

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

@@ -1,60 +0,0 @@
-import { Editor } from "@tiptap/core";
-import { useEditorState } from "@tiptap/react";
-import { useEffect, useRef, useState } from "react";
-
-type Props = {
-  editor: Editor;
-  nodeId: string;
-};
-
-export const ImageUploadStatus: React.FC<Props> = (props) => {
-  const { editor, nodeId } = props;
-  // Displayed status that will animate smoothly
-  const [displayStatus, setDisplayStatus] = useState(0);
-  // Animation frame ID for cleanup
-  const animationFrameRef = useRef<number | null>(null);
-  // subscribe to image upload status
-  const uploadStatus: number | undefined = useEditorState({
-    editor,
-    selector: ({ editor }) => editor.storage.imageComponent?.assetsUploadStatus[nodeId],
-  });
-
-  useEffect(() => {
-    const animateToValue = (start: number, end: number, startTime: number) => {
-      const duration = 200;
-
-      const animation = (currentTime: number) => {
-        const elapsed = currentTime - startTime;
-        const progress = Math.min(elapsed / duration, 1);
-
-        // Easing function for smooth animation
-        const easeOutCubic = 1 - Math.pow(1 - progress, 3);
-
-        // Calculate current display value
-        const currentValue = Math.floor(start + (end - start) * easeOutCubic);
-        setDisplayStatus(currentValue);
-
-        // Continue animation if not complete
-        if (progress < 1) {
-          animationFrameRef.current = requestAnimationFrame((time) => animation(time));
-        }
-      };
-      animationFrameRef.current = requestAnimationFrame((time) => animation(time));
-    };
-    animateToValue(displayStatus, uploadStatus == undefined ? 100 : uploadStatus, performance.now());
-
-    return () => {
-      if (animationFrameRef.current) {
-        cancelAnimationFrame(animationFrameRef.current);
-      }
-    };
-  }, [uploadStatus]);
-
-  if (uploadStatus === undefined) return null;
-
-  return (
-    <div className="absolute top-1 right-1 z-20 bg-black/60 rounded text-xs font-medium w-10 text-center">
-      {displayStatus}%
-    </div>
-  );
-};

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

@@ -4,12 +4,12 @@ import { ReactNodeViewRenderer } from "@tiptap/react";
 import { v4 as uuidv4 } from "uuid";
 // extensions
 import { CustomImageNode } from "@/extensions/custom-image";
-// helpers
-import { insertEmptyParagraphAtNodeBoundaries } from "@/helpers/insert-empty-paragraph-at-node-boundary";
 // plugins
 import { TrackImageDeletionPlugin, TrackImageRestorationPlugin, isFileValid } from "@/plugins/image";
 // types
 import { TFileHandler } from "@/types";
+// helpers
+import { insertEmptyParagraphAtNodeBoundaries } from "@/helpers/insert-empty-paragraph-at-node-boundary";
 
 export type InsertImageComponentProps = {
   file?: File;
@@ -21,8 +21,7 @@ declare module "@tiptap/core" {
   interface Commands<ReturnType> {
     imageComponent: {
       insertImageComponent: ({ file, pos, event }: InsertImageComponentProps) => ReturnType;
-      uploadImage: (blockId: string, file: File) => () => Promise<string> | undefined;
-      updateAssetsUploadStatus?: (updatedStatus: TFileHandler["assetsUploadStatus"]) => () => void;
+      uploadImage: (file: File) => () => Promise<string> | undefined;
       getImageSource?: (path: string) => () => Promise<string>;
       restoreImage: (src: string) => () => Promise<void>;
     };
@@ -33,7 +32,6 @@ export const getImageComponentImageFileMap = (editor: Editor) =>
   (editor.storage.imageComponent as UploadImageExtensionStorage | undefined)?.fileMap;
 
 export interface UploadImageExtensionStorage {
-  assetsUploadStatus: TFileHandler["assetsUploadStatus"];
   fileMap: Map<string, UploadEntity>;
 }
 
@@ -41,7 +39,6 @@ export type UploadEntity = ({ event: "insert" } | { event: "drop"; file: File })
 
 export const CustomImageExtension = (props: TFileHandler) => {
   const {
-    assetsUploadStatus,
     getAssetSrc,
     upload,
     delete: deleteImageFn,
@@ -108,6 +105,7 @@ export const CustomImageExtension = (props: TFileHandler) => {
       this.editor.state.doc.descendants((node) => {
         if (node.type.name === this.name) {
           if (!node.attrs.src?.startsWith("http")) return;
+
           imageSources.add(node.attrs.src);
         }
       });
@@ -130,14 +128,13 @@ export const CustomImageExtension = (props: TFileHandler) => {
         markdown: {
           serialize() {},
         },
-        assetsUploadStatus,
       };
     },
 
     addCommands() {
       return {
         insertImageComponent:
-          (props) =>
+          (props: { file?: File; pos?: number; event: "insert" | "drop" }) =>
           ({ commands }) => {
             // Early return if there's an invalid file being dropped
             if (
@@ -185,15 +182,12 @@ export const CustomImageExtension = (props: TFileHandler) => {
               attrs: attributes,
             });
           },
-        uploadImage: (blockId, file) => async () => {
-          const fileUrl = await upload(blockId, file);
+        uploadImage: (file: File) => async () => {
+          const fileUrl = await upload(file);
           return fileUrl;
         },
-        updateAssetsUploadStatus: (updatedStatus) => () => {
-          this.storage.assetsUploadStatus = updatedStatus;
-        },
-        getImageSource: (path) => async () => await getAssetSrc(path),
-        restoreImage: (src) => async () => {
+        getImageSource: (path: string) => async () => await getAssetSrc(path),
+        restoreImage: (src: string) => async () => {
           await restoreImageFn(src);
         },
       };

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

@@ -4,9 +4,9 @@ import { ReactNodeViewRenderer } from "@tiptap/react";
 // components
 import { CustomImageNode, UploadImageExtensionStorage } from "@/extensions/custom-image";
 // types
-import { TReadOnlyFileHandler } from "@/types";
+import { TFileHandler } from "@/types";
 
-export const CustomReadOnlyImageExtension = (props: TReadOnlyFileHandler) => {
+export const CustomReadOnlyImageExtension = (props: Pick<TFileHandler, "getAssetSrc">) => {
   const { getAssetSrc } = props;
 
   return Image.extend<Record<string, unknown>, UploadImageExtensionStorage>({
@@ -56,7 +56,6 @@ export const CustomReadOnlyImageExtension = (props: TReadOnlyFileHandler) => {
         markdown: {
           serialize() {},
         },
-        assetsUploadStatus: {},
       };
     },
 

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

@@ -29,14 +29,13 @@ import {
   TableCell,
   TableHeader,
   TableRow,
-  MarkdownClipboard,
 } from "@/extensions";
 // helpers
 import { isValidHttpUrl } from "@/helpers/common";
-// plane editor extensions
-import { CoreEditorAdditionalExtensions } from "@/plane-editor/extensions";
 // types
 import { TExtensions, TFileHandler, TMentionHandler } from "@/types";
+// plane editor extensions
+import { CoreEditorAdditionalExtensions } from "@/plane-editor/extensions";
 
 type TArguments = {
   disabledExtensions: TExtensions[];
@@ -51,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: {
@@ -109,6 +109,12 @@ export const CoreEditorExtensions = (args: TArguments): Extensions => {
       },
     }),
     CustomTypographyExtension,
+    ImageExtension(fileHandler).configure({
+      HTMLAttributes: {
+        class: "rounded-md",
+      },
+    }),
+    CustomImageExtension(fileHandler),
     TiptapUnderline,
     TextStyle,
     TaskList.configure({
@@ -131,11 +137,10 @@ export const CoreEditorExtensions = (args: TArguments): Extensions => {
     CustomCodeInlineExtension,
     Markdown.configure({
       html: true,
-      transformCopiedText: false,
+      transformCopiedText: true,
       transformPastedText: true,
       breaks: true,
     }),
-    MarkdownClipboard,
     Table,
     TableHeader,
     TableCell,
@@ -143,11 +148,11 @@ export const CoreEditorExtensions = (args: TArguments): Extensions => {
     CustomMentionExtension(mentionHandler),
     Placeholder.configure({
       placeholder: ({ editor, node }) => {
-        if (!editor.isEditable) return "";
+        if (!editor.isEditable) return;
 
         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") ||
@@ -174,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/image/read-only-image.tsx

@@ -3,9 +3,9 @@ import { ReactNodeViewRenderer } from "@tiptap/react";
 // extensions
 import { CustomImageNode } from "@/extensions";
 // types
-import { TReadOnlyFileHandler } from "@/types";
+import { TFileHandler } from "@/types";
 
-export const ReadOnlyImageExtension = (props: TReadOnlyFileHandler) => {
+export const ReadOnlyImageExtension = (props: Pick<TFileHandler, "getAssetSrc">) => {
   const { getAssetSrc } = props;
 
   return Image.extend({