chore: ln support workspace projects constants (#6429)

* chore: ln support workspace projects constants

* fix: translation key

* fix: removed state translation

* fix: removed state translation

.github/workflows/build-branch.yml

@@ -25,10 +25,6 @@ on:
         required: false
         default: false
         type: boolean
-  push:
-    branches:
-      - preview
-      - canary
 
 env:
   TARGET_BRANCH: ${{ github.ref_name }}

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

@@ -71,7 +71,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 18.x
       - run: yarn install
       - run: yarn lint --filter=admin
 
@@ -84,7 +84,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 18.x
       - run: yarn install
       - run: yarn lint --filter=space
 
@@ -97,7 +97,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 18.x
       - run: yarn install
       - run: yarn lint --filter=web
 
@@ -109,7 +109,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 18.x
       - run: yarn install
       - run: yarn build --filter=admin
 
@@ -121,7 +121,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 18.x
       - run: yarn install
       - run: yarn build --filter=space
 
@@ -133,6 +133,6 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 18.x
       - run: yarn install
       - run: yarn build --filter=web

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

admin/app/general/form.tsx

@@ -123,7 +123,7 @@ export const GeneralConfigurationForm: FC<IGeneralConfigurationForm> = observer(
                 No PII is collected.This anonymized data is used to understand how you use Plane and build new features
                 in line with{" "}
                 <a
-                  href="https://developers.plane.so/self-hosting/telemetry"
+                  href="https://docs.plane.so/self-hosting/telemetry"
                   target="_blank"
                   className="text-custom-primary-100 hover:underline"
                   rel="noreferrer"

admin/app/page.tsx

@@ -7,15 +7,15 @@ import { DefaultLayout } from "@/layouts/default-layout";
 export const metadata: Metadata = {
   title: "Plane | Simple, extensible, open-source project management tool.",
   description:
-    "Open-source project management tool to manage work items, sprints, and product roadmaps with peace of mind.",
+    "Open-source project management tool to manage issues, sprints, and product roadmaps with peace of mind.",
   openGraph: {
     title: "Plane | Simple, extensible, open-source project management tool.",
     description:
-      "Open-source project management tool to manage work items, sprints, and product roadmaps with peace of mind.",
+      "Open-source project management tool to manage issues, sprints, and product roadmaps with peace of mind.",
     url: "https://plane.so/",
   },
   keywords:
-    "software development, customer feedback, software, accelerate, code management, release management, project management, work items tracking, agile, scrum, kanban, collaboration",
+    "software development, customer feedback, software, accelerate, code management, release management, project management, issue tracking, agile, scrum, kanban, collaboration",
   twitter: {
     site: "@planepowers",
   },

admin/core/components/instance/setup-form.tsx

@@ -336,7 +336,7 @@ export const InstanceSetupForm: FC = (props) => {
             </label>
             <a
               tabIndex={-1}
-              href="https://developers.plane.so/self-hosting/telemetry"
+              href="https://docs.plane.so/telemetry"
               target="_blank"
               rel="noopener noreferrer"
               className="text-sm font-medium text-blue-500 hover:text-blue-600"

admin/package.json

@@ -19,13 +19,13 @@
     "@plane/ui": "*",
     "@plane/utils": "*",
     "@plane/services": "*",
-    "@sentry/nextjs": "^8.54.0",
+    "@sentry/nextjs": "^8.32.0",
     "@tailwindcss/typography": "^0.5.9",
     "@types/lodash": "^4.17.0",
     "autoprefixer": "10.4.14",
     "axios": "^1.7.9",
     "lodash": "^4.17.21",
-    "lucide-react": "^0.469.0",
+    "lucide-react": "^0.356.0",
     "mobx": "^6.12.0",
     "mobx-react": "^9.1.1",
     "next": "^14.2.20",

apiserver/plane/api/serializers/__init__.py

@@ -15,4 +15,3 @@ from .state import StateLiteSerializer, StateSerializer
 from .cycle import CycleSerializer, CycleIssueSerializer, CycleLiteSerializer
 from .module import ModuleSerializer, ModuleIssueSerializer, ModuleLiteSerializer
 from .intake import IntakeIssueSerializer
-from .estimate import EstimatePointSerializer

apiserver/plane/api/serializers/base.py

@@ -72,7 +72,6 @@ class BaseSerializer(serializers.ModelSerializer):
                         StateLiteSerializer,
                         UserLiteSerializer,
                         WorkspaceLiteSerializer,
-                        EstimatePointSerializer,
                     )
 
                     # Expansion mapper
@@ -89,7 +88,6 @@ class BaseSerializer(serializers.ModelSerializer):
                         "owned_by": UserLiteSerializer,
                         "members": UserLiteSerializer,
                         "parent": IssueLiteSerializer,
-                        "estimate_point": EstimatePointSerializer,
                     }
                     # Check if field in expansion  then expand the field
                     if expand in expansion:

apiserver/plane/api/serializers/estimate.py

@@ -1,10 +0,0 @@
-# Module imports
-from plane.db.models import EstimatePoint
-from .base import BaseSerializer
-
-
-class EstimatePointSerializer(BaseSerializer):
-    class Meta:
-        model = EstimatePoint
-        fields = ["id", "value"]
-        read_only_fields = fields

apiserver/plane/api/serializers/issue.py

@@ -1,7 +1,6 @@
 # Django imports
 from django.utils import timezone
 from lxml import html
-from django.db import IntegrityError
 
 #  Third party imports
 from rest_framework import serializers
@@ -139,56 +138,47 @@ class IssueSerializer(BaseSerializer):
         updated_by_id = issue.updated_by_id
 
         if assignees is not None and len(assignees):
-            try:
-                IssueAssignee.objects.bulk_create(
-                    [
-                        IssueAssignee(
-                            assignee_id=assignee_id,
-                            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
-                    ],
-                    batch_size=10,
-                )
-            except IntegrityError:
-                pass
-        else:
-            try:
-                # Then assign it to default assignee
-                if default_assignee_id is not None:
-                    IssueAssignee.objects.create(
-                        assignee_id=default_assignee_id,
+            IssueAssignee.objects.bulk_create(
+                [
+                    IssueAssignee(
+                        assignee_id=assignee_id,
                         issue=issue,
                         project_id=project_id,
                         workspace_id=workspace_id,
                         created_by_id=created_by_id,
                         updated_by_id=updated_by_id,
                     )
-            except IntegrityError:
-                pass
+                    for assignee_id in assignees
+                ],
+                batch_size=10,
+            )
+        else:
+            # Then assign it to default assignee
+            if default_assignee_id is not None:
+                IssueAssignee.objects.create(
+                    assignee_id=default_assignee_id,
+                    issue=issue,
+                    project_id=project_id,
+                    workspace_id=workspace_id,
+                    created_by_id=created_by_id,
+                    updated_by_id=updated_by_id,
+                )
 
         if labels is not None and len(labels):
-            try:
-                IssueLabel.objects.bulk_create(
-                    [
-                        IssueLabel(
-                            label_id=label_id,
-                            issue=issue,
-                            project_id=project_id,
-                            workspace_id=workspace_id,
-                            created_by_id=created_by_id,
-                            updated_by_id=updated_by_id,
-                        )
-                        for label_id in labels
-                    ],
-                    batch_size=10,
-                )
-            except IntegrityError:
-                pass
+            IssueLabel.objects.bulk_create(
+                [
+                    IssueLabel(
+                        label_id=label_id,
+                        issue=issue,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for label_id in labels
+                ],
+                batch_size=10,
+            )
 
         return issue
 
@@ -204,45 +194,39 @@ class IssueSerializer(BaseSerializer):
 
         if assignees is not None:
             IssueAssignee.objects.filter(issue=instance).delete()
-            try:
-                IssueAssignee.objects.bulk_create(
-                    [
-                        IssueAssignee(
-                            assignee_id=assignee_id,
-                            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
-                    ],
-                    batch_size=10,
-                    ignore_conflicts=True,
-                )
-            except IntegrityError:
-                pass
+            IssueAssignee.objects.bulk_create(
+                [
+                    IssueAssignee(
+                        assignee_id=assignee_id,
+                        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
+                ],
+                batch_size=10,
+                ignore_conflicts=True,
+            )
 
         if labels is not None:
             IssueLabel.objects.filter(issue=instance).delete()
-            try:
-                IssueLabel.objects.bulk_create(
-                    [
-                        IssueLabel(
-                            label_id=label_id,
-                            issue=instance,
-                            project_id=project_id,
-                            workspace_id=workspace_id,
-                            created_by_id=created_by_id,
-                            updated_by_id=updated_by_id,
-                        )
-                        for label_id in labels
-                    ],
-                    batch_size=10,
-                    ignore_conflicts=True,
-                )
-            except IntegrityError:
-                pass
+            IssueLabel.objects.bulk_create(
+                [
+                    IssueLabel(
+                        label_id=label_id,
+                        issue=instance,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for label_id in labels
+                ],
+                batch_size=10,
+                ignore_conflicts=True,
+            )
 
         # Time updation occues even when other related models are updated
         instance.updated_at = timezone.now()

apiserver/plane/api/urls/issue.py

@@ -71,9 +71,4 @@ urlpatterns = [
         IssueAttachmentEndpoint.as_view(),
         name="attachment",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/issue-attachments/<uuid:pk>/",
-        IssueAttachmentEndpoint.as_view(),
-        name="issue-attachment",
-    ),
 ]

apiserver/plane/api/views/project.py

@@ -28,7 +28,7 @@ from plane.db.models import (
     Workspace,
     UserFavorite,
 )
-from plane.bgtasks.webhook_task import model_activity, webhook_activity
+from plane.bgtasks.webhook_task import model_activity
 from .base import BaseAPIView
 
 
@@ -326,19 +326,6 @@ class ProjectAPIEndpoint(BaseAPIView):
             entity_type="project", entity_identifier=pk, project_id=pk
         ).delete()
         project.delete()
-        webhook_activity.delay(
-            event="project",
-            verb="deleted",
-            field=None,
-            old_value=None,
-            new_value=None,
-            actor_id=request.user.id,
-            slug=slug,
-            current_site=request.META.get("HTTP_ORIGIN"),
-            event_id=project.id,
-            old_identifier=None,
-            new_identifier=None,
-        )
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 

apiserver/plane/app/serializers/issue.py

@@ -2,7 +2,6 @@
 from django.utils import timezone
 from django.core.validators import URLValidator
 from django.core.exceptions import ValidationError
-from django.db import IntegrityError
 
 # Third Party imports
 from rest_framework import serializers
@@ -135,56 +134,47 @@ class IssueCreateSerializer(BaseSerializer):
         updated_by_id = issue.updated_by_id
 
         if assignees is not None and len(assignees):
-            try:
-                IssueAssignee.objects.bulk_create(
-                    [
-                        IssueAssignee(
-                            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 user in assignees
-                    ],
-                    batch_size=10,
-                )
-            except IntegrityError:
-                pass
-        else:
-            # Then assign it to default assignee
-            if default_assignee_id is not None:
-                try:
-                    IssueAssignee.objects.create(
-                        assignee_id=default_assignee_id,
+            IssueAssignee.objects.bulk_create(
+                [
+                    IssueAssignee(
+                        assignee=user,
                         issue=issue,
                         project_id=project_id,
                         workspace_id=workspace_id,
                         created_by_id=created_by_id,
                         updated_by_id=updated_by_id,
                     )
-                except IntegrityError:
-                    pass
+                    for user in assignees
+                ],
+                batch_size=10,
+            )
+        else:
+            # Then assign it to default assignee
+            if default_assignee_id is not None:
+                IssueAssignee.objects.create(
+                    assignee_id=default_assignee_id,
+                    issue=issue,
+                    project_id=project_id,
+                    workspace_id=workspace_id,
+                    created_by_id=created_by_id,
+                    updated_by_id=updated_by_id,
+                )
 
         if labels is not None and len(labels):
-            try:
-                IssueLabel.objects.bulk_create(
-                    [
-                        IssueLabel(
-                            label=label,
-                            issue=issue,
-                            project_id=project_id,
-                            workspace_id=workspace_id,
-                            created_by_id=created_by_id,
-                            updated_by_id=updated_by_id,
-                        )
-                        for label in labels
-                    ],
-                    batch_size=10,
-                )
-            except IntegrityError:
-                pass
+            IssueLabel.objects.bulk_create(
+                [
+                    IssueLabel(
+                        label=label,
+                        issue=issue,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for label in labels
+                ],
+                batch_size=10,
+            )
 
         return issue
 
@@ -200,45 +190,39 @@ class IssueCreateSerializer(BaseSerializer):
 
         if assignees is not None:
             IssueAssignee.objects.filter(issue=instance).delete()
-            try:
-                IssueAssignee.objects.bulk_create(
-                    [
-                        IssueAssignee(
-                            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 user in assignees
-                    ],
-                    batch_size=10,
-                    ignore_conflicts=True,
-                )
-            except IntegrityError:
-                pass
+            IssueAssignee.objects.bulk_create(
+                [
+                    IssueAssignee(
+                        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 user in assignees
+                ],
+                batch_size=10,
+                ignore_conflicts=True,
+            )
 
         if labels is not None:
             IssueLabel.objects.filter(issue=instance).delete()
-            try:
-                IssueLabel.objects.bulk_create(
-                    [
-                        IssueLabel(
-                            label=label,
-                            issue=instance,
-                            project_id=project_id,
-                            workspace_id=workspace_id,
-                            created_by_id=created_by_id,
-                            updated_by_id=updated_by_id,
-                        )
-                        for label in labels
-                    ],
-                    batch_size=10,
-                    ignore_conflicts=True,
-                )
-            except IntegrityError:
-                pass
+            IssueLabel.objects.bulk_create(
+                [
+                    IssueLabel(
+                        label=label,
+                        issue=instance,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for label in labels
+                ],
+                batch_size=10,
+                ignore_conflicts=True,
+            )
 
         # Time updation occues even when other related models are updated
         instance.updated_at = timezone.now()
@@ -522,7 +506,6 @@ class IssueAttachmentLiteSerializer(DynamicBaseSerializer):
             "asset",
             "attributes",
             # "issue_id",
-            "created_by",
             "updated_at",
             "updated_by",
             "asset_url",

apiserver/plane/app/serializers/project.py

@@ -90,7 +90,17 @@ class ProjectLiteSerializer(BaseSerializer):
 
 
 class ProjectListSerializer(DynamicBaseSerializer):
+    total_issues = serializers.IntegerField(read_only=True)
+    archived_issues = serializers.IntegerField(read_only=True)
+    archived_sub_issues = serializers.IntegerField(read_only=True)
+    draft_issues = serializers.IntegerField(read_only=True)
+    draft_sub_issues = serializers.IntegerField(read_only=True)
+    sub_issues = serializers.IntegerField(read_only=True)
     is_favorite = serializers.BooleanField(read_only=True)
+    total_members = serializers.IntegerField(read_only=True)
+    total_cycles = serializers.IntegerField(read_only=True)
+    total_modules = serializers.IntegerField(read_only=True)
+    is_member = serializers.BooleanField(read_only=True)
     sort_order = serializers.FloatField(read_only=True)
     member_role = serializers.IntegerField(read_only=True)
     anchor = serializers.CharField(read_only=True)
@@ -103,9 +113,14 @@ class ProjectListSerializer(DynamicBaseSerializer):
         if project_members is not None:
             # Filter members by the project ID
             return [
-                member.member_id
+                {
+                    "id": member.id,
+                    "member_id": member.member_id,
+                    "member__display_name": member.member.display_name,
+                    "member__avatar": member.member.avatar,
+                    "member__avatar_url": member.member.avatar_url,
+                }
                 for member in project_members
-                if member.is_active and not member.member.is_bot
             ]
         return []
 
@@ -119,6 +134,10 @@ class ProjectDetailSerializer(BaseSerializer):
     default_assignee = UserLiteSerializer(read_only=True)
     project_lead = UserLiteSerializer(read_only=True)
     is_favorite = serializers.BooleanField(read_only=True)
+    total_members = serializers.IntegerField(read_only=True)
+    total_cycles = serializers.IntegerField(read_only=True)
+    total_modules = serializers.IntegerField(read_only=True)
+    is_member = serializers.BooleanField(read_only=True)
     sort_order = serializers.FloatField(read_only=True)
     member_role = serializers.IntegerField(read_only=True)
     anchor = serializers.CharField(read_only=True)

apiserver/plane/app/serializers/workspace.py

@@ -22,7 +22,6 @@ from plane.db.models import (
     ProjectMember,
     WorkspaceHomePreference,
     Sticky,
-    WorkspaceUserPreference,
 )
 from plane.utils.constants import RESTRICTED_WORKSPACE_SLUGS
 
@@ -32,9 +31,10 @@ from django.core.exceptions import ValidationError
 
 
 class WorkSpaceSerializer(DynamicBaseSerializer):
+    owner = UserLiteSerializer(read_only=True)
     total_members = serializers.IntegerField(read_only=True)
+    total_issues = serializers.IntegerField(read_only=True)
     logo_url = serializers.CharField(read_only=True)
-    role = serializers.IntegerField(read_only=True)
 
     def validate_slug(self, value):
         # Check if the slug is restricted
@@ -59,7 +59,7 @@ class WorkSpaceSerializer(DynamicBaseSerializer):
 class WorkspaceLiteSerializer(BaseSerializer):
     class Meta:
         model = Workspace
-        fields = ["name", "slug", "id", "logo_url"]
+        fields = ["name", "slug", "id"]
         read_only_fields = fields
 
 
@@ -90,11 +90,9 @@ class WorkspaceMemberAdminSerializer(DynamicBaseSerializer):
 
 
 class WorkSpaceMemberInviteSerializer(BaseSerializer):
-    workspace = WorkspaceLiteSerializer(read_only=True)
-    invite_link = serializers.SerializerMethodField()
-
-    def get_invite_link(self, obj):
-        return f"/workspace-invitations/?invitation_id={obj.id}&email={obj.email}&slug={obj.workspace.slug}"
+    workspace = WorkSpaceSerializer(read_only=True)
+    total_members = serializers.IntegerField(read_only=True)
+    created_by_detail = UserLiteSerializer(read_only=True, source="created_by")
 
     class Meta:
         model = WorkspaceMemberInvite
@@ -108,7 +106,6 @@ class WorkSpaceMemberInviteSerializer(BaseSerializer):
             "responded_at",
             "created_at",
             "updated_at",
-            "invite_link",
         ]
 
 
@@ -149,42 +146,6 @@ class WorkspaceUserLinkSerializer(BaseSerializer):
         return value
 
 
-    def create(self, validated_data):
-        # Filtering the WorkspaceUserLink with the given url to check if the link already exists.
-
-        url = validated_data.get("url")
-
-        workspace_user_link = WorkspaceUserLink.objects.filter(
-            url=url,
-            workspace_id=validated_data.get("workspace_id"),
-            owner_id=validated_data.get("owner_id")
-        )
-
-        if workspace_user_link.exists():
-            raise serializers.ValidationError(
-                {"error": "URL already exists for this workspace and owner"}
-            )
-
-        return super().create(validated_data)
-
-    def update(self, instance, validated_data):
-        # Filtering the WorkspaceUserLink with the given url to check if the link already exists.
-
-        url = validated_data.get("url")
-
-        workspace_user_link = WorkspaceUserLink.objects.filter(
-                url=url,
-                workspace_id=instance.workspace_id,
-                owner=instance.owner
-            )
-
-        if workspace_user_link.exclude(pk=instance.id).exists():
-            raise serializers.ValidationError(
-                {"error": "URL already exists for this workspace and owner"}
-            )
-
-        return super().update(instance, validated_data)
-
 class IssueRecentVisitSerializer(serializers.ModelSerializer):
     project_identifier = serializers.SerializerMethodField()
 
@@ -297,10 +258,3 @@ class StickySerializer(BaseSerializer):
         fields = "__all__"
         read_only_fields = ["workspace", "owner"]
         extra_kwargs = {"name": {"required": False}}
-
-
-class WorkspaceUserPreferenceSerializer(BaseSerializer):
-    class Meta:
-        model = WorkspaceUserPreference
-        fields = ["key", "is_pinned", "sort_order"]
-        read_only_fields = ["workspace", "created_by", "updated_by"]

apiserver/plane/app/urls/analytic.py

@@ -7,7 +7,6 @@ from plane.app.views import (
     SavedAnalyticEndpoint,
     ExportAnalyticsEndpoint,
     DefaultAnalyticsEndpoint,
-    ProjectStatsEndpoint,
 )
 
 
@@ -44,9 +43,4 @@ urlpatterns = [
         DefaultAnalyticsEndpoint.as_view(),
         name="default-analytics",
     ),
-    path(
-        "workspaces/<str:slug>/project-stats/",
-        ProjectStatsEndpoint.as_view(),
-        name="project-analytics",
-    ),
 ]

apiserver/plane/app/urls/issue.py

@@ -26,8 +26,6 @@ from plane.app.views import (
     IssueBulkUpdateDateEndpoint,
     IssueVersionEndpoint,
     IssueDescriptionVersionEndpoint,
-    IssueMetaEndpoint,
-    IssueDetailIdentifierEndpoint,
 )
 
 urlpatterns = [
@@ -280,14 +278,4 @@ urlpatterns = [
         IssueDescriptionVersionEndpoint.as_view(),
         name="page-versions",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/meta/",
-        IssueMetaEndpoint.as_view(),
-        name="issue-meta",
-    ),
-    path(
-        "workspaces/<str:slug>/work-items/<str:project_identifier>-<str:issue_identifier>/",
-        IssueDetailIdentifierEndpoint.as_view(),
-        name="issue-detail-identifier",
-    ),
 ]

apiserver/plane/app/urls/project.py

@@ -23,11 +23,6 @@ urlpatterns = [
         ProjectViewSet.as_view({"get": "list", "post": "create"}),
         name="project",
     ),
-    path(
-        "workspaces/<str:slug>/projects/details/",
-        ProjectViewSet.as_view({"get": "list_detail"}),
-        name="project",
-    ),
     path(
         "workspaces/<str:slug>/projects/<uuid:pk>/",
         ProjectViewSet.as_view(

apiserver/plane/app/urls/workspace.py

@@ -31,7 +31,6 @@ from plane.app.views import (
     UserRecentVisitViewSet,
     WorkspaceHomePreferenceViewSet,
     WorkspaceStickyViewSet,
-    WorkspaceUserPreferenceViewSet,
 )
 
 
@@ -259,15 +258,4 @@ urlpatterns = [
         ),
         name="workspace-sticky",
     ),
-    # User Preference
-    path(
-        "workspaces/<str:slug>/sidebar-preferences/",
-        WorkspaceUserPreferenceViewSet.as_view(),
-        name="workspace-user-preference",
-    ),
-    path(
-        "workspaces/<str:slug>/sidebar-preferences/<str:key>/",
-        WorkspaceUserPreferenceViewSet.as_view(),
-        name="workspace-user-preference",
-    ),
 ]

apiserver/plane/app/views/__init__.py

@@ -48,7 +48,6 @@ from .workspace.favorite import (
     WorkspaceFavoriteGroupEndpoint,
 )
 from .workspace.recent_visit import UserRecentVisitViewSet
-from .workspace.user_preference import WorkspaceUserPreferenceViewSet
 
 from .workspace.member import (
     WorkSpaceMemberViewSet,
@@ -116,8 +115,6 @@ from .issue.base import (
     IssuePaginatedViewSet,
     IssueDetailEndpoint,
     IssueBulkUpdateDateEndpoint,
-    IssueMetaEndpoint,
-    IssueDetailIdentifierEndpoint,
 )
 
 from .issue.activity import IssueActivityEndpoint
@@ -192,7 +189,6 @@ from .analytic.base import (
     SavedAnalyticEndpoint,
     ExportAnalyticsEndpoint,
     DefaultAnalyticsEndpoint,
-    ProjectStatsEndpoint,
 )
 
 from .notification.base import (

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

@@ -3,7 +3,7 @@ from django.db.models import Count, F, Sum, Q
 from django.db.models.functions import ExtractMonth
 from django.utils import timezone
 from django.db.models.functions import Concat
-from django.db.models import Case, When, Value, OuterRef, Func
+from django.db.models import Case, When, Value
 from django.db import models
 
 # Third party imports
@@ -15,16 +15,7 @@ from plane.app.permissions import WorkSpaceAdminPermission
 from plane.app.serializers import AnalyticViewSerializer
 from plane.app.views.base import BaseAPIView, BaseViewSet
 from plane.bgtasks.analytic_plot_export import analytic_export_task
-from plane.db.models import (
-    AnalyticView,
-    Issue,
-    Workspace,
-    Project,
-    ProjectMember,
-    Cycle,
-    Module,
-)
-
+from plane.db.models import AnalyticView, Issue, Workspace
 from plane.utils.analytics_plot import build_graph_plot
 from plane.utils.issue_filters import issue_filters
 from plane.app.permissions import allow_permission, ROLE
@@ -450,74 +441,3 @@ class DefaultAnalyticsEndpoint(BaseAPIView):
             },
             status=status.HTTP_200_OK,
         )
-
-
-class ProjectStatsEndpoint(BaseAPIView):
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
-    def get(self, request, slug):
-        fields = request.GET.get("fields", "").split(",")
-        project_ids = request.GET.get("project_ids", "")
-
-        valid_fields = {
-            "total_issues",
-            "completed_issues",
-            "total_members",
-            "total_cycles",
-            "total_modules",
-        }
-        requested_fields = set(filter(None, fields)) & valid_fields
-
-        if not requested_fields:
-            requested_fields = valid_fields
-
-        projects = Project.objects.filter(workspace__slug=slug)
-        if project_ids:
-            projects = projects.filter(id__in=project_ids.split(","))
-
-        annotations = {}
-        if "total_issues" in requested_fields:
-            annotations["total_issues"] = (
-                Issue.issue_objects.filter(project_id=OuterRef("pk"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-
-        if "completed_issues" in requested_fields:
-            annotations["completed_issues"] = (
-                Issue.issue_objects.filter(
-                    project_id=OuterRef("pk"), state__group="completed"
-                )
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-
-        if "total_cycles" in requested_fields:
-            annotations["total_cycles"] = (
-                Cycle.objects.filter(project_id=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-
-        if "total_modules" in requested_fields:
-            annotations["total_modules"] = (
-                Module.objects.filter(project_id=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-
-        if "total_members" in requested_fields:
-            annotations["total_members"] = (
-                ProjectMember.objects.filter(
-                    project_id=OuterRef("id"), member__is_bot=False, is_active=True
-                )
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-
-        projects = projects.annotate(**annotations).values("id", *requested_fields)
-        return Response(projects, status=status.HTTP_200_OK)

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

@@ -5,7 +5,6 @@ import uuid
 from django.conf import settings
 from django.http import HttpResponseRedirect
 from django.utils import timezone
-from django.db import IntegrityError
 
 # Third party imports
 from rest_framework import status
@@ -680,30 +679,15 @@ class ProjectBulkAssetEndpoint(BaseAPIView):
             [self.save_project_cover(asset, project_id) for asset in assets]
 
         if asset.entity_type == FileAsset.EntityTypeContext.ISSUE_DESCRIPTION:
-            # For some cases, the bulk api is called after the issue is deleted creating
-            # an integrity error
-            try:
-                assets.update(issue_id=entity_id)
-            except IntegrityError:
-                pass
+            assets.update(issue_id=entity_id)
 
         if asset.entity_type == FileAsset.EntityTypeContext.COMMENT_DESCRIPTION:
-            # For some cases, the bulk api is called after the comment is deleted
-            # creating an integrity error
-            try:
-                assets.update(comment_id=entity_id)
-            except IntegrityError:
-                pass
+            assets.update(comment_id=entity_id)
 
         if asset.entity_type == FileAsset.EntityTypeContext.PAGE_DESCRIPTION:
             assets.update(page_id=entity_id)
 
         if asset.entity_type == FileAsset.EntityTypeContext.DRAFT_ISSUE_DESCRIPTION:
-            # For some cases, the bulk api is called after the draft issue is deleted
-            # creating an integrity error
-            try:
-                assets.update(draft_issue_id=entity_id)
-            except IntegrityError:
-                pass
+            assets.update(draft_issue_id=entity_id)
 
         return Response(status=status.HTTP_204_NO_CONTENT)

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

@@ -47,7 +47,6 @@ from plane.db.models import (
     User,
     Project,
     ProjectMember,
-    UserRecentVisit,
 )
 from plane.utils.analytics_plot import burndown_plot
 from plane.bgtasks.recent_visited_task import recent_visited_task
@@ -134,11 +133,11 @@ class CycleViewSet(BaseViewSet):
                 )
             )
             .annotate(
-                cancelled_issues=Count(
+                pending_issues=Count(
                     "issue_cycle__issue__id",
                     distinct=True,
                     filter=Q(
-                        issue_cycle__issue__state__group__in=["cancelled"],
+                        issue_cycle__issue__state__group__in=["backlog", "unstarted", "started"],
                         issue_cycle__issue__archived_at__isnull=True,
                         issue_cycle__issue__is_draft=False,
                         issue_cycle__deleted_at__isnull=True,
@@ -227,7 +226,7 @@ class CycleViewSet(BaseViewSet):
                 "is_favorite",
                 "total_issues",
                 "completed_issues",
-                "cancelled_issues",
+                "pending_issues",
                 "assignee_ids",
                 "status",
                 "version",
@@ -259,7 +258,7 @@ class CycleViewSet(BaseViewSet):
             # meta fields
             "is_favorite",
             "total_issues",
-            "cancelled_issues",
+            "pending_issues",
             "completed_issues",
             "assignee_ids",
             "status",
@@ -544,13 +543,6 @@ class CycleViewSet(BaseViewSet):
             entity_identifier=pk,
             project_id=project_id,
         ).delete()
-        # Delete the cycle from recent visits
-        UserRecentVisit.objects.filter(
-            project_id=project_id,
-            workspace__slug=slug,
-            entity_identifier=pk,
-            entity_name="cycle",
-        ).delete(soft=False)
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 

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

@@ -44,7 +44,6 @@ from plane.db.models import (
     Project,
     ProjectMember,
     CycleIssue,
-    UserRecentVisit,
 )
 from plane.utils.grouper import (
     issue_group_values,
@@ -672,13 +671,6 @@ class IssueViewSet(BaseViewSet):
         issue = Issue.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)
 
         issue.delete()
-        # delete the issue from recent visits
-        UserRecentVisit.objects.filter(
-            project_id=project_id,
-            workspace__slug=slug,
-            entity_identifier=pk,
-            entity_name="issue",
-        ).delete(soft=False)
         issue_activity.delay(
             type="issue.activity.deleted",
             requested_data=json.dumps({"issue_id": str(pk)}),
@@ -1096,178 +1088,3 @@ class IssueBulkUpdateDateEndpoint(BaseAPIView):
         return Response(
             {"message": "Issues updated successfully"}, status=status.HTTP_200_OK
         )
-
-
-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(
-            id=issue_id, project_id=project_id, workspace__slug=slug
-        )
-        return Response(
-            {
-                "sequence_id": issue.sequence_id,
-                "project_identifier": issue.project.identifier,
-            },
-            status=status.HTTP_200_OK,
-        )
-
-
-class IssueDetailIdentifierEndpoint(BaseAPIView):
-
-    def get(self, request, slug, project_identifier, issue_identifier):
-        
-        # Fetch the project
-        project = Project.objects.get(
-            identifier__iexact=project_identifier,
-            workspace__slug=slug,
-        )
-
-        # Check if the user is a member of the project
-        if not ProjectMember.objects.filter(
-            workspace__slug=slug,
-            project_id=project.id,
-            member=request.user,
-            is_active=True,
-        ).exists():
-            return Response(
-                {"error": "You are not allowed to view this issue"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
-        # Fetch the issue
-        issue = (
-            Issue.issue_objects.filter(project_id=project.id)
-            .filter(workspace__slug=slug)
-            .select_related("workspace", "project", "state", "parent")
-            .prefetch_related("assignees", "labels", "issue_module__module")
-            .annotate(
-                cycle_id=Subquery(
-                    CycleIssue.objects.filter(issue=OuterRef("id")).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")
-            )
-            .filter(sequence_id=issue_identifier)
-            .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())),
-                ),
-            )
-            .prefetch_related(
-                Prefetch(
-                    "issue_reactions",
-                    queryset=IssueReaction.objects.select_related("issue", "actor"),
-                )
-            )
-            .prefetch_related(
-                Prefetch(
-                    "issue_link",
-                    queryset=IssueLink.objects.select_related("created_by"),
-                )
-            )
-            .annotate(
-                is_subscribed=Exists(
-                    IssueSubscriber.objects.filter(
-                            workspace__slug=slug,
-                            project_id=project.id,
-                        issue__sequence_id=issue_identifier,
-                        subscriber=request.user,
-                    )
-                )
-            )
-        ).first()
-
-        # Check if the issue exists
-        if not issue:
-            return Response(
-                {"error": "The required object does not exist."},
-                status=status.HTTP_404_NOT_FOUND,
-            )
-
-        """
-        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
-        """
-
-        if (
-            ProjectMember.objects.filter(
-                workspace__slug=slug,
-                project_id=project.id,
-                member=request.user,
-                role=5,
-                is_active=True,
-            ).exists()
-            and not project.guest_view_all_features
-            and not issue.created_by == request.user
-        ):
-            return Response(
-                {"error": "You are not allowed to view this issue"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        recent_visited_task.delay(
-            slug=slug,
-            entity_name="issue",
-            entity_identifier=str(issue.id),
-            user_id=str(request.user.id),
-            project_id=str(project.id),
-        )
-
-        # Serialize the issue
-        serializer = IssueDetailSerializer(issue, expand=self.expand)
-        return Response(serializer.data, status=status.HTTP_200_OK)

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

@@ -5,7 +5,6 @@ import json
 from django.utils import timezone
 from django.db.models import Exists
 from django.core.serializers.json import DjangoJSONEncoder
-from django.db import IntegrityError
 
 # Third Party imports
 from rest_framework.response import Response
@@ -165,32 +164,24 @@ class CommentReactionViewSet(BaseViewSet):
 
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def create(self, request, slug, project_id, comment_id):
-        try:
-            serializer = CommentReactionSerializer(data=request.data)
-            if serializer.is_valid():
-                serializer.save(
-                    project_id=project_id,
-                    actor_id=request.user.id,
-                    comment_id=comment_id,
-                )
-                issue_activity.delay(
-                    type="comment_reaction.activity.created",
-                    requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
-                    actor_id=str(request.user.id),
-                    issue_id=None,
-                    project_id=str(project_id),
-                    current_instance=None,
-                    epoch=int(timezone.now().timestamp()),
-                    notification=True,
-                    origin=request.META.get("HTTP_ORIGIN"),
-                )
-                return Response(serializer.data, status=status.HTTP_201_CREATED)
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-        except IntegrityError:
-            return Response(
-                {"error": "Reaction already exists for the user"},
-                status=status.HTTP_400_BAD_REQUEST,
+        serializer = CommentReactionSerializer(data=request.data)
+        if serializer.is_valid():
+            serializer.save(
+                project_id=project_id, actor_id=request.user.id, comment_id=comment_id
             )
+            issue_activity.delay(
+                type="comment_reaction.activity.created",
+                requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
+                actor_id=str(request.user.id),
+                issue_id=None,
+                project_id=str(project_id),
+                current_instance=None,
+                epoch=int(timezone.now().timestamp()),
+                notification=True,
+                origin=request.META.get("HTTP_ORIGIN"),
+            )
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def destroy(self, request, slug, project_id, comment_id, reaction_code):

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

@@ -35,9 +35,7 @@ class LabelViewSet(BaseViewSet):
             .order_by("sort_order")
         )
 
-    @invalidate_cache(
-        path="/api/workspaces/:slug/labels/", url_params=True, user=False, multiple=True
-    )
+    @invalidate_cache(path="/api/workspaces/:slug/labels/", url_params=True, user=False)
     @allow_permission([ROLE.ADMIN])
     def create(self, request, slug, project_id):
         try:
@@ -55,20 +53,6 @@ class LabelViewSet(BaseViewSet):
     @invalidate_cache(path="/api/workspaces/:slug/labels/", url_params=True, user=False)
     @allow_permission([ROLE.ADMIN])
     def partial_update(self, request, *args, **kwargs):
-        # Check if the label name is unique within the project
-        if (
-            "name" in request.data
-            and Label.objects.filter(
-                project_id=kwargs["project_id"], name=request.data["name"]
-            )
-            .exclude(pk=kwargs["pk"])
-            .exists()
-        ):
-            return Response(
-                {"error": "Label with the same name already exists in the project"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-        # call the parent method to perform the update
         return super().partial_update(request, *args, **kwargs)
 
     @invalidate_cache(path="/api/workspaces/:slug/labels/", url_params=True, user=False)
@@ -88,7 +72,7 @@ class BulkCreateIssueLabelsEndpoint(BaseAPIView):
                 Label(
                     name=label.get("name", "Migrated"),
                     description=label.get("description", "Migrated Issue"),
-                    color=f"#{random.randint(0, 0xFFFFFF + 1):06X}",
+                    color=f"#{random.randint(0, 0xFFFFFF+1):06X}",
                     project_id=project_id,
                     workspace_id=project.workspace_id,
                     created_by=request.user,

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

@@ -272,9 +272,10 @@ class IssueRelationViewSet(BaseViewSet):
 
         issue_relations = IssueRelation.objects.filter(
             workspace__slug=slug,
+            project_id=project_id,
         ).filter(
-            Q(issue_id=related_issue, related_issue_id=issue_id)
-            | Q(issue_id=issue_id, related_issue_id=related_issue)
+            Q(issue_id=related_issue, related_issue_id=issue_id) |
+            Q(issue_id=issue_id, related_issue_id=related_issue)
         )
         issue_relations = issue_relations.first()
         current_instance = json.dumps(

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

@@ -54,7 +54,6 @@ from plane.db.models import (
     ModuleLink,
     ModuleUserProperties,
     Project,
-    UserRecentVisit,
 )
 from plane.utils.analytics_plot import burndown_plot
 from plane.utils.timezone_converter import user_timezone_converter
@@ -809,13 +808,6 @@ class ModuleViewSet(BaseViewSet):
             entity_identifier=pk,
             project_id=project_id,
         ).delete()
-        # delete the module from recent visits
-        UserRecentVisit.objects.filter(
-            project_id=project_id,
-            workspace__slug=slug,
-            entity_identifier=pk,
-            entity_name="module",
-        ).delete(soft=False)
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 

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

@@ -33,14 +33,13 @@ from plane.db.models import (
     ProjectMember,
     ProjectPage,
     Project,
-    UserRecentVisit,
 )
 from plane.utils.error_codes import ERROR_CODES
 from ..base import BaseAPIView, BaseViewSet
 from plane.bgtasks.page_transaction_task import page_transaction
 from plane.bgtasks.page_version_task import page_version
 from plane.bgtasks.recent_visited_task import recent_visited_task
-from plane.bgtasks.copy_s3_object import copy_s3_objects
+
 
 def unarchive_archive_page_and_descendants(page_id, archived_at):
     # Your SQL query
@@ -388,13 +387,6 @@ class PageViewSet(BaseViewSet):
             entity_identifier=pk,
             entity_type="page",
         ).delete()
-        # Delete the page from recent visit
-        UserRecentVisit.objects.filter(
-            project_id=project_id,
-            workspace__slug=slug,
-            entity_identifier=pk,
-            entity_name="page",
-        ).delete(soft=False)
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
@@ -597,16 +589,6 @@ class PageDuplicateEndpoint(BaseAPIView):
         page_transaction.delay(
             {"description_html": page.description_html}, None, page.id
         )
-
-        # Copy the s3 objects uploaded in the page
-        copy_s3_objects.delay(
-            entity_name="PAGE",
-            entity_identifier=page.id,
-            project_id=project_id,
-            slug=slug,
-            user_id=request.user.id,
-        )
-
         page = (
             Page.objects.filter(pk=page.id)
             .annotate(

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

@@ -6,7 +6,7 @@ import json
 
 # Django imports
 from django.db import IntegrityError
-from django.db.models import Exists, F, OuterRef, Prefetch, Q, Subquery
+from django.db.models import Exists, F, Func, OuterRef, Prefetch, Q, Subquery
 from django.core.serializers.json import DjangoJSONEncoder
 
 # Third Party imports
@@ -25,9 +25,12 @@ from plane.app.serializers import (
 from plane.app.permissions import ProjectMemberPermission, allow_permission, ROLE
 from plane.db.models import (
     UserFavorite,
+    Cycle,
     Intake,
     DeployBoard,
     IssueUserProperty,
+    Issue,
+    Module,
     Project,
     ProjectIdentifier,
     ProjectMember,
@@ -36,7 +39,7 @@ from plane.db.models import (
     WorkspaceMember,
 )
 from plane.utils.cache import cache_response
-from plane.bgtasks.webhook_task import model_activity, webhook_activity
+from plane.bgtasks.webhook_task import model_activity
 from plane.bgtasks.recent_visited_task import recent_visited_task
 from plane.utils.exception_logger import log_exception
 
@@ -70,6 +73,36 @@ class ProjectViewSet(BaseViewSet):
                     )
                 )
             )
+            .annotate(
+                is_member=Exists(
+                    ProjectMember.objects.filter(
+                        member=self.request.user,
+                        project_id=OuterRef("pk"),
+                        workspace__slug=self.kwargs.get("slug"),
+                        is_active=True,
+                    )
+                )
+            )
+            .annotate(
+                total_members=ProjectMember.objects.filter(
+                    project_id=OuterRef("id"), member__is_bot=False, is_active=True
+                )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(
+                total_cycles=Cycle.objects.filter(project_id=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(
+                total_modules=Module.objects.filter(project_id=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
             .annotate(
                 member_role=ProjectMember.objects.filter(
                     project_id=OuterRef("pk"),
@@ -100,7 +133,7 @@ class ProjectViewSet(BaseViewSet):
     @allow_permission(
         allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE"
     )
-    def list_detail(self, request, slug):
+    def list(self, request, slug):
         fields = [field for field in request.GET.get("fields", "").split(",") if field]
         projects = self.get_queryset().order_by("sort_order", "name")
         if WorkspaceMember.objects.filter(
@@ -137,73 +170,6 @@ class ProjectViewSet(BaseViewSet):
         ).data
         return Response(projects, status=status.HTTP_200_OK)
 
-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE"
-    )
-    def list(self, request, slug):
-        sort_order = ProjectMember.objects.filter(
-            member=self.request.user,
-            project_id=OuterRef("pk"),
-            workspace__slug=self.kwargs.get("slug"),
-            is_active=True,
-        ).values("sort_order")
-
-        projects = (
-            Project.objects.filter(workspace__slug=self.kwargs.get("slug"))
-            .select_related(
-                "workspace", "workspace__owner", "default_assignee", "project_lead"
-            )
-            .annotate(
-                member_role=ProjectMember.objects.filter(
-                    project_id=OuterRef("pk"),
-                    member_id=self.request.user.id,
-                    is_active=True,
-                ).values("role")
-            )
-            .annotate(inbox_view=F("intake_view"))
-            .annotate(sort_order=Subquery(sort_order))
-            .distinct()
-        ).values(
-            "id",
-            "name",
-            "identifier",
-            "sort_order",
-            "logo_props",
-            "member_role",
-            "archived_at",
-            "workspace",
-            "cycle_view",
-            "issue_views_view",
-            "module_view",
-            "page_view",
-            "inbox_view",
-            "project_lead",
-            "created_at",
-            "updated_at",
-            "created_by",
-            "updated_by",
-        )
-
-        if WorkspaceMember.objects.filter(
-            member=request.user, workspace__slug=slug, is_active=True, role=5
-        ).exists():
-            projects = projects.filter(
-                project_projectmember__member=self.request.user,
-                project_projectmember__is_active=True,
-            )
-
-        if WorkspaceMember.objects.filter(
-            member=request.user, workspace__slug=slug, is_active=True, role=15
-        ).exists():
-            projects = projects.filter(
-                Q(
-                    project_projectmember__member=self.request.user,
-                    project_projectmember__is_active=True,
-                )
-                | Q(network=2)
-            )
-        return Response(projects, status=status.HTTP_200_OK)
-
     @allow_permission(
         allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE"
     )
@@ -216,6 +182,58 @@ class ProjectViewSet(BaseViewSet):
             )
             .filter(archived_at__isnull=True)
             .filter(pk=pk)
+            .annotate(
+                total_issues=Issue.issue_objects.filter(
+                    project_id=self.kwargs.get("pk")
+                )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(
+                sub_issues=Issue.issue_objects.filter(
+                    project_id=self.kwargs.get("pk"), parent__isnull=False
+                )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(
+                archived_issues=Issue.objects.filter(
+                    project_id=self.kwargs.get("pk"), archived_at__isnull=False
+                )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(
+                archived_sub_issues=Issue.objects.filter(
+                    project_id=self.kwargs.get("pk"),
+                    archived_at__isnull=False,
+                    parent__isnull=False,
+                )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(
+                draft_issues=Issue.objects.filter(
+                    project_id=self.kwargs.get("pk"), is_draft=True
+                )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
+            .annotate(
+                draft_sub_issues=Issue.objects.filter(
+                    project_id=self.kwargs.get("pk"),
+                    is_draft=True,
+                    parent__isnull=False,
+                )
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
+            )
         ).first()
 
         if project is None:
@@ -444,19 +462,7 @@ class ProjectViewSet(BaseViewSet):
         ):
             project = Project.objects.get(pk=pk)
             project.delete()
-            webhook_activity.delay(
-                event="project",
-                verb="deleted",
-                field=None,
-                old_value=None,
-                new_value=None,
-                actor_id=request.user.id,
-                slug=slug,
-                current_site=request.META.get("HTTP_ORIGIN"),
-                event_id=project.id,
-                old_identifier=None,
-                new_identifier=None,
-            )
+
             # Delete the project members
             DeployBoard.objects.filter(project_id=pk, workspace__slug=slug).delete()
 

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

@@ -53,23 +53,6 @@ class StateViewSet(BaseViewSet):
                     status=status.HTTP_400_BAD_REQUEST,
                 )
 
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
-    def partial_update(self, request, slug, project_id, pk):
-        try:
-            state = State.objects.get(
-                pk=pk, project_id=project_id, workspace__slug=slug
-            )
-            serializer = StateSerializer(state, data=request.data, partial=True)
-            if serializer.is_valid():
-                serializer.save()
-                return Response(serializer.data, status=status.HTTP_200_OK)
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-        except IntegrityError as e:
-            if "already exists" in str(e):
-                return Response(
-                    {"name": "The state name is already taken"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
 
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
     def list(self, request, slug, project_id):

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

@@ -24,7 +24,6 @@ from plane.db.models import (
     ProjectMember,
     Project,
     CycleIssue,
-    UserRecentVisit,
 )
 from plane.utils.grouper import (
     issue_group_values,
@@ -496,13 +495,6 @@ class IssueViewViewSet(BaseViewSet):
                 entity_identifier=pk,
                 entity_type="view",
             ).delete()
-            # Delete the page from recent visit
-            UserRecentVisit.objects.filter(
-                project_id=project_id,
-                workspace__slug=slug,
-                entity_identifier=pk,
-                entity_name="view",
-            ).delete(soft=False)
         else:
             return Response(
                 {"error": "Only admin or owner can delete the view"},

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

@@ -120,7 +120,7 @@ class WebhookLogsEndpoint(BaseAPIView):
     @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")
     def get(self, request, slug, webhook_id):
         webhook_logs = WebhookLog.objects.filter(
-            workspace__slug=slug, webhook=webhook_id
+            workspace__slug=slug, webhook_id=webhook_id
         )
         serializer = WebhookLogSerializer(webhook_logs, many=True)
         return Response(serializer.data, status=status.HTTP_200_OK)

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

@@ -7,11 +7,9 @@ from datetime import date
 from dateutil.relativedelta import relativedelta
 from django.db import IntegrityError
 from django.db.models import Count, F, Func, OuterRef, Prefetch, Q
-
 from django.db.models.fields import DateField
 from django.db.models.functions import Cast, ExtractDay, ExtractWeek
 
-
 # Django imports
 from django.http import HttpResponse
 from django.utils import timezone
@@ -64,6 +62,12 @@ class WorkSpaceViewSet(BaseViewSet):
             .values("count")
         )
 
+        issue_count = (
+            Issue.issue_objects.filter(workspace=OuterRef("id"))
+            .order_by()
+            .annotate(count=Func(F("id"), function="Count"))
+            .values("count")
+        )
         return (
             self.filter_queryset(super().get_queryset().select_related("owner"))
             .order_by("name")
@@ -72,6 +76,8 @@ class WorkSpaceViewSet(BaseViewSet):
                 workspace_member__is_active=True,
             )
             .annotate(total_members=member_count)
+            .annotate(total_issues=issue_count)
+            .select_related("owner")
         )
 
     def create(self, request):
@@ -117,14 +123,7 @@ class WorkSpaceViewSet(BaseViewSet):
                     role=20,
                     company_role=request.data.get("company_role", ""),
                 )
-
-                # Get total members and role
-                total_members=WorkspaceMember.objects.filter(workspace_id=serializer.data["id"]).count()
-                data = serializer.data
-                data["total_members"] = total_members
-                data["role"] = 20
-
-                return Response(data, status=status.HTTP_201_CREATED)
+                return Response(serializer.data, status=status.HTTP_201_CREATED)
             return Response(
                 [serializer.errors[error][0] for error in serializer.errors],
                 status=status.HTTP_400_BAD_REQUEST,
@@ -167,9 +166,11 @@ class UserWorkSpacesEndpoint(BaseAPIView):
             .values("count")
         )
 
-        role = (
-            WorkspaceMember.objects.filter(workspace=OuterRef("id"), member=request.user, is_active=True)
-            .values("role")
+        issue_count = (
+            Issue.issue_objects.filter(workspace=OuterRef("id"))
+            .order_by()
+            .annotate(count=Func(F("id"), function="Count"))
+            .values("count")
         )
 
         workspace = (
@@ -181,19 +182,19 @@ class UserWorkSpacesEndpoint(BaseAPIView):
                     ),
                 )
             )
-            .annotate(role=role, total_members=member_count)
+            .select_related("owner")
+            .annotate(total_members=member_count)
+            .annotate(total_issues=issue_count)
             .filter(
                 workspace_member__member=request.user, workspace_member__is_active=True
             )
             .distinct()
         )
-
         workspaces = WorkSpaceSerializer(
             self.filter_queryset(workspace),
             fields=fields if fields else None,
             many=True,
         ).data
-
         return Response(workspaces, status=status.HTTP_200_OK)
 
 

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

@@ -4,7 +4,6 @@ from rest_framework.response import Response
 
 # Django modules
 from django.db.models import Q
-from django.db import IntegrityError
 
 # Module imports
 from plane.app.views.base import BaseAPIView
@@ -32,21 +31,16 @@ class WorkspaceFavoriteEndpoint(BaseAPIView):
 
     @allow_permission(allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")
     def post(self, request, slug):
-        try:
-            workspace = Workspace.objects.get(slug=slug)
-            serializer = UserFavoriteSerializer(data=request.data)
-            if serializer.is_valid():
-                serializer.save(
-                    user_id=request.user.id,
-                    workspace=workspace,
-                    project_id=request.data.get("project_id", None),
-                )
-                return Response(serializer.data, status=status.HTTP_200_OK)
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-        except IntegrityError:
-            return Response(
-                {"error": "Favorite already exists"}, status=status.HTTP_400_BAD_REQUEST
+        workspace = Workspace.objects.get(slug=slug)
+        serializer = UserFavoriteSerializer(data=request.data)
+        if serializer.is_valid():
+            serializer.save(
+                user_id=request.user.id,
+                workspace=workspace,
+                project_id=request.data.get("project_id", None),
             )
+            return Response(serializer.data, status=status.HTTP_200_OK)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     @allow_permission(allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")
     def patch(self, request, slug, favorite_id):

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

@@ -251,7 +251,8 @@ class UserWorkspaceInvitationsViewSet(BaseViewSet):
             super()
             .get_queryset()
             .filter(email=self.request.user.email)
-            .select_related("workspace")
+            .select_related("workspace", "workspace__owner", "created_by")
+            .annotate(total_members=Count("workspace__workspace_member"))
         )
 
     @invalidate_cache(path="/api/workspaces/", user=False)

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

@@ -21,7 +21,7 @@ class QuickLinkViewSet(BaseViewSet):
         serializer = WorkspaceUserLinkSerializer(data=request.data)
 
         if serializer.is_valid():
-            serializer.save(workspace_id=workspace.id, owner_id=request.user.id)
+            serializer.save(workspace_id=workspace.id, owner=request.user)
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 

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

@@ -1,85 +0,0 @@
-# Module imports
-from ..base import BaseAPIView
-from plane.db.models.workspace import WorkspaceUserPreference
-from plane.app.serializers.workspace import WorkspaceUserPreferenceSerializer
-from plane.app.permissions import allow_permission, ROLE
-from plane.db.models import Workspace
-
-
-# Third party imports
-from rest_framework.response import Response
-from rest_framework import status
-
-
-class WorkspaceUserPreferenceViewSet(BaseAPIView):
-    model = WorkspaceUserPreference
-
-    def get_serializer_class(self):
-        return WorkspaceUserPreferenceSerializer
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
-    def get(self, request, slug):
-        workspace = Workspace.objects.get(slug=slug)
-
-        get_preference = WorkspaceUserPreference.objects.filter(
-            user=request.user, workspace_id=workspace.id
-        )
-
-        create_preference_keys = []
-
-        keys = [
-            key
-            for key, _ in WorkspaceUserPreference.UserPreferenceKeys.choices
-        ]
-
-        for preference in keys:
-            if preference not in get_preference.values_list("key", flat=True):
-                create_preference_keys.append(preference)
-
-                preference = WorkspaceUserPreference.objects.bulk_create(
-                    [
-                        WorkspaceUserPreference(
-                            key=key, user=request.user, workspace=workspace, sort_order=(65535 + (i*10000))
-                        )
-                        for i, key in enumerate(create_preference_keys)
-                    ],
-                    batch_size=10,
-                    ignore_conflicts=True,
-                )
-
-        preferences = WorkspaceUserPreference.objects.filter(
-            user=request.user, workspace_id=workspace.id
-        ).order_by("sort_order").values("key", "is_pinned", "sort_order")
-
-
-        user_preferences = {}
-
-        for preference in preferences:
-            user_preferences[(str(preference["key"]))] = {
-                "is_pinned": preference["is_pinned"],
-                "sort_order": preference["sort_order"],
-        }
-        return Response(
-            user_preferences,
-            status=status.HTTP_200_OK,
-        )
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
-    def patch(self, request, slug, key):
-        preference = WorkspaceUserPreference.objects.filter(
-            key=key, workspace__slug=slug, user=request.user
-        ).first()
-
-        if preference:
-            serializer = WorkspaceUserPreferenceSerializer(
-                preference, 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)
-
-        return Response(
-            {"detail": "Preference not found"}, status=status.HTTP_404_NOT_FOUND
-        )

apiserver/plane/authentication/urls.py

@@ -53,6 +53,7 @@ urlpatterns = [
     path("magic-generate/", MagicGenerateEndpoint.as_view(), name="magic-generate"),
     path("magic-sign-in/", MagicSignInEndpoint.as_view(), name="magic-sign-in"),
     path("magic-sign-up/", MagicSignUpEndpoint.as_view(), name="magic-sign-up"),
+    path("get-csrf-token/", CSRFTokenEndpoint.as_view(), name="get_csrf_token"),
     path(
         "spaces/magic-generate/",
         MagicGenerateSpaceEndpoint.as_view(),

apiserver/plane/bgtasks/copy_s3_object.py

@@ -1,150 +0,0 @@
-# Python imports
-import uuid
-import base64
-import requests
-from bs4 import BeautifulSoup
-
-# Django imports
-from django.conf import settings
-
-# Module imports
-from plane.db.models import FileAsset, Page, Issue
-from plane.utils.exception_logger import log_exception
-from plane.settings.storage import S3Storage
-from celery import shared_task
-
-
-def get_entity_id_field(entity_type, entity_id):
-    entity_mapping = {
-        FileAsset.EntityTypeContext.WORKSPACE_LOGO: {"workspace_id": entity_id},
-        FileAsset.EntityTypeContext.PROJECT_COVER: {"project_id": entity_id},
-        FileAsset.EntityTypeContext.USER_AVATAR: {"user_id": entity_id},
-        FileAsset.EntityTypeContext.USER_COVER: {"user_id": entity_id},
-        FileAsset.EntityTypeContext.ISSUE_ATTACHMENT: {"issue_id": entity_id},
-        FileAsset.EntityTypeContext.ISSUE_DESCRIPTION: {"issue_id": entity_id},
-        FileAsset.EntityTypeContext.PAGE_DESCRIPTION: {"page_id": entity_id},
-        FileAsset.EntityTypeContext.COMMENT_DESCRIPTION: {"comment_id": entity_id},
-        FileAsset.EntityTypeContext.DRAFT_ISSUE_DESCRIPTION: {
-            "draft_issue_id": entity_id
-        },
-    }
-    return entity_mapping.get(entity_type, {})
-
-
-def extract_asset_ids(html, tag):
-    try:
-        soup = BeautifulSoup(html, "html.parser")
-        return [tag.get("src") for tag in soup.find_all(tag) if tag.get("src")]
-    except Exception as e:
-        log_exception(e)
-        return []
-
-
-def replace_asset_ids(html, tag, duplicated_assets):
-    try:
-        soup = BeautifulSoup(html, "html.parser")
-        for mention_tag in soup.find_all(tag):
-            for asset in duplicated_assets:
-                if mention_tag.get("src") == asset["old_asset_id"]:
-                    mention_tag["src"] = asset["new_asset_id"]
-        return str(soup)
-    except Exception as e:
-        log_exception(e)
-        return html
-
-
-def update_description(entity, duplicated_assets, tag):
-    updated_html = replace_asset_ids(entity.description_html, tag, duplicated_assets)
-    entity.description_html = updated_html
-    entity.save()
-    return updated_html
-
-
-# Get the description binary and description from the live server
-def sync_with_external_service(entity_name, description_html):
-    try:
-        data = {
-            "description_html": description_html,
-            "variant": "rich" if entity_name == "PAGE" else "document",
-        }
-        response = requests.post(
-            f"{settings.LIVE_BASE_URL}/convert-document/",
-            json=data,
-            headers=None,
-        )
-        if response.status_code == 200:
-            return response.json()
-    except requests.RequestException as e:
-        log_exception(e)
-    return {}
-
-
-@shared_task
-def copy_s3_objects(entity_name, entity_identifier, project_id, slug, user_id):
-    """
-    Step 1: Extract asset ids from the description_html of the entity
-    Step 2: Duplicate the assets
-    Step 3: Update the description_html of the entity with the new asset ids (change the src of img tag)
-    Step 4: Request the live server to generate the description_binary and description for the entity
-
-    """
-    try:
-        model_class = {"PAGE": Page, "ISSUE": Issue}.get(entity_name)
-        if not model_class:
-            raise ValueError(f"Unsupported entity_name: {entity_name}")
-
-        entity = model_class.objects.get(id=entity_identifier)
-        asset_ids = extract_asset_ids(entity.description_html, "image-component")
-
-        duplicated_assets = []
-        workspace = entity.workspace
-        storage = S3Storage()
-        original_assets = FileAsset.objects.filter(
-            workspace=workspace, project_id=project_id, id__in=asset_ids
-        )
-
-        for original_asset in original_assets:
-            destination_key = f"{workspace.id}/{uuid.uuid4().hex}-{original_asset.attributes.get('name')}"
-            duplicated_asset = FileAsset.objects.create(
-                attributes={
-                    "name": original_asset.attributes.get("name"),
-                    "type": original_asset.attributes.get("type"),
-                    "size": original_asset.attributes.get("size"),
-                },
-                asset=destination_key,
-                size=original_asset.size,
-                workspace=workspace,
-                created_by_id=user_id,
-                entity_type=original_asset.entity_type,
-                project_id=project_id,
-                storage_metadata=original_asset.storage_metadata,
-                **get_entity_id_field(original_asset.entity_type, entity_identifier),
-            )
-            storage.copy_object(original_asset.asset, destination_key)
-            duplicated_assets.append(
-                {
-                    "new_asset_id": str(duplicated_asset.id),
-                    "old_asset_id": str(original_asset.id),
-                }
-            )
-
-        if duplicated_assets:
-            FileAsset.objects.filter(
-                pk__in=[item["new_asset_id"] for item in duplicated_assets]
-            ).update(is_uploaded=True)
-            updated_html = update_description(
-                entity, duplicated_assets, "image-component"
-            )
-            external_data = sync_with_external_service(entity_name, updated_html)
-
-            if external_data:
-                entity.description = external_data.get("description")
-                entity.description_binary = base64.b64decode(
-                    external_data.get("description_binary")
-                )
-                entity.save()
-
-        return
-    except Exception as e:
-        log_exception(e)
-        return []

apiserver/plane/bgtasks/deletion_task.py

@@ -82,10 +82,7 @@ def soft_delete_related_objects(app_label, model_name, instance_pk, using=None):
                                 )
                 else:
                     # Handle other relationships
-                    related_queryset = getattr(instance, related_name)(
-                        manager="objects"
-                    ).all()
-
+                    related_queryset = getattr(instance, related_name).all()
                     for related_obj in related_queryset:
                         if hasattr(related_obj, "deleted_at"):
                             if not related_obj.deleted_at:

apiserver/plane/bgtasks/issue_activities_task.py

@@ -738,10 +738,8 @@ def delete_comment_activity(
     issue_activities,
     epoch,
 ):
-    requested_data = json.loads(requested_data) if requested_data is not None else None
     issue_activities.append(
         IssueActivity(
-            issue_comment_id=requested_data.get("comment_id", None),
             issue_id=issue_id,
             project_id=project_id,
             workspace_id=workspace_id,
@@ -790,15 +788,14 @@ def create_cycle_issue_activity(
                 issue_id=updated_record.get("issue_id"),
                 actor_id=actor_id,
                 verb="updated",
-                old_value=old_cycle.name if old_cycle else "",
-                new_value=new_cycle.name if new_cycle else "",
+                old_value=old_cycle.name,
+                new_value=new_cycle.name,
                 field="cycles",
                 project_id=project_id,
                 workspace_id=workspace_id,
-                comment=f"""updated cycle from {old_cycle.name if old_cycle else ""}
-                to {new_cycle.name if new_cycle else ""}""",
-                old_identifier=old_cycle.id if old_cycle else None,
-                new_identifier=new_cycle.id if new_cycle else None,
+                comment=f"updated cycle from {old_cycle.name} to {new_cycle.name}",
+                old_identifier=old_cycle.id,
+                new_identifier=new_cycle.id,
                 epoch=epoch,
             )
         )
@@ -894,11 +891,11 @@ def create_module_issue_activity(
             actor_id=actor_id,
             verb="created",
             old_value="",
-            new_value=module.name if module else "",
+            new_value=module.name,
             field="modules",
             project_id=project_id,
             workspace_id=workspace_id,
-            comment=f"added module {module.name if module else ''}",
+            comment=f"added module {module.name}",
             new_identifier=requested_data.get("module_id"),
             epoch=epoch,
         )
@@ -1414,7 +1411,7 @@ def delete_issue_relation_activity(
             ),
             project_id=project_id,
             workspace_id=workspace_id,
-            comment=f"deleted {requested_data.get('relation_type')} relation",
+            comment=f'deleted {requested_data.get("relation_type")} relation',
             old_identifier=requested_data.get("related_issue"),
             epoch=epoch,
         )

apiserver/plane/bgtasks/recent_visited_task.py

@@ -1,6 +1,5 @@
 # Python imports
 from django.utils import timezone
-from django.db import DatabaseError
 
 # Third party imports
 from celery import shared_task
@@ -23,12 +22,8 @@ def recent_visited_task(entity_name, entity_identifier, user_id, project_id, slu
         ).first()
 
         if recent_visited:
-            # Check if the database is available
-            try:
-                recent_visited.visited_at = timezone.now()
-                recent_visited.save(update_fields=["visited_at"])
-            except DatabaseError:
-                pass
+            recent_visited.visited_at = timezone.now()
+            recent_visited.save(update_fields=["visited_at"])
         else:
             recent_visited_count = UserRecentVisit.objects.filter(
                 user_id=user_id, workspace_id=workspace.id

apiserver/plane/bgtasks/webhook_task.py

@@ -136,7 +136,7 @@ def webhook_task(self, webhook, slug, event, event_data, action, current_site):
         # Log the webhook request
         WebhookLog.objects.create(
             workspace_id=str(webhook.workspace_id),
-            webhook=str(webhook.id),
+            webhook_id=str(webhook.id),
             event_type=str(event),
             request_method=str(action),
             request_headers=str(headers),
@@ -153,7 +153,7 @@ def webhook_task(self, webhook, slug, event, event_data, action, current_site):
         # Log the failed webhook request
         WebhookLog.objects.create(
             workspace_id=str(webhook.workspace_id),
-            webhook=str(webhook.id),
+            webhook_id=str(webhook.id),
             event_type=str(event),
             request_method=str(action),
             request_headers=str(headers),
@@ -304,7 +304,7 @@ def webhook_send_task(
         # Log the webhook request
         WebhookLog.objects.create(
             workspace_id=str(webhook.workspace_id),
-            webhook=str(webhook.id),
+            webhook_id=str(webhook.id),
             event_type=str(event),
             request_method=str(action),
             request_headers=str(headers),
@@ -319,7 +319,7 @@ def webhook_send_task(
         # Log the failed webhook request
         WebhookLog.objects.create(
             workspace_id=str(webhook.workspace_id),
-            webhook=str(webhook.id),
+            webhook_id=str(webhook.id),
             event_type=str(event),
             request_method=str(action),
             request_headers=str(headers),
@@ -387,11 +387,7 @@ def webhook_activity(
                 webhook=webhook.id,
                 slug=slug,
                 event=event,
-                event_data=(
-                    {"id": event_id}
-                    if verb == "deleted"
-                    else get_model_data(event=event, event_id=event_id)
-                ),
+                event_data=get_model_data(event=event, event_id=event_id),
                 action=verb,
                 current_site=current_site,
                 activity={

apiserver/plane/db/migrations/0091_issuecomment_edited_at_and_more.py

@@ -1,33 +0,0 @@
-# Generated by Django 4.2.17 on 2025-01-30 16:08
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0090_rename_dashboard_deprecateddashboard_and_more'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='issuecomment',
-            name='edited_at',
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='profile',
-            name='is_smooth_cursor_enabled',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AlterField(
-            model_name='userrecentvisit',
-            name='entity_name',
-            field=models.CharField(max_length=30),
-        ),
-        migrations.AlterField(
-            model_name='webhooklog',
-            name='webhook',
-            field=models.UUIDField(),
-        )
-    ]

apiserver/plane/db/models/__init__.py

@@ -69,8 +69,7 @@ from .workspace import (
     WorkspaceTheme,
     WorkspaceUserProperties,
     WorkspaceUserLink,
-    WorkspaceHomePreference,
-    WorkspaceUserPreference,
+    WorkspaceHomePreference
 )
 
 from .favorite import UserFavorite

apiserver/plane/db/models/issue.py

@@ -467,7 +467,6 @@ class IssueComment(ProjectBaseModel):
     )
     external_source = models.CharField(max_length=255, null=True, blank=True)
     external_id = models.CharField(max_length=255, blank=True, null=True)
-    edited_at = models.DateTimeField(null=True, blank=True)
 
     def save(self, *args, **kwargs):
         self.comment_stripped = (

apiserver/plane/db/models/recent_visit.py

@@ -17,7 +17,7 @@ class EntityNameEnum(models.TextChoices):
 
 class UserRecentVisit(WorkspaceBaseModel):
     entity_identifier = models.UUIDField(null=True)
-    entity_name = models.CharField(max_length=30)
+    entity_name = models.CharField(max_length=30, choices=EntityNameEnum.choices)
     user = models.ForeignKey(
         settings.AUTH_USER_MODEL,
         on_delete=models.CASCADE,

apiserver/plane/db/models/user.py

@@ -186,8 +186,6 @@ class Profile(TimeAuditModel):
     billing_address = models.JSONField(null=True)
     has_billing_address = models.BooleanField(default=False)
     company_name = models.CharField(max_length=255, blank=True)
-
-    is_smooth_cursor_enabled = models.BooleanField(default=False)
     # mobile
     is_mobile_onboarded = models.BooleanField(default=False)
     mobile_onboarding_step = models.JSONField(default=get_mobile_default_onboarding)

apiserver/plane/db/models/webhook.py

@@ -66,7 +66,7 @@ class WebhookLog(BaseModel):
         "db.Workspace", on_delete=models.CASCADE, related_name="webhook_logs"
     )
     # Associated webhook
-    webhook = models.UUIDField()
+    webhook = models.ForeignKey(Webhook, on_delete=models.CASCADE, related_name="logs")
 
     # Basic request details
     event_type = models.CharField(max_length=255, blank=True, null=True)
@@ -89,4 +89,4 @@ class WebhookLog(BaseModel):
         ordering = ("-created_at",)
 
     def __str__(self):
-        return f"{self.event_type} {str(self.webhook)}"
+        return f"{self.event_type} {str(self.webhook.url)}"

apiserver/plane/db/models/workspace.py

@@ -388,16 +388,15 @@ class WorkspaceHomePreference(BaseModel):
         return f"{self.workspace.name} {self.user.email} {self.key}"
 
 
+
 class WorkspaceUserPreference(BaseModel):
     """Preference for the workspace for a user"""
 
-    class UserPreferenceKeys(models.TextChoices):        
+    class UserPreferenceKeys(models.TextChoices):
+        CYCLES = "cycles", "Cycles"
         VIEWS = "views", "Views"
-        ACTIVE_CYCLES = "active_cycles", "Active Cycles"
         ANALYTICS = "analytics", "Analytics"
-        DRAFTS = "drafts", "Drafts"
-        YOUR_WORK = "your_work", "Your Work"
-        ARCHIVES = "archives", "Archives"
+        PROJECTS = "projects", "Projects"
 
     workspace = models.ForeignKey(
         "db.Workspace",

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

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

apiserver/plane/settings/common.py

@@ -336,8 +336,6 @@ CSRF_FAILURE_VIEW = "plane.authentication.views.common.csrf_failure"
 ADMIN_BASE_URL = os.environ.get("ADMIN_BASE_URL", None)
 SPACE_BASE_URL = os.environ.get("SPACE_BASE_URL", None)
 APP_BASE_URL = os.environ.get("APP_BASE_URL")
-LIVE_BASE_URL = os.environ.get("LIVE_BASE_URL")
-
 
 HARD_DELETE_AFTER_DAYS = int(os.environ.get("HARD_DELETE_AFTER_DAYS", 60))
 

apiserver/plane/settings/storage.py

@@ -151,17 +151,3 @@ class S3Storage(S3Boto3Storage):
             "ETag": response.get("ETag"),
             "Metadata": response.get("Metadata", {}),
         }
-
-    def copy_object(self, object_name, new_object_name):
-        """Copy an S3 object to a new location"""
-        try:
-            response = self.s3_client.copy_object(
-                Bucket=self.aws_storage_bucket_name,
-                CopySource={"Bucket": self.aws_storage_bucket_name, "Key": object_name},
-                Key=new_object_name,
-            )
-        except ClientError as e:
-            log_exception(e)
-            return None
-
-        return response

apiserver/plane/space/views/meta.py

@@ -14,9 +14,9 @@ class ProjectMetaDataEndpoint(BaseAPIView):
 
     def get(self, request, anchor):
         try:
-            deploy_board = DeployBoard.objects.get(
+            deploy_board = DeployBoard.objects.filter(
                 anchor=anchor, entity_name="project"
-            )
+            ).first()
         except DeployBoard.DoesNotExist:
             return Response(
                 {"error": "Project is not published"}, status=status.HTTP_404_NOT_FOUND

apiserver/plane/utils/timezone_converter.py

@@ -1,14 +1,8 @@
-# Python imports
 import pytz
+from plane.db.models import Project
 from datetime import datetime, time
 from datetime import timedelta
 
-# Django imports
-from django.utils import timezone
-
-# Module imports
-from plane.db.models import Project
-
 
 def user_timezone_converter(queryset, datetime_fields, user_timezone):
     # Create a timezone object for the user's timezone
@@ -71,27 +65,16 @@ def convert_to_utc(
     if is_start_date:
         localized_datetime += timedelta(minutes=0, seconds=1)
 
-        # Convert the localized datetime to UTC
-        utc_datetime = localized_datetime.astimezone(pytz.utc)
+    # If it's start an end date are equal, add 23 hours, 59 minutes, and 59 seconds
+    # to make it the end of the day
+    if is_start_date_end_date_equal:
+        localized_datetime += timedelta(hours=23, minutes=59, seconds=59)
 
-        current_datetime_in_project_tz = timezone.now().astimezone(local_tz)
-        current_datetime_in_utc = current_datetime_in_project_tz.astimezone(pytz.utc)
+    # Convert the localized datetime to UTC
+    utc_datetime = localized_datetime.astimezone(pytz.utc)
 
-        if utc_datetime.date() == current_datetime_in_utc.date():
-            return current_datetime_in_utc
-
-        return utc_datetime
-    else:
-        # If it's start an end date are equal, add 23 hours, 59 minutes, and 59 seconds
-        # to make it the end of the day
-        if is_start_date_end_date_equal:
-            localized_datetime += timedelta(hours=23, minutes=59, seconds=59)
-
-        # Convert the localized datetime to UTC
-        utc_datetime = localized_datetime.astimezone(pytz.utc)
-
-        # Return the UTC datetime for storage
-        return utc_datetime
+    # Return the UTC datetime for storage
+    return utc_datetime
 
 
 def convert_utc_to_project_timezone(utc_datetime, project_id):

apiserver/requirements/base.txt

@@ -51,7 +51,7 @@ beautifulsoup4==4.12.3
 # analytics
 posthog==3.5.0
 # crypto
-cryptography==44.0.1
+cryptography==43.0.1
 # html validator
 lxml==5.2.1
 # s3

live/package.json

@@ -23,7 +23,7 @@
     "@plane/constants": "*",
     "@plane/editor": "*",
     "@plane/types": "*",
-    "@sentry/node": "^9.0.1",
+    "@sentry/node": "^8.28.0",
     "@sentry/profiling-node": "^8.28.0",
     "@tiptap/core": "2.10.4",
     "@tiptap/html": "2.11.0",

package.json

@@ -22,11 +22,7 @@
   "devDependencies": {
     "prettier": "latest",
     "prettier-plugin-tailwindcss": "^0.5.4",
-    "turbo": "^2.4.2"
-  },
-  "resolutions": {
-    "nanoid": "3.3.8",
-    "esbuild": "0.25.0"
+    "turbo": "^2.3.3"
   },
   "packageManager": "yarn@1.22.22",
   "name": "plane"

packages/constants/.prettierignore

@@ -1,5 +0,0 @@
-.next
-.turbo
-out/
-dist/
-build/

packages/constants/.prettierrc

@@ -1,5 +0,0 @@
-{
-  "printWidth": 120,
-  "tabWidth": 2,
-  "trailingComma": "es5"
-}

packages/constants/src/analytics.ts

@@ -2,11 +2,8 @@
 import { TXAxisValues, TYAxisValues } from "@plane/types";
 
 export const ANALYTICS_TABS = [
-  {
-    key: "scope_and_demand",
-    i18n_title: "workspace_analytics.tabs.scope_and_demand",
-  },
-  { key: "custom", i18n_title: "workspace_analytics.tabs.custom" },
+  { key: "scope_and_demand", title: "Scope and Demand" },
+  { key: "custom", title: "Custom Analytics" },
 ];
 
 export const ANALYTICS_X_AXIS_VALUES: { value: TXAxisValues; label: string }[] =
@@ -65,7 +62,7 @@ export const ANALYTICS_Y_AXIS_VALUES: { value: TYAxisValues; label: string }[] =
   [
     {
       value: "issue_count",
-      label: "Work item Count",
+      label: "Issue Count",
     },
     {
       value: "estimate",

packages/constants/src/chart.ts

@@ -1,2 +0,0 @@
-export const LABEL_CLASSNAME = "uppercase text-custom-text-300/60 text-sm tracking-wide";
-export const AXIS_LINE_CLASSNAME = "text-custom-text-400/70";

packages/constants/src/dashboard.ts

@@ -1,92 +0,0 @@
-// types
-import { TIssuesListTypes } from "@plane/types";
-
-export enum EDurationFilters {
-  NONE = "none",
-  TODAY = "today",
-  THIS_WEEK = "this_week",
-  THIS_MONTH = "this_month",
-  THIS_YEAR = "this_year",
-  CUSTOM = "custom",
-}
-
-// filter duration options
-export const DURATION_FILTER_OPTIONS: {
-  key: EDurationFilters;
-  label: string;
-}[] = [
-  {
-    key: EDurationFilters.NONE,
-    label: "All time",
-  },
-  {
-    key: EDurationFilters.TODAY,
-    label: "Due today",
-  },
-  {
-    key: EDurationFilters.THIS_WEEK,
-    label: "Due this week",
-  },
-  {
-    key: EDurationFilters.THIS_MONTH,
-    label: "Due this month",
-  },
-  {
-    key: EDurationFilters.THIS_YEAR,
-    label: "Due this year",
-  },
-  {
-    key: EDurationFilters.CUSTOM,
-    label: "Custom",
-  },
-];
-
-// random background colors for project cards
-export const PROJECT_BACKGROUND_COLORS = [
-  "bg-gray-500/20",
-  "bg-green-500/20",
-  "bg-red-500/20",
-  "bg-orange-500/20",
-  "bg-blue-500/20",
-  "bg-yellow-500/20",
-  "bg-pink-500/20",
-  "bg-purple-500/20",
-];
-
-// assigned and created issues widgets tabs list
-export const FILTERED_ISSUES_TABS_LIST: {
-  key: TIssuesListTypes;
-  label: string;
-}[] = [
-  {
-    key: "upcoming",
-    label: "Upcoming",
-  },
-  {
-    key: "overdue",
-    label: "Overdue",
-  },
-  {
-    key: "completed",
-    label: "Marked completed",
-  },
-];
-
-// assigned and created issues widgets tabs list
-export const UNFILTERED_ISSUES_TABS_LIST: {
-  key: TIssuesListTypes;
-  label: string;
-}[] = [
-  {
-    key: "pending",
-    label: "Pending",
-  },
-  {
-    key: "completed",
-    label: "Marked completed",
-  },
-];
-
-export type TLinkOptions = {
-  userId: string | undefined;
-};

packages/constants/src/error.ts

@@ -0,0 +1,5 @@
+export enum E_ARCHIVE_ERROR_CODES {
+  "INVALID_ARCHIVE_STATE_GROUP" = 4091,
+  "INVALID_ISSUE_START_DATE" = 4101,
+  "INVALID_ISSUE_TARGET_DATE" = 4102,
+}

packages/constants/src/event.ts

@@ -0,0 +1 @@
+export const SIDEBAR_CLICKED = "Sidenav clicked";

packages/constants/src/index.ts

@@ -1,31 +1,22 @@
 export * from "./ai";
 export * from "./analytics";
 export * from "./auth";
-export * from "./chart";
 export * from "./endpoints";
+export * from "./event";
 export * from "./file";
 export * from "./filter";
 export * from "./graph";
 export * from "./instance";
 export * from "./issue";
 export * from "./metadata";
-export * from "./notification";
 export * from "./state";
 export * from "./swr";
 export * from "./tab-indices";
 export * from "./user";
 export * from "./workspace";
 export * from "./stickies";
-export * from "./cycle";
-export * from "./module";
 export * from "./project";
 export * from "./views";
-export * from "./themes";
 export * from "./inbox";
 export * from "./profile";
 export * from "./workspace-drafts";
-export * from "./label";
-export * from "./event-tracker";
-export * from "./spreadsheet";
-export * from "./dashboard";
-export * from "./page";

packages/constants/src/metadata.ts

@@ -3,9 +3,9 @@ export const SITE_NAME =
 export const SITE_TITLE =
   "Plane | Simple, extensible, open-source project management tool.";
 export const SITE_DESCRIPTION =
-  "Open-source project management tool to manage work items, cycles, and product roadmaps easily";
+  "Open-source project management tool to manage issues, sprints, and product roadmaps with peace of mind.";
 export const SITE_KEYWORDS =
-  "software development, plan, ship, software, accelerate, code management, release management, project management, work items tracking, agile, scrum, kanban, collaboration";
+  "software development, plan, ship, software, accelerate, code management, release management, project management, issue tracking, agile, scrum, kanban, collaboration";
 export const SITE_URL = "https://app.plane.so/";
 export const TWITTER_USER_NAME =
   "Plane | Simple, extensible, open-source project management tool.";
@@ -18,6 +18,6 @@ export const SPACE_SITE_TITLE =
 export const SPACE_SITE_DESCRIPTION =
   "Plane Publish is a customer feedback management tool built on top of plane.so";
 export const SPACE_SITE_KEYWORDS =
-  "software development, customer feedback, software, accelerate, code management, release management, project management, work items tracking, agile, scrum, kanban, collaboration";
+  "software development, customer feedback, software, accelerate, code management, release management, project management, issue tracking, agile, scrum, kanban, collaboration";
 export const SPACE_SITE_URL = "https://app.plane.so/";
 export const SPACE_TWITTER_USER_NAME = "planepowers";

packages/constants/src/page.ts

@@ -1,14 +0,0 @@
-export enum EPageAccess {
-  PUBLIC = 0,
-  PRIVATE = 1,
-}
-
-export type TCreatePageModal = {
-  isOpen: boolean;
-  pageAccess?: EPageAccess;
-};
-
-export const DEFAULT_CREATE_PAGE_MODAL_DATA: TCreatePageModal = {
-  isOpen: false,
-  pageAccess: EPageAccess.PUBLIC,
-};

packages/constants/src/project.ts

@@ -1,33 +1,27 @@
 // icons
+import { Globe2, Lock, LucideIcon } from "lucide-react";
 import {
   TProjectAppliedDisplayFilterKeys,
   TProjectOrderByOptions,
 } from "@plane/types";
 
-export type TNetworkChoiceIconKey = "Lock" | "Globe2";
-
-export type TNetworkChoice = {
+export const NETWORK_CHOICES: {
   key: 0 | 2;
-  labelKey: string;
   i18n_label: string;
   description: string;
-  iconKey: TNetworkChoiceIconKey;
-};
-
-export const NETWORK_CHOICES: TNetworkChoice[] = [
+  icon: LucideIcon;
+}[] = [
   {
     key: 0,
-    labelKey: "Private",
     i18n_label: "workspace_projects.network.private.title",
     description: "workspace_projects.network.private.description", //"Accessible only by invite",
-    iconKey: "Lock",
+    icon: Lock,
   },
   {
     key: 2,
-    labelKey: "Public",
     i18n_label: "workspace_projects.network.public.title",
     description: "workspace_projects.network.public.description", //"Anyone in the workspace except Guests can join",
-    iconKey: "Globe2",
+    icon: Globe2,
   },
 ];
 

packages/constants/src/spreadsheet.ts

@@ -1 +0,0 @@
-export const SPREADSHEET_SELECT_GROUP = "spreadsheet-issues";

packages/constants/src/state.ts

@@ -5,11 +5,6 @@ export type TStateGroups =
   | "completed"
   | "cancelled";
 
-export type TDraggableData = {
-  groupKey: TStateGroups;
-  id: string;
-};
-
 export const STATE_GROUPS: {
   [key in TStateGroups]: {
     key: TStateGroups;
@@ -48,13 +43,6 @@ export const ARCHIVABLE_STATE_GROUPS = [
   STATE_GROUPS.completed.key,
   STATE_GROUPS.cancelled.key,
 ];
-export const COMPLETED_STATE_GROUPS = [STATE_GROUPS.completed.key];
-export const PENDING_STATE_GROUPS = [
-  STATE_GROUPS.backlog.key,
-  STATE_GROUPS.unstarted.key,
-  STATE_GROUPS.started.key,
-  STATE_GROUPS.cancelled.key,
-];
 
 export const PROGRESS_STATE_GROUPS_DETAILS = [
   {
@@ -78,5 +66,3 @@ export const PROGRESS_STATE_GROUPS_DETAILS = [
     color: "#A3A3A3",
   },
 ];
-
-export const DISPLAY_WORKFLOW_PRO_CTA = false;

packages/constants/src/swr.ts

@@ -6,11 +6,3 @@ export const DEFAULT_SWR_CONFIG = {
   refreshInterval: 600000,
   errorRetryCount: 3,
 };
-
-export const WEB_SWR_CONFIG = {
-  refreshWhenHidden: false,
-  revalidateIfStale: true,
-  revalidateOnFocus: true,
-  revalidateOnMount: true,
-  errorRetryCount: 3,
-};

packages/constants/src/tab-indices.ts

@@ -2,6 +2,7 @@ export const ISSUE_FORM_TAB_INDICES = [
   "name",
   "description_html",
   "feeling_lucky",
+  "ai_assistant",
   "state_id",
   "priority",
   "assignee_ids",

packages/constants/src/user.ts

@@ -36,40 +36,3 @@ export enum EUserProjectRoles {
   MEMBER = 15,
   GUEST = 5,
 }
-
-export type TUserPermissionsLevel = EUserPermissionsLevel;
-
-export enum EUserPermissions {
-  ADMIN = 20,
-  MEMBER = 15,
-  GUEST = 5,
-}
-export type TUserPermissions = EUserPermissions;
-
-export type TUserAllowedPermissionsObject = {
-  create: TUserPermissions[];
-  update: TUserPermissions[];
-  delete: TUserPermissions[];
-  read: TUserPermissions[];
-};
-export type TUserAllowedPermissions = {
-  workspace: {
-    [key: string]: Partial<TUserAllowedPermissionsObject>;
-  };
-  project: {
-    [key: string]: Partial<TUserAllowedPermissionsObject>;
-  };
-};
-
-export const USER_ALLOWED_PERMISSIONS: TUserAllowedPermissions = {
-  workspace: {
-    dashboard: {
-      read: [
-        EUserPermissions.ADMIN,
-        EUserPermissions.MEMBER,
-        EUserPermissions.GUEST,
-      ],
-    },
-  },
-  project: {},
-};

packages/constants/src/views.ts

@@ -7,8 +7,8 @@ export const VIEW_ACCESS_SPECIFIERS: {
   key: EViewAccess;
   i18n_label: string;
 }[] = [
-  { key: EViewAccess.PUBLIC, i18n_label: "common.access.public" },
-  { key: EViewAccess.PRIVATE, i18n_label: "common.access.private" },
+  { key: EViewAccess.PUBLIC, i18n_label: "project_view.access.public" },
+  { key: EViewAccess.PRIVATE, i18n_label: "project_view.access.private" },
 ];
 
 export const VIEW_SORTING_KEY_OPTIONS = [

packages/constants/src/workspace.ts

@@ -84,42 +84,48 @@ export const WORKSPACE_SETTINGS = {
     i18n_label: "workspace_settings.settings.general.title",
     href: `/settings`,
     access: [EUserWorkspaceRoles.ADMIN],
-    highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/settings/`,
+    highlight: (pathname: string, baseUrl: string) =>
+      pathname === `${baseUrl}/settings/`,
   },
   members: {
     key: "members",
     i18n_label: "workspace_settings.settings.members.title",
     href: `/settings/members`,
     access: [EUserWorkspaceRoles.ADMIN],
-    highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/settings/members/`,
+    highlight: (pathname: string, baseUrl: string) =>
+      pathname === `${baseUrl}/settings/members/`,
   },
   "billing-and-plans": {
     key: "billing-and-plans",
     i18n_label: "workspace_settings.settings.billing_and_plans.title",
     href: `/settings/billing`,
     access: [EUserWorkspaceRoles.ADMIN],
-    highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/settings/billing/`,
+    highlight: (pathname: string, baseUrl: string) =>
+      pathname === `${baseUrl}/settings/billing/`,
   },
   export: {
     key: "export",
     i18n_label: "workspace_settings.settings.exports.title",
     href: `/settings/exports`,
     access: [EUserWorkspaceRoles.ADMIN],
-    highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/settings/exports/`,
+    highlight: (pathname: string, baseUrl: string) =>
+      pathname === `${baseUrl}/settings/exports/`,
   },
   webhooks: {
     key: "webhooks",
     i18n_label: "workspace_settings.settings.webhooks.title",
     href: `/settings/webhooks`,
     access: [EUserWorkspaceRoles.ADMIN],
-    highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/settings/webhooks/`,
+    highlight: (pathname: string, baseUrl: string) =>
+      pathname === `${baseUrl}/settings/webhooks/`,
   },
   "api-tokens": {
     key: "api-tokens",
-    i18n_label: "workspace_settings.settings.api_tokens.title",
+    i18n_label: "workspace_settings.settings.webhooks.title",
     href: `/settings/api-tokens`,
     access: [EUserWorkspaceRoles.ADMIN],
-    highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/settings/api-tokens/`,
+    highlight: (pathname: string, baseUrl: string) =>
+      pathname === `${baseUrl}/settings/api-tokens/`,
   },
 };
 
@@ -250,77 +256,3 @@ export const DEFAULT_GLOBAL_VIEWS_LIST: {
     i18n_label: "default_global_view.subscribed",
   },
 ];
-
-export interface IWorkspaceSidebarNavigationItem {
-  key: string;
-  labelTranslationKey: string;
-  href: string;
-  access: EUserWorkspaceRoles[];
-}
-
-export const WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS: Record<string, IWorkspaceSidebarNavigationItem> = {
-  "your-work": {
-    key: "your_work",
-    labelTranslationKey: "your_work",
-    href: `/profile/`,
-    access: [EUserWorkspaceRoles.ADMIN, EUserWorkspaceRoles.MEMBER],
-  },
-  views: {
-    key: "views",
-    labelTranslationKey: "views",
-    href: `/workspace-views/all-issues/`,
-    access: [EUserWorkspaceRoles.ADMIN, EUserWorkspaceRoles.MEMBER, EUserWorkspaceRoles.GUEST],
-  },
-  analytics: {
-    key: "analytics",
-    labelTranslationKey: "analytics",
-    href: `/analytics/`,
-    access: [EUserWorkspaceRoles.ADMIN, EUserWorkspaceRoles.MEMBER],
-  },
-  drafts: {
-    key: "drafts",
-    labelTranslationKey: "drafts",
-    href: `/drafts/`,
-    access: [EUserWorkspaceRoles.ADMIN, EUserWorkspaceRoles.MEMBER],
-  },
-  archives: {
-    key: "archives",
-    labelTranslationKey: "archives",
-    href: `/projects/archives/`,
-    access: [EUserWorkspaceRoles.ADMIN, EUserWorkspaceRoles.MEMBER],
-  },
-};
-export const WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS_LINKS: IWorkspaceSidebarNavigationItem[] = [
-  WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS["views"],
-  WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS["analytics"],
-  WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS["your-work"],
-  WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS["drafts"],
-  WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS["archives"],
-];
-
-export const WORKSPACE_SIDEBAR_STATIC_NAVIGATION_ITEMS: Record<string, IWorkspaceSidebarNavigationItem> = {
-  home: {
-    key: "home",
-    labelTranslationKey: "home.title",
-    href: `/`,
-    access: [EUserWorkspaceRoles.ADMIN, EUserWorkspaceRoles.MEMBER, EUserWorkspaceRoles.GUEST],
-  },
-  inbox: {
-    key: "inbox",
-    labelTranslationKey: "notification.label",
-    href: `/notifications/`,
-    access: [EUserWorkspaceRoles.ADMIN, EUserWorkspaceRoles.MEMBER, EUserWorkspaceRoles.GUEST],
-  },
-  projects: {
-    key: "projects",
-    labelTranslationKey: "projects",
-    href: `/projects/`,
-    access: [EUserWorkspaceRoles.ADMIN, EUserWorkspaceRoles.MEMBER, EUserWorkspaceRoles.GUEST],
-  },
-};
-
-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["projects"],
-];

packages/editor/package.json

@@ -61,7 +61,7 @@
     "jsx-dom-cjs": "^8.0.3",
     "linkifyjs": "^4.1.3",
     "lowlight": "^3.0.0",
-    "lucide-react": "^0.469.0",
+    "lucide-react": "^0.378.0",
     "prosemirror-codemark": "^0.4.2",
     "prosemirror-utils": "^1.2.2",
     "tippy.js": "^6.3.7",

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";
@@ -17,7 +16,6 @@ const CollaborativeDocumentEditor = (props: ICollaborativeDocumentEditor) => {
   const {
     onTransaction,
     aiHandler,
-    bubbleMenuEnabled = true,
     containerClassName,
     disabledExtensions,
     displayConfig = DEFAULT_DISPLAY_CONFIG,
@@ -36,7 +34,7 @@ const CollaborativeDocumentEditor = (props: ICollaborativeDocumentEditor) => {
     user,
   } = props;
 
-  const extensions: Extensions = [];
+  const extensions = [];
   if (embedHandler?.issue) {
     extensions.push(
       IssueWidget({
@@ -77,9 +75,8 @@ const CollaborativeDocumentEditor = (props: ICollaborativeDocumentEditor) => {
 
   return (
     <PageRenderer
-      aiHandler={aiHandler}
-      bubbleMenuEnabled={bubbleMenuEnabled}
       displayConfig={displayConfig}
+      aiHandler={aiHandler}
       editor={editor}
       editorContainerClassName={editorContainerClassNames}
       id={id}

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

@@ -15,13 +15,12 @@ import { Editor, ReactRenderer } from "@tiptap/react";
 // components
 import { EditorContainer, EditorContentWrapper } from "@/components/editors";
 import { LinkView, LinkViewProps } from "@/components/links";
-import { AIFeaturesMenu, BlockMenu, EditorBubbleMenu } from "@/components/menus";
+import { AIFeaturesMenu, BlockMenu } from "@/components/menus";
 // types
 import { TAIHandler, TDisplayConfig } from "@/types";
 
 type IPageRenderer = {
   aiHandler?: TAIHandler;
-  bubbleMenuEnabled: boolean;
   displayConfig: TDisplayConfig;
   editor: Editor;
   editorContainerClassName: string;
@@ -30,7 +29,7 @@ type IPageRenderer = {
 };
 
 export const PageRenderer = (props: IPageRenderer) => {
-  const { aiHandler, bubbleMenuEnabled, displayConfig, editor, editorContainerClassName, id, tabIndex } = props;
+  const { aiHandler, displayConfig, editor, editorContainerClassName, id, tabIndex } = props;
   // states
   const [linkViewProps, setLinkViewProps] = useState<LinkViewProps>();
   const [isOpen, setIsOpen] = useState(false);
@@ -142,7 +141,6 @@ export const PageRenderer = (props: IPageRenderer) => {
           <EditorContentWrapper editor={editor} id={id} tabIndex={tabIndex} />
           {editor.isEditable && (
             <div>
-              {bubbleMenuEnabled && <EditorBubbleMenu editor={editor} />}
               <BlockMenu editor={editor} />
               <AIFeaturesMenu menu={aiHandler?.menu} />
             </div>

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({
@@ -76,7 +69,6 @@ const DocumentReadOnlyEditor = (props: IDocumentReadOnlyEditor) => {
 
   return (
     <PageRenderer
-      bubbleMenuEnabled={false}
       displayConfig={displayConfig}
       editor={editor}
       editorContainerClassName={editorContainerClassName}

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/link-selector.tsx

@@ -1,6 +1,6 @@
+import { Dispatch, FC, SetStateAction, useCallback, useEffect, useRef } from "react";
 import { Editor } from "@tiptap/core";
-import { Check, Link, Trash2 } from "lucide-react";
-import { Dispatch, FC, SetStateAction, useCallback, useRef, useState } from "react";
+import { Check, Link, Trash } from "lucide-react";
 // plane utils
 import { cn } from "@plane/utils";
 // helpers
@@ -15,26 +15,22 @@ type Props = {
 
 export const BubbleMenuLinkSelector: FC<Props> = (props) => {
   const { editor, isOpen, setIsOpen } = props;
-  // states
-  const [error, setError] = useState(false);
   // refs
   const inputRef = useRef<HTMLInputElement>(null);
 
-  const handleLinkSubmit = useCallback(() => {
+  const onLinkSubmit = useCallback(() => {
     const input = inputRef.current;
-    if (!input) return;
-    let url = input.value;
-    if (!url) return;
-    if (!url.startsWith("http")) url = `http://${url}`;
-    if (isValidHttpUrl(url)) {
+    const url = input?.value;
+    if (url && isValidHttpUrl(url)) {
       setLinkEditor(editor, url);
       setIsOpen(false);
-      setError(false);
-    } else {
-      setError(true);
     }
   }, [editor, inputRef, setIsOpen]);
 
+  useEffect(() => {
+    inputRef.current && inputRef.current?.focus();
+  });
+
   return (
     <div className="relative h-full">
       <button
@@ -51,62 +47,52 @@ export const BubbleMenuLinkSelector: FC<Props> = (props) => {
           e.stopPropagation();
         }}
       >
-        Link
+        <span>Link</span>
         <Link className="flex-shrink-0 size-3" />
       </button>
       {isOpen && (
-        <div className="fixed top-full z-[99999] mt-1 w-60 animate-in fade-in slide-in-from-top-1 rounded bg-custom-background-100 shadow-custom-shadow-rg">
-          <div
-            className={cn("flex rounded border border-custom-border-300 transition-colors", {
-              "border-red-500": error,
-            })}
-          >
-            <input
-              ref={inputRef}
-              type="url"
-              placeholder="Enter or paste a link"
-              onClick={(e) => e.stopPropagation()}
-              className="flex-1 border-r border-custom-border-300 bg-custom-background-100 py-2 px-1.5 text-xs outline-none placeholder:text-custom-text-400 rounded"
-              defaultValue={editor.getAttributes("link").href || ""}
-              onKeyDown={(e) => {
-                setError(false);
-                if (e.key === "Enter") {
-                  e.preventDefault();
-                  handleLinkSubmit();
-                }
+        <div
+          className="dow-xl fixed top-full z-[99999] mt-1 flex w-60 overflow-hidden rounded border border-custom-border-300 bg-custom-background-100 animate-in fade-in slide-in-from-top-1"
+          onKeyDown={(e) => {
+            if (e.key === "Enter") {
+              e.preventDefault();
+              onLinkSubmit();
+            }
+          }}
+        >
+          <input
+            ref={inputRef}
+            type="url"
+            placeholder="Paste a link"
+            onClick={(e) => {
+              e.stopPropagation();
+            }}
+            className="flex-1 border-r border-custom-border-300 bg-custom-background-100 p-1 text-sm outline-none placeholder:text-custom-text-400"
+            defaultValue={editor.getAttributes("link").href || ""}
+          />
+          {editor.getAttributes("link").href ? (
+            <button
+              type="button"
+              className="flex items-center rounded-sm p-1 text-red-600 transition-all hover:bg-red-100 dark:hover:bg-red-800"
+              onClick={(e) => {
+                unsetLinkEditor(editor);
+                setIsOpen(false);
+                e.stopPropagation();
               }}
-              onFocus={() => setError(false)}
-              autoFocus
-            />
-            {editor.getAttributes("link").href ? (
-              <button
-                type="button"
-                className="grid place-items-center rounded-sm p-1 text-red-500 hover:bg-red-500/20 transition-all"
-                onClick={(e) => {
-                  unsetLinkEditor(editor);
-                  setIsOpen(false);
-                  e.stopPropagation();
-                }}
-              >
-                <Trash2 className="size-4" />
-              </button>
-            ) : (
-              <button
-                type="button"
-                className="h-full aspect-square grid place-items-center p-1 rounded-sm text-custom-text-300 hover:bg-custom-background-80 transition-all"
-                onClick={(e) => {
-                  e.stopPropagation();
-                  handleLinkSubmit();
-                }}
-              >
-                <Check className="size-4" />
-              </button>
-            )}
-          </div>
-          {error && (
-            <p className="text-xs text-red-500 my-1 px-2 pointer-events-none animate-in fade-in slide-in-from-top-0">
-              Please enter a valid URL
-            </p>
+            >
+              <Trash className="h-4 w-4" />
+            </button>
+          ) : (
+            <button
+              className="flex items-center rounded-sm p-1 text-custom-text-300 transition-all hover:bg-custom-background-90"
+              type="button"
+              onClick={(e) => {
+                onLinkSubmit();
+                e.stopPropagation();
+              }}
+            >
+              <Check className="h-4 w-4" />
+            </button>
           )}
         </div>
       )}

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/extensions/custom-color.ts

@@ -93,21 +93,6 @@ export const CustomColorExtension = Mark.create({
     };
   },
 
-  addStorage() {
-    return {
-      markdown: {
-        serialize: {
-          open: "",
-          close: "",
-          mixable: true,
-          expelEnclosingWhitespace: true,
-        },
-      },
-    };
-  },
-
-  // @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-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/custom-list-keymap/list-keymap.ts

@@ -51,10 +51,6 @@ export const ListKeymap = ({ tabIndex }: { tabIndex?: number }) =>
           } else if (this.editor.commands.liftListItem("taskItem")) {
             return true;
           }
-          // if tabIndex is set, we don't want to handle Tab key
-          if (tabIndex !== undefined && tabIndex !== null) {
-            return false;
-          }
           return true;
         },
         Delete: ({ editor }) => {

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

@@ -32,10 +32,10 @@ import {
 } 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[];
@@ -148,7 +148,7 @@ 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}`;
 

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({