chore: changed the error message

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

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

.github/workflows/build-branch.yml

@@ -25,10 +25,6 @@ on:
         required: false
         default: false
         type: boolean
-  push:
-    branches:
-      - preview
-      - canary
 
 env:
   TARGET_BRANCH: ${{ github.ref_name }}
@@ -299,6 +295,31 @@ jobs:
           buildx-platforms: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }}
           buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
 
+  attach_assets_to_build:
+    if: ${{ needs.branch_build_setup.outputs.build_type == 'Release' }}
+    name: Attach Assets to Release
+    runs-on: ubuntu-22.04
+    needs: [branch_build_setup]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Update Assets
+        run: |
+          cp ./deploy/selfhost/install.sh deploy/selfhost/setup.sh
+
+      - name: Attach Assets
+        id: attach_assets
+        uses: actions/upload-artifact@v4
+        with:
+          name: selfhost-assets
+          retention-days: 2
+          path: |
+            ${{ github.workspace }}/deploy/selfhost/setup.sh
+            ${{ github.workspace }}/deploy/selfhost/restore.sh
+            ${{ github.workspace }}/deploy/selfhost/docker-compose.yml
+            ${{ github.workspace }}/deploy/selfhost/variables.env
+
   publish_release:
     if: ${{ needs.branch_build_setup.outputs.build_type == 'Release' }}
     name: Build Release
@@ -312,6 +333,7 @@ jobs:
         branch_build_push_live,
         branch_build_push_apiserver,
         branch_build_push_proxy,
+        attach_assets_to_build,
       ]
     env:
       REL_VERSION: ${{ needs.branch_build_setup.outputs.release_version }}
@@ -322,8 +344,6 @@ jobs:
       - name: Update Assets
         run: |
           cp ./deploy/selfhost/install.sh deploy/selfhost/setup.sh
-          sed -i 's/${APP_RELEASE:-stable}/${APP_RELEASE:-'${REL_VERSION}'}/g' deploy/selfhost/docker-compose.yml
-          sed -i 's/APP_RELEASE=stable/APP_RELEASE='${REL_VERSION}'/g' deploy/selfhost/variables.env
 
       - name: Create Release
         id: create_release
@@ -338,7 +358,6 @@ jobs:
           generate_release_notes: true
           files: |
             ${{ github.workspace }}/deploy/selfhost/setup.sh
-            ${{ github.workspace }}/deploy/selfhost/swarm.sh
             ${{ github.workspace }}/deploy/selfhost/restore.sh
             ${{ github.workspace }}/deploy/selfhost/docker-compose.yml
             ${{ github.workspace }}/deploy/selfhost/variables.env

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

@@ -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

.github/workflows/feature-deployment.yml

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

.github/workflows/sync-repo.yml

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

CONTRIBUTING.md

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

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

@@ -1,6 +1,6 @@
 {
   "name": "admin",
-  "version": "0.25.0",
+  "version": "0.24.1",
   "private": true,
   "scripts": {
     "dev": "turbo run develop",
@@ -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/package.json

@@ -1,4 +1,4 @@
 {
   "name": "plane-api",
-  "version": "0.25.0"
+  "version": "0.24.1"
 }

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

@@ -32,9 +32,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 +60,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 +91,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 +107,6 @@ class WorkSpaceMemberInviteSerializer(BaseSerializer):
             "responded_at",
             "created_at",
             "updated_at",
-            "invite_link",
         ]
 
 
@@ -149,42 +147,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()
 

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

@@ -116,8 +116,6 @@ from .issue.base import (
     IssuePaginatedViewSet,
     IssueDetailEndpoint,
     IssueBulkUpdateDateEndpoint,
-    IssueMetaEndpoint,
-    IssueDetailIdentifierEndpoint,
 )
 
 from .issue.activity import IssueActivityEndpoint

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

@@ -134,11 +134,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 +227,7 @@ class CycleViewSet(BaseViewSet):
                 "is_favorite",
                 "total_issues",
                 "completed_issues",
-                "cancelled_issues",
+                "pending_issues",
                 "assignee_ids",
                 "status",
                 "version",
@@ -259,7 +259,7 @@ class CycleViewSet(BaseViewSet):
             # meta fields
             "is_favorite",
             "total_issues",
-            "cancelled_issues",
+            "pending_issues",
             "completed_issues",
             "assignee_ids",
             "status",

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

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

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

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

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

@@ -547,7 +547,7 @@ class IssueViewSet(BaseViewSet):
             )
 
         """
-        if the role is guest and guest_view_all_features is false and owned by is not
+        if the role is guest and guest_view_all_features is false and owned by is not 
         the requesting user then dont show the issue
         """
 
@@ -1096,192 +1096,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 strict_str_to_int(self, s):
-        if not s.isdigit() and not (s.startswith('-') and s[1:].isdigit()):
-            raise ValueError("Invalid integer string")
-        return int(s)
-
-    def get(self, request, slug, project_identifier, issue_identifier):
-
-        # Check if the issue identifier is a valid integer
-        try:
-            issue_identifier = self.strict_str_to_int(issue_identifier)
-        except ValueError:
-            return Response(
-                {"error": "Invalid issue identifier"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        # Fetch the project
-        project = Project.objects.get(
-            identifier__iexact=project_identifier,
-            workspace__slug=slug,
-        )
-
-        # 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/issue.py

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

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

@@ -40,7 +40,7 @@ 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
@@ -597,16 +597,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/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,
@@ -136,6 +135,10 @@ class WorkSpaceViewSet(BaseViewSet):
                     {"slug": "The workspace with the slug already exists"},
                     status=status.HTTP_410_GONE,
                 )
+            return Response(
+                {"error": "The payload is not valid"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
 
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
     def list(self, request, *args, **kwargs):
@@ -167,9 +170,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 +186,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

@@ -30,6 +30,7 @@ class WorkspaceUserPreferenceViewSet(BaseAPIView):
         keys = [
             key
             for key, _ in WorkspaceUserPreference.UserPreferenceKeys.choices
+            if key not in ["projects"]
         ]
 
         for preference in keys:
@@ -39,28 +40,20 @@ class WorkspaceUserPreferenceViewSet(BaseAPIView):
                 preference = WorkspaceUserPreference.objects.bulk_create(
                     [
                         WorkspaceUserPreference(
-                            key=key, user=request.user, workspace=workspace, sort_order=(65535 + (i*10000))
+                            key=key, user=request.user, workspace=workspace
                         )
-                        for i, key in enumerate(create_preference_keys)
+                        for key in create_preference_keys
                     ],
                     batch_size=10,
                     ignore_conflicts=True,
                 )
 
-        preferences = WorkspaceUserPreference.objects.filter(
+        preference = 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,
+            preference.values("key", "is_pinned", "sort_order"),
             status=status.HTTP_200_OK,
         )
 

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

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

apiserver/plane/bgtasks/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

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

apiserver/plane/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/db/migrations/0092_alter_deprecateddashboardwidget_unique_together_and_more.py

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

apiserver/plane/db/models/workspace.py

@@ -391,13 +391,13 @@ class WorkspaceHomePreference(BaseModel):
 class WorkspaceUserPreference(BaseModel):
     """Preference for the workspace for a user"""
 
-    class UserPreferenceKeys(models.TextChoices):        
-        VIEWS = "views", "Views"
-        ACTIVE_CYCLES = "active_cycles", "Active Cycles"
+    class UserPreferenceKeys(models.TextChoices):
+        PROJECTS = "projects", "Projects"
         ANALYTICS = "analytics", "Analytics"
-        DRAFTS = "drafts", "Drafts"
+        CYCLES = "cycles", "Cycles"
+        VIEWS = "views", "Views"
         YOUR_WORK = "your_work", "Your Work"
-        ARCHIVES = "archives", "Archives"
+
 
     workspace = models.ForeignKey(
         "db.Workspace",

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

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

apiserver/plane/utils/valid_uuid.py

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

apiserver/requirements/base.txt

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

apiserver/requirements/local.txt

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

deploy/selfhost/README.md

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

deploy/selfhost/docker-compose.yml

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

deploy/selfhost/install.sh

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

deploy/selfhost/swarm.sh

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

deploy/selfhost/variables.env

@@ -5,9 +5,6 @@ WEB_REPLICAS=1
 SPACE_REPLICAS=1
 ADMIN_REPLICAS=1
 API_REPLICAS=1
-WORKER_REPLICAS=1
-BEAT_WORKER_REPLICAS=1
-LIVE_REPLICAS=1
 
 NGINX_PORT=80
 WEB_URL=http://${APP_DOMAIN}

live/package.json

@@ -1,6 +1,6 @@
 {
   "name": "live",
-  "version": "0.25.0",
+  "version": "0.24.1",
   "description": "",
   "main": "./src/server.ts",
   "private": true,
@@ -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",

nginx/Dockerfile

@@ -1,9 +1,9 @@
 FROM nginx:1.25.0-alpine
 
 RUN rm /etc/nginx/conf.d/default.conf
-COPY nginx/nginx.conf.template /etc/nginx/nginx.conf.template
+COPY nginx.conf.template /etc/nginx/nginx.conf.template
 
-COPY nginx/env.sh /docker-entrypoint.sh
+COPY ./env.sh /docker-entrypoint.sh
 
 RUN chmod +x /docker-entrypoint.sh
 # Update all environment variables

nginx/Dockerfile.dev

@@ -1,9 +1,9 @@
 FROM nginx:1.25.0-alpine
 
 RUN rm /etc/nginx/conf.d/default.conf
-COPY nginx/nginx.conf.dev /etc/nginx/nginx.conf.template
+COPY nginx.conf.dev /etc/nginx/nginx.conf.template
 
-COPY nginx/env.sh /docker-entrypoint.sh
+COPY ./env.sh /docker-entrypoint.sh
 
 RUN chmod +x /docker-entrypoint.sh
 # Update all environment variables

package.json

@@ -1,6 +1,6 @@
 {
   "repository": "https://github.com/makeplane/plane.git",
-  "version": "0.25.0",
+  "version": "0.24.1",
   "license": "AGPL-3.0",
   "private": true,
   "workspaces": [
@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/constants",
-  "version": "0.25.0",
+  "version": "0.24.1",
   "private": true,
   "main": "./src/index.ts"
 }

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

@@ -2,56 +2,3 @@ export enum E_SORT_ORDER {
   ASC = "asc",
   DESC = "desc",
 }
-export const DATE_AFTER_FILTER_OPTIONS = [
-  {
-    name: "1 week from now",
-    value: "1_weeks;after;fromnow",
-  },
-  {
-    name: "2 weeks from now",
-    value: "2_weeks;after;fromnow",
-  },
-  {
-    name: "1 month from now",
-    value: "1_months;after;fromnow",
-  },
-  {
-    name: "2 months from now",
-    value: "2_months;after;fromnow",
-  },
-];
-
-export const DATE_BEFORE_FILTER_OPTIONS = [
-  {
-    name: "1 week ago",
-    value: "1_weeks;before;fromnow",
-  },
-  {
-    name: "2 weeks ago",
-    value: "2_weeks;before;fromnow",
-  },
-  {
-    name: "1 month ago",
-    i18n_name: "date_filters.1_month_ago",
-    value: "1_months;before;fromnow",
-  },
-];
-
-export const PROJECT_CREATED_AT_FILTER_OPTIONS = [
-  {
-    name: "Today",
-    value: "today;custom;custom",
-  },
-  {
-    name: "Yesterday",
-    value: "yesterday;custom;custom",
-  },
-  {
-    name: "Last 7 days",
-    value: "last_7_days;custom;custom",
-  },
-  {
-    name: "Last 30 days",
-    value: "last_30_days;custom;custom",
-  },
-];

packages/constants/src/inbox.ts

@@ -1,91 +0,0 @@
-import { TInboxDuplicateIssueDetails, TIssue } from "@plane/types";
-
-export enum EInboxIssueCurrentTab {
-	OPEN = "open",
-	CLOSED = "closed",
-}
-
-export enum EInboxIssueStatus {
-	PENDING = -2,
-	DECLINED = -1,
-	SNOOZED = 0,
-	ACCEPTED = 1,
-	DUPLICATE = 2,
-}
-
-export type TInboxIssueCurrentTab = EInboxIssueCurrentTab;
-export type TInboxIssueStatus = EInboxIssueStatus;
-export type TInboxIssue = {
-	id: string;
-	status: TInboxIssueStatus;
-	snoozed_till: Date | null;
-	duplicate_to: string | undefined;
-	source: string;
-	issue: TIssue;
-	created_by: string;
-	duplicate_issue_detail: TInboxDuplicateIssueDetails | undefined;
-};
-
-export const INBOX_STATUS: {
-	key: string;
-	status: TInboxIssueStatus;
-	i18n_title: string;
-	i18n_description: () => string;
-}[] = [
-	{
-		key: "pending",
-		i18n_title: "inbox_issue.status.pending.title",
-		status: EInboxIssueStatus.PENDING,
-		i18n_description: () => `inbox_issue.status.pending.description`,
-	},
-	{
-		key: "declined",
-		i18n_title: "inbox_issue.status.declined.title",
-		status: EInboxIssueStatus.DECLINED,
-		i18n_description: () => `inbox_issue.status.declined.description`,
-	},
-	{
-		key: "snoozed",
-		i18n_title: "inbox_issue.status.snoozed.title",
-		status: EInboxIssueStatus.SNOOZED,
-		i18n_description: () => `inbox_issue.status.snoozed.description`,
-	},
-	{
-		key: "accepted",
-		i18n_title: "inbox_issue.status.accepted.title",
-		status: EInboxIssueStatus.ACCEPTED,
-		i18n_description: () => `inbox_issue.status.accepted.description`,
-	},
-	{
-		key: "duplicate",
-		i18n_title: "inbox_issue.status.duplicate.title",
-		status: EInboxIssueStatus.DUPLICATE,
-		i18n_description: () => `inbox_issue.status.duplicate.description`,
-	},
-];
-
-export const INBOX_ISSUE_ORDER_BY_OPTIONS = [
-	{
-		key: "issue__created_at",
-		i18n_label: "inbox_issue.order_by.created_at",
-	},
-	{
-		key: "issue__updated_at",
-		i18n_label: "inbox_issue.order_by.updated_at",
-	},
-	{
-		key: "issue__sequence_id",
-		i18n_label: "inbox_issue.order_by.id",
-	},
-];
-
-export const INBOX_ISSUE_SORT_BY_OPTIONS = [
-	{
-		key: "asc",
-		i18n_label: "common.sort.asc",
-	},
-	{
-		key: "desc",
-		i18n_label: "common.sort.desc",
-	},
-];

packages/constants/src/index.ts

@@ -1,31 +1,16 @@
 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/issue.ts

@@ -0,0 +1,185 @@
+import { List, Kanban } from "lucide-react";
+
+export const ALL_ISSUES = "All Issues";
+
+export type TIssuePriorities = "urgent" | "high" | "medium" | "low" | "none";
+
+export type TIssueFilterKeys = "priority" | "state" | "labels";
+
+export type TIssueLayout =
+  | "list"
+  | "kanban"
+  | "calendar"
+  | "spreadsheet"
+  | "gantt";
+
+export type TIssueFilterPriorityObject = {
+  key: TIssuePriorities;
+  title: string;
+  className: string;
+  icon: string;
+};
+
+export enum EIssueGroupByToServerOptions {
+  "state" = "state_id",
+  "priority" = "priority",
+  "labels" = "labels__id",
+  "state_detail.group" = "state__group",
+  "assignees" = "assignees__id",
+  "cycle" = "cycle_id",
+  "module" = "issue_module__module_id",
+  "target_date" = "target_date",
+  "project" = "project_id",
+  "created_by" = "created_by",
+  "team_project" = "project_id",
+}
+
+export enum EIssueGroupBYServerToProperty {
+  "state_id" = "state_id",
+  "priority" = "priority",
+  "labels__id" = "label_ids",
+  "state__group" = "state__group",
+  "assignees__id" = "assignee_ids",
+  "cycle_id" = "cycle_id",
+  "issue_module__module_id" = "module_ids",
+  "target_date" = "target_date",
+  "project_id" = "project_id",
+  "created_by" = "created_by",
+}
+
+export enum EServerGroupByToFilterOptions {
+  "state_id" = "state",
+  "priority" = "priority",
+  "labels__id" = "labels",
+  "state__group" = "state_group",
+  "assignees__id" = "assignees",
+  "cycle_id" = "cycle",
+  "issue_module__module_id" = "module",
+  "target_date" = "target_date",
+  "project_id" = "project",
+  "created_by" = "created_by",
+}
+
+export enum EIssueServiceType {
+  ISSUES = "issues",
+  EPICS = "epics",
+}
+
+export enum EIssueLayoutTypes {
+  LIST = "list",
+  KANBAN = "kanban",
+  CALENDAR = "calendar",
+  GANTT = "gantt_chart",
+  SPREADSHEET = "spreadsheet",
+}
+
+export enum EIssuesStoreType {
+  GLOBAL = "GLOBAL",
+  PROFILE = "PROFILE",
+  TEAM = "TEAM",
+  PROJECT = "PROJECT",
+  CYCLE = "CYCLE",
+  MODULE = "MODULE",
+  TEAM_VIEW = "TEAM_VIEW",
+  PROJECT_VIEW = "PROJECT_VIEW",
+  ARCHIVED = "ARCHIVED",
+  DRAFT = "DRAFT",
+  DEFAULT = "DEFAULT",
+  WORKSPACE_DRAFT = "WORKSPACE_DRAFT",
+  EPIC = "EPIC",
+}
+
+export enum EIssueFilterType {
+  FILTERS = "filters",
+  DISPLAY_FILTERS = "display_filters",
+  DISPLAY_PROPERTIES = "display_properties",
+  KANBAN_FILTERS = "kanban_filters",
+}
+
+export enum EIssueCommentAccessSpecifier {
+  EXTERNAL = "EXTERNAL",
+  INTERNAL = "INTERNAL",
+}
+
+export enum EIssueListRow {
+  HEADER = "HEADER",
+  ISSUE = "ISSUE",
+  NO_ISSUES = "NO_ISSUES",
+  QUICK_ADD = "QUICK_ADD",
+}
+
+export const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: {
+  [key in TIssueLayout]: Record<"filters", TIssueFilterKeys[]>;
+} = {
+  list: {
+    filters: ["priority", "state", "labels"],
+  },
+  kanban: {
+    filters: ["priority", "state", "labels"],
+  },
+  calendar: {
+    filters: ["priority", "state", "labels"],
+  },
+  spreadsheet: {
+    filters: ["priority", "state", "labels"],
+  },
+  gantt: {
+    filters: ["priority", "state", "labels"],
+  },
+};
+
+export const ISSUE_PRIORITIES: {
+  key: TIssuePriorities;
+  title: string;
+}[] = [
+  { key: "urgent", title: "Urgent" },
+  { key: "high", title: "High" },
+  { key: "medium", title: "Medium" },
+  { key: "low", title: "Low" },
+  { key: "none", title: "None" },
+];
+
+export const ISSUE_PRIORITY_FILTERS: TIssueFilterPriorityObject[] = [
+  {
+    key: "urgent",
+    title: "Urgent",
+    className: "bg-red-500 border-red-500 text-white",
+    icon: "error",
+  },
+  {
+    key: "high",
+    title: "High",
+    className: "text-orange-500 border-custom-border-300",
+    icon: "signal_cellular_alt",
+  },
+  {
+    key: "medium",
+    title: "Medium",
+    className: "text-yellow-500 border-custom-border-300",
+    icon: "signal_cellular_alt_2_bar",
+  },
+  {
+    key: "low",
+    title: "Low",
+    className: "text-green-500 border-custom-border-300",
+    icon: "signal_cellular_alt_1_bar",
+  },
+  {
+    key: "none",
+    title: "None",
+    className: "text-gray-500 border-custom-border-300",
+    icon: "block",
+  },
+];
+
+export const SITES_ISSUE_LAYOUTS: {
+  key: TIssueLayout;
+  title: string;
+  icon: any;
+}[] = [
+  { key: "list", title: "List", icon: List },
+  { key: "kanban", title: "Kanban", icon: Kanban },
+  // { key: "calendar", title: "Calendar", icon: Calendar },
+  // { key: "spreadsheet", title: "Spreadsheet", icon: Sheet },
+  // { key: "gantt", title: "Gantt chart", icon: GanttChartSquare },
+];

packages/constants/src/issue/common.ts

@@ -1,217 +0,0 @@
-import {
-  TIssueGroupByOptions,
-  TIssueOrderByOptions,
-  IIssueDisplayProperties,
-} from "@plane/types";
-
-export const ALL_ISSUES = "All Issues";
-
-export type TIssuePriorities = "urgent" | "high" | "medium" | "low" | "none";
-
-export type TIssueFilterPriorityObject = {
-  key: TIssuePriorities;
-  titleTranslationKey: string;
-  className: string;
-  icon: string;
-};
-
-export enum EIssueGroupByToServerOptions {
-  "state" = "state_id",
-  "priority" = "priority",
-  "labels" = "labels__id",
-  "state_detail.group" = "state__group",
-  "assignees" = "assignees__id",
-  "cycle" = "cycle_id",
-  "module" = "issue_module__module_id",
-  "target_date" = "target_date",
-  "project" = "project_id",
-  "created_by" = "created_by",
-  "team_project" = "project_id",
-}
-
-export enum EIssueGroupBYServerToProperty {
-  "state_id" = "state_id",
-  "priority" = "priority",
-  "labels__id" = "label_ids",
-  "state__group" = "state__group",
-  "assignees__id" = "assignee_ids",
-  "cycle_id" = "cycle_id",
-  "issue_module__module_id" = "module_ids",
-  "target_date" = "target_date",
-  "project_id" = "project_id",
-  "created_by" = "created_by",
-}
-
-export enum EIssueServiceType {
-  ISSUES = "issues",
-  EPICS = "epics",
-}
-
-export enum EIssuesStoreType {
-  GLOBAL = "GLOBAL",
-  PROFILE = "PROFILE",
-  TEAM = "TEAM",
-  PROJECT = "PROJECT",
-  CYCLE = "CYCLE",
-  MODULE = "MODULE",
-  TEAM_VIEW = "TEAM_VIEW",
-  PROJECT_VIEW = "PROJECT_VIEW",
-  ARCHIVED = "ARCHIVED",
-  DRAFT = "DRAFT",
-  DEFAULT = "DEFAULT",
-  WORKSPACE_DRAFT = "WORKSPACE_DRAFT",
-  EPIC = "EPIC",
-}
-
-export enum EIssueCommentAccessSpecifier {
-  EXTERNAL = "EXTERNAL",
-  INTERNAL = "INTERNAL",
-}
-
-export enum EIssueListRow {
-  HEADER = "HEADER",
-  ISSUE = "ISSUE",
-  NO_ISSUES = "NO_ISSUES",
-  QUICK_ADD = "QUICK_ADD",
-}
-
-export const ISSUE_PRIORITIES: {
-  key: TIssuePriorities;
-  title: string;
-}[] = [
-  {
-    key: "urgent",
-    title: "Urgent",
-  },
-  {
-    key: "high",
-    title: "High",
-  },
-  {
-    key: "medium",
-    title: "Medium",
-  },
-  {
-    key: "low",
-    title: "Low",
-  },
-  {
-    key: "none",
-    title: "None",
-  },
-];
-
-export const DRAG_ALLOWED_GROUPS: TIssueGroupByOptions[] = [
-  "state",
-  "priority",
-  "assignees",
-  "labels",
-  "module",
-  "cycle",
-];
-
-export type TCreateModalStoreTypes =
-  | EIssuesStoreType.TEAM
-  | EIssuesStoreType.PROJECT
-  | EIssuesStoreType.TEAM_VIEW
-  | EIssuesStoreType.PROJECT_VIEW
-  | EIssuesStoreType.PROFILE
-  | EIssuesStoreType.CYCLE
-  | EIssuesStoreType.MODULE
-  | EIssuesStoreType.EPIC;
-
-export const ISSUE_GROUP_BY_OPTIONS: {
-  key: TIssueGroupByOptions;
-  titleTranslationKey: string;
-}[] = [
-  { key: "state", titleTranslationKey: "common.states" },
-  { key: "state_detail.group", titleTranslationKey: "common.state_groups" },
-  { key: "priority", titleTranslationKey: "common.priority" },
-  { key: "team_project", titleTranslationKey: "common.team_project" }, // required this on team issues
-  { key: "project", titleTranslationKey: "common.project" }, // required this on my issues
-  { key: "cycle", titleTranslationKey: "common.cycle" }, // required this on my issues
-  { key: "module", titleTranslationKey: "common.module" }, // required this on my issues
-  { key: "labels", titleTranslationKey: "common.labels" },
-  { key: "assignees", titleTranslationKey: "common.assignees" },
-  { key: "created_by", titleTranslationKey: "common.created_by" },
-  { key: null, titleTranslationKey: "common.none" },
-];
-
-export const ISSUE_ORDER_BY_OPTIONS: {
-  key: TIssueOrderByOptions;
-  titleTranslationKey: string;
-}[] = [
-  { key: "sort_order", titleTranslationKey: "common.order_by.manual" },
-  { key: "-created_at", titleTranslationKey: "common.order_by.last_created" },
-  { key: "-updated_at", titleTranslationKey: "common.order_by.last_updated" },
-  { key: "start_date", titleTranslationKey: "common.order_by.start_date" },
-  { key: "target_date", titleTranslationKey: "common.order_by.due_date" },
-  { key: "-priority", titleTranslationKey: "common.priority" },
-];
-
-export const ISSUE_DISPLAY_PROPERTIES_KEYS: (keyof IIssueDisplayProperties)[] =
-  [
-    "assignee",
-    "start_date",
-    "due_date",
-    "labels",
-    "key",
-    "priority",
-    "state",
-    "sub_issue_count",
-    "link",
-    "attachment_count",
-    "estimate",
-    "created_on",
-    "updated_on",
-    "modules",
-    "cycle",
-    "issue_type",
-  ];
-
-export const ISSUE_DISPLAY_PROPERTIES: {
-  key: keyof IIssueDisplayProperties;
-  titleTranslationKey: string;
-}[] = [
-  {
-    key: "key",
-    titleTranslationKey: "issue.display.properties.id",
-  },
-  {
-    key: "issue_type",
-    titleTranslationKey: "issue.display.properties.issue_type",
-  },
-  {
-    key: "assignee",
-    titleTranslationKey: "common.assignee",
-  },
-  {
-    key: "start_date",
-    titleTranslationKey: "common.order_by.start_date",
-  },
-  {
-    key: "due_date",
-    titleTranslationKey: "common.order_by.due_date",
-  },
-  { key: "labels", titleTranslationKey: "common.labels" },
-  {
-    key: "priority",
-    titleTranslationKey: "common.priority",
-  },
-  { key: "state", titleTranslationKey: "common.state" },
-  {
-    key: "sub_issue_count",
-    titleTranslationKey: "issue.display.properties.sub_issue_count",
-  },
-  {
-    key: "attachment_count",
-    titleTranslationKey: "issue.display.properties.attachment_count",
-  },
-  { key: "link", titleTranslationKey: "common.link" },
-  {
-    key: "estimate",
-    titleTranslationKey: "common.estimate",
-  },
-  { key: "modules", titleTranslationKey: "common.module" },
-  { key: "cycle", titleTranslationKey: "common.cycle" },
-];

packages/constants/src/issue/filter.ts

@@ -1,530 +0,0 @@
-import {
-  ILayoutDisplayFiltersOptions,
-  TIssueActivityComment,
-} from "@plane/types";
-import {
-  TIssueFilterPriorityObject,
-  ISSUE_DISPLAY_PROPERTIES_KEYS,
-  EIssuesStoreType,
-} from "./common";
-
-import { TIssueLayout } from "./layout";
-
-export type TIssueFilterKeys = "priority" | "state" | "labels";
-
-export enum EServerGroupByToFilterOptions {
-  "state_id" = "state",
-  "priority" = "priority",
-  "labels__id" = "labels",
-  "state__group" = "state_group",
-  "assignees__id" = "assignees",
-  "cycle_id" = "cycle",
-  "issue_module__module_id" = "module",
-  "target_date" = "target_date",
-  "project_id" = "project",
-  "created_by" = "created_by",
-}
-
-export enum EIssueFilterType {
-  FILTERS = "filters",
-  DISPLAY_FILTERS = "display_filters",
-  DISPLAY_PROPERTIES = "display_properties",
-  KANBAN_FILTERS = "kanban_filters",
-}
-
-export const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: {
-  [key in TIssueLayout]: Record<"filters", TIssueFilterKeys[]>;
-} = {
-  list: {
-    filters: ["priority", "state", "labels"],
-  },
-  kanban: {
-    filters: ["priority", "state", "labels"],
-  },
-  calendar: {
-    filters: ["priority", "state", "labels"],
-  },
-  spreadsheet: {
-    filters: ["priority", "state", "labels"],
-  },
-  gantt: {
-    filters: ["priority", "state", "labels"],
-  },
-};
-
-export const ISSUE_PRIORITY_FILTERS: TIssueFilterPriorityObject[] = [
-  {
-    key: "urgent",
-    titleTranslationKey: "issue.priority.urgent",
-    className: "bg-red-500 border-red-500 text-white",
-    icon: "error",
-  },
-  {
-    key: "high",
-    titleTranslationKey: "issue.priority.high",
-    className: "text-orange-500 border-custom-border-300",
-    icon: "signal_cellular_alt",
-  },
-  {
-    key: "medium",
-    titleTranslationKey: "issue.priority.medium",
-    className: "text-yellow-500 border-custom-border-300",
-    icon: "signal_cellular_alt_2_bar",
-  },
-  {
-    key: "low",
-    titleTranslationKey: "issue.priority.low",
-    className: "text-green-500 border-custom-border-300",
-    icon: "signal_cellular_alt_1_bar",
-  },
-  {
-    key: "none",
-    titleTranslationKey: "common.none",
-    className: "text-gray-500 border-custom-border-300",
-    icon: "block",
-  },
-];
-
-export type TFiltersByLayout = {
-  [layoutType: string]: ILayoutDisplayFiltersOptions;
-};
-
-export type TIssueFiltersToDisplayByPageType = {
-  [pageType: string]: TFiltersByLayout;
-};
-
-export const ISSUE_DISPLAY_FILTERS_BY_PAGE: TIssueFiltersToDisplayByPageType = {
-  profile_issues: {
-    list: {
-      filters: [
-        "priority",
-        "state_group",
-        "labels",
-        "start_date",
-        "target_date",
-      ],
-      display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
-      display_filters: {
-        group_by: ["state_detail.group", "priority", "project", "labels", null],
-        order_by: [
-          "sort_order",
-          "-created_at",
-          "-updated_at",
-          "start_date",
-          "-priority",
-        ],
-        type: [null, "active", "backlog"],
-      },
-      extra_options: {
-        access: true,
-        values: ["show_empty_groups", "sub_issue"],
-      },
-    },
-    kanban: {
-      filters: [
-        "priority",
-        "state_group",
-        "labels",
-        "start_date",
-        "target_date",
-      ],
-      display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
-      display_filters: {
-        group_by: ["state_detail.group", "priority", "project", "labels"],
-        order_by: [
-          "sort_order",
-          "-created_at",
-          "-updated_at",
-          "start_date",
-          "-priority",
-        ],
-        type: [null, "active", "backlog"],
-      },
-      extra_options: {
-        access: true,
-        values: ["show_empty_groups"],
-      },
-    },
-  },
-  archived_issues: {
-    list: {
-      filters: [
-        "priority",
-        "state",
-        "cycle",
-        "module",
-        "assignees",
-        "created_by",
-        "labels",
-        "start_date",
-        "target_date",
-        "issue_type",
-      ],
-      display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
-      display_filters: {
-        group_by: [
-          "state",
-          "cycle",
-          "module",
-          "state_detail.group",
-          "priority",
-          "labels",
-          "assignees",
-          "created_by",
-          null,
-        ],
-        order_by: [
-          "sort_order",
-          "-created_at",
-          "-updated_at",
-          "start_date",
-          "-priority",
-        ],
-        type: [null, "active", "backlog"],
-      },
-      extra_options: {
-        access: true,
-        values: ["show_empty_groups"],
-      },
-    },
-  },
-  draft_issues: {
-    list: {
-      filters: [
-        "priority",
-        "state_group",
-        "cycle",
-        "module",
-        "labels",
-        "start_date",
-        "target_date",
-        "issue_type",
-      ],
-      display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
-      display_filters: {
-        group_by: [
-          "state_detail.group",
-          "cycle",
-          "module",
-          "priority",
-          "project",
-          "labels",
-          null,
-        ],
-        order_by: [
-          "sort_order",
-          "-created_at",
-          "-updated_at",
-          "start_date",
-          "-priority",
-        ],
-        type: [null, "active", "backlog"],
-      },
-      extra_options: {
-        access: true,
-        values: ["show_empty_groups"],
-      },
-    },
-    kanban: {
-      filters: [
-        "priority",
-        "state_group",
-        "cycle",
-        "module",
-        "labels",
-        "start_date",
-        "target_date",
-        "issue_type",
-      ],
-      display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
-      display_filters: {
-        group_by: [
-          "state_detail.group",
-          "cycle",
-          "module",
-          "priority",
-          "project",
-          "labels",
-        ],
-        order_by: [
-          "sort_order",
-          "-created_at",
-          "-updated_at",
-          "start_date",
-          "-priority",
-        ],
-        type: [null, "active", "backlog"],
-      },
-      extra_options: {
-        access: true,
-        values: ["show_empty_groups"],
-      },
-    },
-  },
-  my_issues: {
-    spreadsheet: {
-      filters: [
-        "priority",
-        "state_group",
-        "labels",
-        "assignees",
-        "created_by",
-        "subscriber",
-        "project",
-        "start_date",
-        "target_date",
-      ],
-      display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
-      display_filters: {
-        order_by: [],
-        type: [null, "active", "backlog"],
-      },
-      extra_options: {
-        access: true,
-        values: ["sub_issue"],
-      },
-    },
-    list: {
-      filters: [
-        "priority",
-        "state_group",
-        "labels",
-        "assignees",
-        "created_by",
-        "subscriber",
-        "project",
-        "start_date",
-        "target_date",
-      ],
-      display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
-      display_filters: {
-        type: [null, "active", "backlog"],
-      },
-      extra_options: {
-        access: false,
-        values: [],
-      },
-    },
-  },
-  issues: {
-    list: {
-      filters: [
-        "priority",
-        "state",
-        "cycle",
-        "module",
-        "assignees",
-        "mentions",
-        "created_by",
-        "labels",
-        "start_date",
-        "target_date",
-        "issue_type",
-      ],
-      display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
-      display_filters: {
-        group_by: [
-          "state",
-          "priority",
-          "cycle",
-          "module",
-          "labels",
-          "assignees",
-          "created_by",
-          null,
-        ],
-        order_by: [
-          "sort_order",
-          "-created_at",
-          "-updated_at",
-          "start_date",
-          "-priority",
-        ],
-        type: [null, "active", "backlog"],
-      },
-      extra_options: {
-        access: true,
-        values: ["show_empty_groups", "sub_issue"],
-      },
-    },
-    kanban: {
-      filters: [
-        "priority",
-        "state",
-        "cycle",
-        "module",
-        "assignees",
-        "mentions",
-        "created_by",
-        "labels",
-        "start_date",
-        "target_date",
-        "issue_type",
-      ],
-      display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
-      display_filters: {
-        group_by: [
-          "state",
-          "priority",
-          "cycle",
-          "module",
-          "labels",
-          "assignees",
-          "created_by",
-        ],
-        sub_group_by: [
-          "state",
-          "priority",
-          "cycle",
-          "module",
-          "labels",
-          "assignees",
-          "created_by",
-          null,
-        ],
-        order_by: [
-          "sort_order",
-          "-created_at",
-          "-updated_at",
-          "start_date",
-          "-priority",
-          "target_date",
-        ],
-        type: [null, "active", "backlog"],
-      },
-      extra_options: {
-        access: true,
-        values: ["show_empty_groups", "sub_issue"],
-      },
-    },
-    calendar: {
-      filters: [
-        "priority",
-        "state",
-        "cycle",
-        "module",
-        "assignees",
-        "mentions",
-        "created_by",
-        "labels",
-        "start_date",
-        "issue_type",
-      ],
-      display_properties: ["key", "issue_type"],
-      display_filters: {
-        type: [null, "active", "backlog"],
-      },
-      extra_options: {
-        access: true,
-        values: ["sub_issue"],
-      },
-    },
-    spreadsheet: {
-      filters: [
-        "priority",
-        "state",
-        "cycle",
-        "module",
-        "assignees",
-        "mentions",
-        "created_by",
-        "labels",
-        "start_date",
-        "target_date",
-        "issue_type",
-      ],
-      display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
-      display_filters: {
-        order_by: [
-          "sort_order",
-          "-created_at",
-          "-updated_at",
-          "start_date",
-          "-priority",
-        ],
-        type: [null, "active", "backlog"],
-      },
-      extra_options: {
-        access: true,
-        values: ["sub_issue"],
-      },
-    },
-    gantt_chart: {
-      filters: [
-        "priority",
-        "state",
-        "cycle",
-        "module",
-        "assignees",
-        "mentions",
-        "created_by",
-        "labels",
-        "start_date",
-        "target_date",
-        "issue_type",
-      ],
-      display_properties: ["key", "issue_type"],
-      display_filters: {
-        order_by: [
-          "sort_order",
-          "-created_at",
-          "-updated_at",
-          "start_date",
-          "-priority",
-        ],
-        type: [null, "active", "backlog"],
-      },
-      extra_options: {
-        access: true,
-        values: ["sub_issue"],
-      },
-    },
-  },
-};
-
-export const ISSUE_STORE_TO_FILTERS_MAP: Partial<
-  Record<EIssuesStoreType, TFiltersByLayout>
-> = {
-  [EIssuesStoreType.PROJECT]: ISSUE_DISPLAY_FILTERS_BY_PAGE.issues,
-};
-
-export enum EActivityFilterType {
-  ACTIVITY = "ACTIVITY",
-  COMMENT = "COMMENT",
-}
-
-export type TActivityFilters = EActivityFilterType;
-
-export const ACTIVITY_FILTER_TYPE_OPTIONS: Record<
-  TActivityFilters,
-  { labelTranslationKey: string }
-> = {
-  [EActivityFilterType.ACTIVITY]: {
-    labelTranslationKey: "common.updates",
-  },
-  [EActivityFilterType.COMMENT]: {
-    labelTranslationKey: "common.comments",
-  },
-};
-
-export type TActivityFilterOption = {
-  key: TActivityFilters;
-  labelTranslationKey: string;
-  isSelected: boolean;
-  onClick: () => void;
-};
-
-export const defaultActivityFilters: TActivityFilters[] = [
-  EActivityFilterType.ACTIVITY,
-  EActivityFilterType.COMMENT,
-];
-
-export const filterActivityOnSelectedFilters = (
-  activity: TIssueActivityComment[],
-  filters: TActivityFilters[]
-): TIssueActivityComment[] =>
-  activity.filter((activity) =>
-    filters.includes(activity.activity_type as TActivityFilters)
-  );
-
-export const ENABLE_ISSUE_DEPENDENCIES = false;

packages/constants/src/issue/index.ts

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

packages/constants/src/issue/layout.ts

@@ -1,76 +0,0 @@
-export type TIssueLayout =
-  | "list"
-  | "kanban"
-  | "calendar"
-  | "spreadsheet"
-  | "gantt";
-
-export enum EIssueLayoutTypes {
-  LIST = "list",
-  KANBAN = "kanban",
-  CALENDAR = "calendar",
-  GANTT = "gantt_chart",
-  SPREADSHEET = "spreadsheet",
-}
-
-export type TIssueLayoutMap = Record<
-  EIssueLayoutTypes,
-  {
-    key: EIssueLayoutTypes;
-    i18n_title: string;
-    i18n_label: string;
-  }
->;
-
-export const SITES_ISSUE_LAYOUTS: {
-  key: TIssueLayout;
-  titleTranslationKey: string;
-  icon: any;
-}[] = [
-  {
-    key: "list",
-    icon: "List",
-    titleTranslationKey: "issue.layouts.list",
-  },
-  {
-    key: "kanban",
-    icon: "Kanban",
-    titleTranslationKey: "issue.layouts.kanban",
-  },
-  // { key: "calendar", title: "Calendar", icon: Calendar },
-  // { key: "spreadsheet", title: "Spreadsheet", icon: Sheet },
-  // { key: "gantt", title: "Gantt chart", icon: GanttChartSquare },
-];
-
-export const ISSUE_LAYOUT_MAP: TIssueLayoutMap = {
-  [EIssueLayoutTypes.LIST]: {
-    key: EIssueLayoutTypes.LIST,
-    i18n_title: "issue.layouts.title.list",
-    i18n_label: "issue.layouts.list",
-  },
-  [EIssueLayoutTypes.KANBAN]: {
-    key: EIssueLayoutTypes.KANBAN,
-    i18n_title: "issue.layouts.title.kanban",
-    i18n_label: "issue.layouts.kanban",
-  },
-  [EIssueLayoutTypes.CALENDAR]: {
-    key: EIssueLayoutTypes.CALENDAR,
-    i18n_title: "issue.layouts.title.calendar",
-    i18n_label: "issue.layouts.calendar",
-  },
-  [EIssueLayoutTypes.SPREADSHEET]: {
-    key: EIssueLayoutTypes.SPREADSHEET,
-    i18n_title: "issue.layouts.title.spreadsheet",
-    i18n_label: "issue.layouts.spreadsheet",
-  },
-  [EIssueLayoutTypes.GANTT]: {
-    key: EIssueLayoutTypes.GANTT,
-    i18n_title: "issue.layouts.title.gantt",
-    i18n_label: "issue.layouts.gantt",
-  },
-};
-
-export const ISSUE_LAYOUTS: {
-  key: EIssueLayoutTypes;
-  i18n_title: string;
-}[] = Object.values(ISSUE_LAYOUT_MAP);

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/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/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

@@ -1,23 +0,0 @@
-export enum EViewAccess {
-  PRIVATE,
-  PUBLIC,
-}
-
-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" },
-];
-
-export const VIEW_SORTING_KEY_OPTIONS = [
-  { key: "name", i18n_label: "project_view.sort_by.name" },
-  { key: "created_at", i18n_label: "project_view.sort_by.created_at" },
-  { key: "updated_at", i18n_label: "project_view.sort_by.updated_at" },
-];
-
-export const VIEW_SORT_BY_OPTIONS = [
-  { key: "asc", i18n_label: "common.order_by.asc" },
-  { key: "desc", i18n_label: "common.order_by.desc" },
-];

packages/constants/src/workspace.ts

@@ -1,6 +1,3 @@
-import { TStaticViewTypes } from "@plane/types";
-import { EUserWorkspaceRoles } from "./user";
-
 export const ORGANIZATION_SIZE = [
   "Just myself", // TODO: translate
   "2-10",
@@ -77,250 +74,3 @@ export const RESTRICTED_URLS = [
   "instances",
   "instance",
 ];
-
-export const WORKSPACE_SETTINGS = {
-  general: {
-    key: "general",
-    i18n_label: "workspace_settings.settings.general.title",
-    href: `/settings`,
-    access: [EUserWorkspaceRoles.ADMIN],
-    highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/settings/`,
-  },
-  members: {
-    key: "members",
-    i18n_label: "workspace_settings.settings.members.title",
-    href: `/settings/members`,
-    access: [EUserWorkspaceRoles.ADMIN],
-    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/`,
-  },
-  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/`,
-  },
-  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/`,
-  },
-  "api-tokens": {
-    key: "api-tokens",
-    i18n_label: "workspace_settings.settings.api_tokens.title",
-    href: `/settings/api-tokens`,
-    access: [EUserWorkspaceRoles.ADMIN],
-    highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/settings/api-tokens/`,
-  },
-};
-
-export const WORKSPACE_SETTINGS_LINKS: {
-  key: string;
-  i18n_label: string;
-  href: string;
-  access: EUserWorkspaceRoles[];
-  highlight: (pathname: string, baseUrl: string) => boolean;
-}[] = [
-  WORKSPACE_SETTINGS["general"],
-  WORKSPACE_SETTINGS["members"],
-  WORKSPACE_SETTINGS["billing-and-plans"],
-  WORKSPACE_SETTINGS["export"],
-  WORKSPACE_SETTINGS["webhooks"],
-  WORKSPACE_SETTINGS["api-tokens"],
-];
-
-export const ROLE = {
-  [EUserWorkspaceRoles.GUEST]: "Guest",
-  [EUserWorkspaceRoles.MEMBER]: "Member",
-  [EUserWorkspaceRoles.ADMIN]: "Admin",
-};
-
-export const ROLE_DETAILS = {
-  [EUserWorkspaceRoles.GUEST]: {
-    i18n_title: "role_details.guest.title",
-    i18n_description: "role_details.guest.description",
-  },
-  [EUserWorkspaceRoles.MEMBER]: {
-    i18n_title: "role_details.member.title",
-    i18n_description: "role_details.member.description",
-  },
-  [EUserWorkspaceRoles.ADMIN]: {
-    i18n_title: "role_details.admin.title",
-    i18n_description: "role_details.admin.description",
-  },
-};
-
-export const USER_ROLES = [
-  {
-    value: "Product / Project Manager",
-    i18n_label: "user_roles.product_or_project_manager",
-  },
-  {
-    value: "Development / Engineering",
-    i18n_label: "user_roles.development_or_engineering",
-  },
-  {
-    value: "Founder / Executive",
-    i18n_label: "user_roles.founder_or_executive",
-  },
-  {
-    value: "Freelancer / Consultant",
-    i18n_label: "user_roles.freelancer_or_consultant",
-  },
-  { value: "Marketing / Growth", i18n_label: "user_roles.marketing_or_growth" },
-  {
-    value: "Sales / Business Development",
-    i18n_label: "user_roles.sales_or_business_development",
-  },
-  {
-    value: "Support / Operations",
-    i18n_label: "user_roles.support_or_operations",
-  },
-  {
-    value: "Student / Professor",
-    i18n_label: "user_roles.student_or_professor",
-  },
-  { value: "Human Resources", i18n_label: "user_roles.human_resources" },
-  { value: "Other", i18n_label: "user_roles.other" },
-];
-
-export const IMPORTERS_LIST = [
-  {
-    provider: "github",
-    type: "import",
-    i18n_title: "importer.github.title",
-    i18n_description: "importer.github.description",
-  },
-  {
-    provider: "jira",
-    type: "import",
-    i18n_title: "importer.jira.title",
-    i18n_description: "importer.jira.description",
-  },
-];
-
-export const EXPORTERS_LIST = [
-  {
-    provider: "csv",
-    type: "export",
-    i18n_title: "exporter.csv.title",
-    i18n_description: "exporter.csv.description",
-  },
-  {
-    provider: "xlsx",
-    type: "export",
-    i18n_title: "exporter.excel.title",
-    i18n_description: "exporter.csv.description",
-  },
-  {
-    provider: "json",
-    type: "export",
-    i18n_title: "exporter.json.title",
-    i18n_description: "exporter.csv.description",
-  },
-];
-
-export const DEFAULT_GLOBAL_VIEWS_LIST: {
-  key: TStaticViewTypes;
-  i18n_label: string;
-}[] = [
-  {
-    key: "all-issues",
-    i18n_label: "default_global_view.all_issues",
-  },
-  {
-    key: "assigned",
-    i18n_label: "default_global_view.assigned",
-  },
-  {
-    key: "created",
-    i18n_label: "default_global_view.created",
-  },
-  {
-    key: "subscribed",
-    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

@@ -1,6 +1,6 @@
 {
   "name": "@plane/editor",
-  "version": "0.25.0",
+  "version": "0.24.1",
   "description": "Core Editor that powers Plane",
   "private": true,
   "main": "./dist/index.mjs",
@@ -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";
@@ -36,7 +35,7 @@ const CollaborativeDocumentEditor = (props: ICollaborativeDocumentEditor) => {
     user,
   } = props;
 
-  const extensions: Extensions = [];
+  const extensions = [];
   if (embedHandler?.issue) {
     extensions.push(
       IssueWidget({

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

packages/editor/src/core/extensions/custom-image/components/image-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]);