fix: uuid validation error

fix: module activity
fix: meta endpoint to return correct error message
2025-02-19 16:36:58 +05:30 · 2025-02-18 21:16:20 +05:30 · 2025-02-18 21:04:31 +05:30 · 2025-02-18 18:51:13 +05:30
219 changed files with 1192 additions and 2687 deletions
@@ -320,7 +320,6 @@ jobs:
          retention-days: 2
          path: |
            ${{ 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
@@ -363,7 +362,6 @@ jobs:
          generate_release_notes: true
          files: |
            ${{ github.workspace }}/deploy/selfhost/setup.sh
-            ${{ github.workspace }}/deploy/selfhost/swarm.sh
            ${{ github.workspace }}/deploy/selfhost/restore.sh
            ${{ github.workspace }}/deploy/selfhost/docker-compose.yml
            ${{ github.workspace }}/deploy/selfhost/variables.env
@@ -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).
@@ -1,6 +1,6 @@
 {
  "name": "admin",
-  "version": "0.25.0",
+  "version": "0.24.1",
  "private": true,
  "scripts": {
    "dev": "turbo run develop",
@@ -1,4 +1,4 @@
 {
  "name": "plane-api",
-  "version": "0.25.0"
+  "version": "0.24.1"
 }
@@ -522,7 +522,6 @@ class IssueAttachmentLiteSerializer(DynamicBaseSerializer):
            "asset",
            "attributes",
            # "issue_id",
-            "created_by",
            "updated_at",
            "updated_by",
            "asset_url",
@@ -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"},
@@ -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")
@@ -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
        """

@@ -1116,22 +1116,8 @@ class IssueMetaEndpoint(BaseAPIView):

 class IssueDetailIdentifierEndpoint(BaseAPIView):

-    def strict_str_to_int(self, s):
-        if not s.isdigit() and not (s.startswith('-') and s[1:].isdigit()):
-            raise ValueError("Invalid integer string")
-        return int(s)
-
    def get(self, request, slug, project_identifier, issue_identifier):
-
-        # Check if the issue identifier is a valid integer
-        try:
-            issue_identifier = self.strict_str_to_int(issue_identifier)
-        except ValueError:
-            return Response(
-                {"error": "Invalid issue identifier"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
+        
        # Fetch the project
        project = Project.objects.get(
            identifier__iexact=project_identifier,
@@ -1254,7 +1240,7 @@ class IssueDetailIdentifierEndpoint(BaseAPIView):
            )

        """
-        if the role is guest and guest_view_all_features is false and owned by is not
+        if the role is guest and guest_view_all_features is false and owned by is not 
        the requesting user then dont show the issue
        """

@@ -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,
@@ -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):
@@ -11,6 +11,7 @@ from django.utils import timezone


 # Module imports
+from plane.utils.valid_uuid import is_valid_uuid
 from plane.app.serializers import IssueActivitySerializer
 from plane.bgtasks.notification_task import notifications
 from plane.db.models import (
@@ -32,7 +33,7 @@ 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
 def track_name(
@@ -1568,14 +1569,13 @@ def issue_activity(
    try:
        issue_activities = []

-        # check if project_id is valid
+        # Validate UUIDs
        if not is_valid_uuid(project_id):
            return

        project = Project.objects.get(pk=project_id)
        workspace_id = project.workspace_id

-
        if issue_id is not None:
            if origin:
                ri = redis_instance()
@@ -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
@@ -1,8 +1,9 @@
 import uuid

-def is_valid_uuid(uuid_str):
+def is_valid_uuid(uuid_to_test, version=4):
    try:
-        uuid.UUID(uuid_str, version=4)
-        return True
+        # check for validity of Uuid
+        uuid_obj = uuid.UUID(uuid_to_test, version=version)
    except ValueError:
        return False
+    return True
@@ -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
@@ -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
@@ -2,4 +2,4 @@
 # debug toolbar
 django-debug-toolbar==4.3.0
 # formatter
-ruff==0.9.7
+ruff==0.4.2
@@ -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.

@@ -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:
@@ -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
@@ -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 "$@"
@@ -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}
@@ -1,6 +1,6 @@
 {
  "name": "live",
-  "version": "0.25.0",
+  "version": "0.24.1",
  "description": "",
  "main": "./src/server.ts",
  "private": true,
@@ -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,7 +22,7 @@
  "devDependencies": {
    "prettier": "latest",
    "prettier-plugin-tailwindcss": "^0.5.4",
-    "turbo": "^2.4.2"
+    "turbo": "^2.4.1"
  },
  "resolutions": {
    "nanoid": "3.3.8",
@@ -1,6 +1,6 @@
 {
  "name": "@plane/constants",
-  "version": "0.25.0",
+  "version": "0.24.1",
  "private": true,
  "main": "./src/index.ts"
 }
@@ -271,6 +271,12 @@ export const WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS: Record<string, IWorkspa
    href: `/workspace-views/all-issues/`,
    access: [EUserWorkspaceRoles.ADMIN, EUserWorkspaceRoles.MEMBER, EUserWorkspaceRoles.GUEST],
  },
+  "active-cycles": {
+    key: "active_cycles",
+    labelTranslationKey: "cycles",
+    href: `/active-cycles/`,
+    access: [EUserWorkspaceRoles.ADMIN, EUserWorkspaceRoles.MEMBER],
+  },
  analytics: {
    key: "analytics",
    labelTranslationKey: "analytics",
@@ -292,6 +298,7 @@ export const WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS: Record<string, IWorkspa
 };
 export const WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS_LINKS: IWorkspaceSidebarNavigationItem[] = [
  WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS["views"],
+  WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS["active-cycles"],
  WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS["analytics"],
  WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS["your-work"],
  WORKSPACE_SIDEBAR_DYNAMIC_NAVIGATION_ITEMS["drafts"],
@@ -305,8 +312,8 @@ export const WORKSPACE_SIDEBAR_STATIC_NAVIGATION_ITEMS: Record<string, IWorkspac
    href: `/`,
    access: [EUserWorkspaceRoles.ADMIN, EUserWorkspaceRoles.MEMBER, EUserWorkspaceRoles.GUEST],
  },
-  inbox: {
-    key: "inbox",
+  notifications: {
+    key: "notifications",
    labelTranslationKey: "notification.label",
    href: `/notifications/`,
    access: [EUserWorkspaceRoles.ADMIN, EUserWorkspaceRoles.MEMBER, EUserWorkspaceRoles.GUEST],
@@ -321,6 +328,6 @@ export const WORKSPACE_SIDEBAR_STATIC_NAVIGATION_ITEMS: Record<string, IWorkspac

 export const WORKSPACE_SIDEBAR_STATIC_NAVIGATION_ITEMS_LINKS: IWorkspaceSidebarNavigationItem[] = [
  WORKSPACE_SIDEBAR_STATIC_NAVIGATION_ITEMS["home"],
-  WORKSPACE_SIDEBAR_STATIC_NAVIGATION_ITEMS["inbox"],
+  WORKSPACE_SIDEBAR_STATIC_NAVIGATION_ITEMS["notifications"],
  WORKSPACE_SIDEBAR_STATIC_NAVIGATION_ITEMS["projects"],
 ];
@@ -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",
@@ -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({
@@ -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({
@@ -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,
@@ -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,
@@ -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",
@@ -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">
@@ -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>
@@ -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,
 });

@@ -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,
@@ -106,8 +106,6 @@ export const CustomColorExtension = Mark.create({
    };
  },

-  // @ts-expect-error types are incorrect
-  // TODO: check this and update types
  parseHTML() {
    return [
      {
@@ -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,
          }}
@@ -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]);
@@ -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]);

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

 export type InsertImageComponentProps = {
  file?: File;
@@ -21,8 +21,7 @@ declare module "@tiptap/core" {
  interface Commands<ReturnType> {
    imageComponent: {
      insertImageComponent: ({ file, pos, event }: InsertImageComponentProps) => ReturnType;
-      uploadImage: (blockId: string, file: File) => () => Promise<string> | undefined;
-      updateAssetsUploadStatus: (updatedStatus: TFileHandler["assetsUploadStatus"]) => () => void;
+      uploadImage: (file: File) => () => Promise<string> | undefined;
      getImageSource?: (path: string) => () => Promise<string>;
      restoreImage: (src: string) => () => Promise<void>;
    };
@@ -33,7 +32,6 @@ export const getImageComponentImageFileMap = (editor: Editor) =>
  (editor.storage.imageComponent as UploadImageExtensionStorage | undefined)?.fileMap;

 export interface UploadImageExtensionStorage {
-  assetsUploadStatus: TFileHandler["assetsUploadStatus"];
  fileMap: Map<string, UploadEntity>;
 }

@@ -41,7 +39,6 @@ export type UploadEntity = ({ event: "insert" } | { event: "drop"; file: File })

 export const CustomImageExtension = (props: TFileHandler) => {
  const {
-    assetsUploadStatus,
    getAssetSrc,
    upload,
    delete: deleteImageFn,
@@ -108,6 +105,7 @@ export const CustomImageExtension = (props: TFileHandler) => {
      this.editor.state.doc.descendants((node) => {
        if (node.type.name === this.name) {
          if (!node.attrs.src?.startsWith("http")) return;
+
          imageSources.add(node.attrs.src);
        }
      });
@@ -130,14 +128,13 @@ export const CustomImageExtension = (props: TFileHandler) => {
        markdown: {
          serialize() {},
        },
-        assetsUploadStatus,
      };
    },

    addCommands() {
      return {
        insertImageComponent:
-          (props) =>
+          (props: { file?: File; pos?: number; event: "insert" | "drop" }) =>
          ({ commands }) => {
            // Early return if there's an invalid file being dropped
            if (
@@ -185,15 +182,12 @@ export const CustomImageExtension = (props: TFileHandler) => {
              attrs: attributes,
            });
          },
-        uploadImage: (blockId, file) => async () => {
-          const fileUrl = await upload(blockId, file);
+        uploadImage: (file: File) => async () => {
+          const fileUrl = await upload(file);
          return fileUrl;
        },
-        updateAssetsUploadStatus: (updatedStatus) => () => {
-          this.storage.assetsUploadStatus = updatedStatus;
-        },
-        getImageSource: (path) => async () => await getAssetSrc(path),
-        restoreImage: (src) => async () => {
+        getImageSource: (path: string) => async () => await getAssetSrc(path),
+        restoreImage: (src: string) => async () => {
          await restoreImageFn(src);
        },
      };
@@ -4,9 +4,9 @@ import { ReactNodeViewRenderer } from "@tiptap/react";
 // components
 import { CustomImageNode, UploadImageExtensionStorage } from "@/extensions/custom-image";
 // types
-import { TReadOnlyFileHandler } from "@/types";
+import { TFileHandler } from "@/types";

-export const CustomReadOnlyImageExtension = (props: TReadOnlyFileHandler) => {
+export const CustomReadOnlyImageExtension = (props: Pick<TFileHandler, "getAssetSrc">) => {
  const { getAssetSrc } = props;

  return Image.extend<Record<string, unknown>, UploadImageExtensionStorage>({
@@ -56,7 +56,6 @@ export const CustomReadOnlyImageExtension = (props: TReadOnlyFileHandler) => {
        markdown: {
          serialize() {},
        },
-        assetsUploadStatus: {},
      };
    },

@@ -32,10 +32,10 @@ import {
 } from "@/extensions";
 // helpers
 import { isValidHttpUrl } from "@/helpers/common";
-// plane editor extensions
-import { CoreEditorAdditionalExtensions } from "@/plane-editor/extensions";
 // types
 import { TExtensions, TFileHandler, TMentionHandler } from "@/types";
+// plane editor extensions
+import { CoreEditorAdditionalExtensions } from "@/plane-editor/extensions";

 type TArguments = {
  disabledExtensions: TExtensions[];
@@ -148,7 +148,7 @@ export const CoreEditorExtensions = (args: TArguments): Extensions => {
    CustomMentionExtension(mentionHandler),
    Placeholder.configure({
      placeholder: ({ editor, node }) => {
-        if (!editor.isEditable) return "";
+        if (!editor.isEditable) return;

        if (node.type.name === "heading") return `Heading ${node.attrs.level}`;

@@ -3,9 +3,9 @@ import { ReactNodeViewRenderer } from "@tiptap/react";
 // extensions
 import { CustomImageNode } from "@/extensions";
 // types
-import { TReadOnlyFileHandler } from "@/types";
+import { TFileHandler } from "@/types";

-export const ReadOnlyImageExtension = (props: TReadOnlyFileHandler) => {
+export const ReadOnlyImageExtension = (props: Pick<TFileHandler, "getAssetSrc">) => {
  const { getAssetSrc } = props;

  return Image.extend({
@@ -27,14 +27,14 @@ import {
 } from "@/extensions";
 // helpers
 import { isValidHttpUrl } from "@/helpers/common";
+// types
+import { TExtensions, TFileHandler, TReadOnlyMentionHandler } from "@/types";
 // plane editor extensions
 import { CoreReadOnlyEditorAdditionalExtensions } from "@/plane-editor/extensions";
-// types
-import { TExtensions, TReadOnlyFileHandler, TReadOnlyMentionHandler } from "@/types";

 type Props = {
  disabledExtensions: TExtensions[];
-  fileHandler: TReadOnlyFileHandler;
+  fileHandler: Pick<TFileHandler, "getAssetSrc">;
  mentionHandler: TReadOnlyMentionHandler;
 };

@@ -94,12 +94,16 @@ export const CoreReadOnlyEditorExtensions = (props: Props): Extensions => {
      },
    }),
    CustomTypographyExtension,
-    ReadOnlyImageExtension(fileHandler).configure({
+    ReadOnlyImageExtension({
+      getAssetSrc: fileHandler.getAssetSrc,
+    }).configure({
      HTMLAttributes: {
        class: "rounded-md",
      },
    }),
-    CustomReadOnlyImageExtension(fileHandler),
+    CustomReadOnlyImageExtension({
+      getAssetSrc: fileHandler.getAssetSrc,
+    }),
    TiptapUnderline,
    TextStyle,
    TaskList.configure({
@@ -69,7 +69,6 @@ const renderItems = () => {

      const tippyContainer =
        document.querySelector(".active-editor") ?? document.querySelector('[id^="editor-container"]');
-      // @ts-expect-error - Tippy types are incorrect
      popup = tippy("body", {
        getReferenceClientRect: props.clientRect,
        appendTo: tippyContainer,
@@ -1,4 +1,4 @@
-import { Extension, InputRule } from "@tiptap/core";
+import { Extension } from "@tiptap/core";
 import {
  TypographyOptions,
  emDash,
@@ -26,7 +26,7 @@ export const CustomTypographyExtension = Extension.create<TypographyOptions>({
  name: "typography",

  addInputRules() {
-    const rules: InputRule[] = [];
+    const rules = [];

    if (this.options.emDash !== false) {
      rules.push(emDash(this.options.emDash));
@@ -125,23 +125,16 @@ export const useEditor = (props: CustomEditorProps) => {
    }
  }, [editor, value, id]);

-  // update assets upload status
-  useEffect(() => {
-    if (!editor) return;
-    const assetsUploadStatus = fileHandler.assetsUploadStatus;
-    editor.commands.updateAssetsUploadStatus(assetsUploadStatus);
-  }, [editor, fileHandler.assetsUploadStatus]);
-
  useImperativeHandle(
    forwardedRef,
    () => ({
-      blur: () => editor?.commands.blur(),
+      blur: () => editor.commands.blur(),
      scrollToNodeViaDOMCoordinates(behavior?: ScrollBehavior, pos?: number) {
-        const resolvedPos = pos ?? editor?.state.selection.from;
+        const resolvedPos = pos ?? editor.state.selection.from;
        if (!editor || !resolvedPos) return;
        scrollToNodeViaDOMCoordinates(editor, resolvedPos, behavior);
      },
-      getCurrentCursorPosition: () => editor?.state.selection.from,
+      getCurrentCursorPosition: () => editor.state.selection.from,
      clearEditor: (emitUpdate = false) => {
        editor?.chain().setMeta("skipImageDeletion", true).clearContent(emitUpdate).run();
      },
@@ -149,7 +142,7 @@ export const useEditor = (props: CustomEditorProps) => {
        editor?.commands.setContent(content, false, { preserveWhitespace: "full" });
      },
      setEditorValueAtCursorPosition: (content: string) => {
-        if (editor?.state.selection) {
+        if (editor.state.selection) {
          insertContentAtSavedSelection(editor, content);
        }
      },
@@ -6,7 +6,6 @@ import { insertImagesSafely } from "@/extensions/drop";
 import { isFileValid } from "@/plugins/image";

 type TUploaderArgs = {
-  blockId: string;
  editor: Editor;
  loadImageFromFileSystem: (file: string) => void;
  maxFileSize: number;
@@ -14,7 +13,7 @@ type TUploaderArgs = {
 };

 export const useUploader = (args: TUploaderArgs) => {
-  const { blockId, editor, loadImageFromFileSystem, maxFileSize, onUpload } = args;
+  const { editor, loadImageFromFileSystem, maxFileSize, onUpload } = args;
  // states
  const [uploading, setUploading] = useState(false);

@@ -50,7 +49,7 @@ export const useUploader = (args: TUploaderArgs) => {
        reader.readAsDataURL(fileWithTrimmedName);
        // @ts-expect-error - TODO: fix typings, and don't remove await from
        // here for now
-        const url: string = await editor?.commands.uploadImage(blockId, fileWithTrimmedName);
+        const url: string = await editor?.commands.uploadImage(fileWithTrimmedName);

        if (!url) {
          throw new Error("Something went wrong while uploading the image");
@@ -11,7 +11,7 @@ import { IMarking, scrollSummary } from "@/helpers/scroll-to-node";
 // props
 import { CoreReadOnlyEditorProps } from "@/props";
 // types
-import type { EditorReadOnlyRefApi, TExtensions, TReadOnlyFileHandler, TReadOnlyMentionHandler } from "@/types";
+import type { EditorReadOnlyRefApi, TExtensions, TFileHandler, TReadOnlyMentionHandler } from "@/types";

 interface CustomReadOnlyEditorProps {
  disabledExtensions: TExtensions[];
@@ -20,7 +20,7 @@ interface CustomReadOnlyEditorProps {
  extensions?: Extensions;
  forwardedRef?: MutableRefObject<EditorReadOnlyRefApi | null>;
  initialValue?: string;
-  fileHandler: TReadOnlyFileHandler;
+  fileHandler: Pick<TFileHandler, "getAssetSrc">;
  handleEditorReady?: (value: boolean) => void;
  mentionHandler: TReadOnlyMentionHandler;
  provider?: HocuspocusProvider;
@@ -99,11 +99,14 @@ export const useReadOnlyEditor = (props: CustomReadOnlyEditorProps) => {
      if (!editor) return;
      scrollSummary(editor, marking);
    },
-    getDocumentInfo: () => ({
-      characters: editor.storage?.characterCount?.characters?.() ?? 0,
-      paragraphs: getParagraphCount(editor.state),
-      words: editor.storage?.characterCount?.words?.() ?? 0,
-    }),
+    getDocumentInfo: () => {
+      if (!editor) return;
+      return {
+        characters: editor.storage?.characterCount?.characters?.() ?? 0,
+        paragraphs: getParagraphCount(editor.state),
+        words: editor.storage?.characterCount?.words?.() ?? 0,
+      };
+    },
  }));

  if (!editor) {
@@ -9,7 +9,6 @@ import {
  TExtensions,
  TFileHandler,
  TMentionHandler,
-  TReadOnlyFileHandler,
  TReadOnlyMentionHandler,
  TRealtimeConfig,
  TUserDetails,
@@ -44,7 +43,7 @@ export type TCollaborativeEditorProps = TCollaborativeEditorHookProps & {
 };

 export type TReadOnlyCollaborativeEditorProps = TCollaborativeEditorHookProps & {
-  fileHandler: TReadOnlyFileHandler;
+  fileHandler: Pick<TFileHandler, "getAssetSrc">;
  forwardedRef?: React.MutableRefObject<EditorReadOnlyRefApi | null>;
  mentionHandler: TReadOnlyMentionHandler;
 };
@@ -1,15 +1,11 @@
 import { DeleteImage, RestoreImage, UploadImage } from "@/types";

-export type TReadOnlyFileHandler = {
+export type TFileHandler = {
  getAssetSrc: (path: string) => Promise<string>;
-  restore: RestoreImage;
-};
-
-export type TFileHandler = TReadOnlyFileHandler & {
-  assetsUploadStatus: Record<string, number>; // blockId => progress percentage
  cancel: () => void;
  delete: DeleteImage;
  upload: UploadImage;
+  restore: RestoreImage;
  validation: {
    /**
     * @description max file size in bytes
@@ -16,7 +16,6 @@ import {
  TExtensions,
  TFileHandler,
  TMentionHandler,
-  TReadOnlyFileHandler,
  TReadOnlyMentionHandler,
  TServerHandler,
 } from "@/types";
@@ -32,7 +31,7 @@ export type TEditorCommands =
  | "bold"
  | "italic"
  | "underline"
-  | "strike"
+  | "strikethrough"
  | "bulleted-list"
  | "numbered-list"
  | "to-do-list"
@@ -45,16 +44,12 @@ export type TEditorCommands =
  | "text-color"
  | "background-color"
  | "text-align"
-  | "callout"
-  | "attachment";
+  | "callout";

 export type TCommandExtraProps = {
  image: {
    savedSelection: Selection | null;
  };
-  attachment: {
-    savedSelection: Selection | null;
-  };
  "text-color": {
    color: string | undefined;
  };
@@ -160,7 +155,7 @@ export interface IReadOnlyEditorProps {
  disabledExtensions: TExtensions[];
  displayConfig?: TDisplayConfig;
  editorClassName?: string;
-  fileHandler: TReadOnlyFileHandler;
+  fileHandler: Pick<TFileHandler, "getAssetSrc">;
  forwardedRef?: React.MutableRefObject<EditorReadOnlyRefApi | null>;
  id: string;
  initialValue: string;
@@ -2,4 +2,4 @@ export type DeleteImage = (assetUrlWithWorkspaceId: string) => Promise<void>;

 export type RestoreImage = (assetUrlWithWorkspaceId: string) => Promise<void>;

-export type UploadImage = (blockId: string, file: File) => Promise<string>;
+export type UploadImage = (file: File) => Promise<string>;
@@ -12,7 +12,6 @@
      "@/styles/*": ["src/styles/*"],
      "@/plane-editor/*": ["src/ce/*"]
    },
-    "strictNullChecks": true,
    "allowSyntheticDefaultImports": true
  },
  "include": ["src/**/*", "index.d.ts"],
@@ -1,7 +1,7 @@
 {
  "name": "@plane/eslint-config",
  "private": true,
-  "version": "0.25.0",
+  "version": "0.24.1",
  "files": [
    "library.js",
    "next.js",
@@ -1,6 +1,6 @@
 {
  "name": "@plane/hooks",
-  "version": "0.25.0",
+  "version": "0.24.1",
  "description": "React hooks that are shared across multiple apps internally",
  "private": true,
  "main": "./dist/index.js",
@@ -1,6 +1,6 @@
 {
  "name": "@plane/i18n",
-  "version": "0.25.0",
+  "version": "0.24.1",
  "description": "I18n shared across multiple apps internally",
  "private": true,
  "main": "./src/index.ts",
@@ -9,7 +9,7 @@
    "workspace": "Workspace",
    "views": "Views",
    "analytics": "Analytics",
-    "work_items": "Work Items",
+    "work_items": "Work items",
    "cycles": "Cycles",
    "modules": "Modules",
    "intake": "Intake",
@@ -287,7 +287,7 @@
  "Cancel": "Cancel",
  "edit": "Edit",
  "archive": "Archive",
-  "restore": "Restore",
+  "restor": "Restore",
  "open_in_new_tab": "Open in new tab",
  "delete": "Delete",
  "deleting": "Deleting",
@@ -492,7 +492,6 @@
    "epic": "Epic",
    "epics": "Epics",
    "work_item": "Work item",
-    "work_items": "Work items",
    "sub_work_item": "Sub-work item",
    "add": "Add",
    "warning": "Warning",
@@ -613,7 +612,6 @@
      "open_in_new_tab": "Open in new tab",
      "copy_link": "Copy link",
      "archive": "Archive",
-      "restore": "Restore",
      "delete": "Delete",
      "remove_relation": "Remove relation",
      "subscribe": "Subscribe",
@@ -676,16 +674,6 @@
    "disconnecting": "Disconnecting",
    "installing": "Installing",
    "install": "Install",
-    "reset": "Reset",
-    "live": "Live",
-    "change_history": "Change History",
-    "coming_soon": "Coming soon",
-    "members": "Members",
-    "you": "You",
-    "upgrade_cta": {
-      "higher_subscription": "Upgrade to higher subscription",
-      "talk_to_sales": "Talk to sales"
-    },
    "category": "Category",
    "categories": "Categories",
    "saving": "Saving",
@@ -215,7 +215,6 @@
  "activity": "Actividad",
  "appearance": "Apariencia",
  "notifications": "Notificaciones",
-  "connections": "Conexiones",
  "workspaces": "Espacios de trabajo",
  "create_workspace": "Crear espacio de trabajo",
  "invitations": "Invitaciones",
@@ -292,7 +291,6 @@
  "workspace_logo": "Logo del espacio de trabajo",
  "new_issue": "Nuevo elemento de trabajo",
  "your_work": "Tu trabajo",
-  "workspace_dashboards": "Paneles de control",
  "drafts": "Borradores",
  "projects": "Proyectos",
  "views": "Vistas",
@@ -459,7 +457,7 @@
  "Cancel": "Cancelar",
  "edit": "Editar",
  "archive": "Archivar",
-  "restore": "Restaurar",
+  "restor": "Restaurar",
  "open_in_new_tab": "Abrir en nueva pestaña",
  "delete": "Eliminar",
  "deleting": "Eliminando",
@@ -664,7 +662,6 @@
    "epic": "Epic",
    "epics": "Epics",
    "work_item": "Elemento de trabajo",
-    "work_items": "Elementos de trabajo",
    "sub_work_item": "Sub-elemento de trabajo",
    "add": "Agregar",
    "warning": "Advertencia",
@@ -847,16 +844,6 @@
    "disconnecting": "Desconectando",
    "installing": "Instalando",
    "install": "Instalar",
-    "reset": "Reiniciar",
-    "live": "En vivo",
-    "change_history": "Historial de cambios",
-    "coming_soon": "Próximamente",
-    "members": "Miembros",
-    "you": "Tú",
-    "upgrade_cta": {
-      "higher_subscription": "Mejorar a una suscripción más alta",
-      "talk_to_sales": "Hablar con ventas"
-    },
    "category": "Categoría",
    "categories": "Categorías",
    "saving": "Guardando",
@@ -457,7 +457,7 @@
  "Cancel": "Annuler",
  "edit": "Modifier",
  "archive": "Archiver",
-  "restore": "Restaurer",
+  "restor": "Restaurer",
  "open_in_new_tab": "Ouvrir dans un nouvel onglet",
  "delete": "Supprimer",
  "deleting": "Suppression",
@@ -662,7 +662,6 @@
    "epic": "Epic",
    "epics": "Epics",
    "work_item": "Élément de travail",
-    "work_items": "Éléments de travail",
    "sub_work_item": "Sous-élément de travail",
    "add": "Ajouter",
    "warning": "Avertissement",
@@ -845,16 +844,6 @@
    "disconnecting": "Déconnexion",
    "installing": "Installation",
    "install": "Installer",
-    "reset": "Réinitialiser",
-    "live": "En direct",
-    "change_history": "Historique des modifications",
-    "coming_soon": "À venir",
-    "members": "Membres",
-    "you": "Vous",
-    "upgrade_cta": {
-      "higher_subscription": "Passer à une abonnement plus élevé",
-      "talk_to_sales": "Parler à la vente"
-    },
    "category": "Catégorie",
    "categories": "Catégories",
    "saving": "Enregistrement",
@@ -457,7 +457,7 @@
  "Cancel": "キャンセル",
  "edit": "編集",
  "archive": "アーカイブ",
-  "restore": "復元",
+  "restor": "復元",
  "open_in_new_tab": "新しいタブで開く",
  "delete": "削除",
  "deleting": "削除中",
@@ -662,7 +662,6 @@
    "epic": "エピック",
    "epics": "エピック",
    "work_item": "作業項目",
-    "work_items": "作業項目",
    "sub_work_item": "サブ作業項目",
    "add": "追加",
    "warning": "警告",
@@ -845,16 +844,6 @@
    "disconnecting": "切断中",
    "installing": "インストール中",
    "install": "インストール",
-    "reset": "リセット",
-    "live": "ライブ",
-    "change_history": "変更履歴",
-    "coming_soon": "近日公開",
-    "members": "メンバー",
-    "you": "あなた",
-    "upgrade_cta": {
-      "higher_subscription": "高いサブスクリプションにアップグレード",
-      "talk_to_sales": "セールスに連絡"
-    },
    "category": "カテゴリー",
    "categories": "カテゴリーズ",
    "saving": "セービング",
@@ -457,7 +457,7 @@
  "Cancel": "取消",
  "edit": "编辑",
  "archive": "归档",
-  "restore": "恢复",
+  "restor": "恢复",
  "open_in_new_tab": "在新标签页中打开",
  "delete": "删除",
  "deleting": "删除中",
@@ -662,7 +662,6 @@
    "epic": "史诗",
    "epics": "史诗",
    "work_item": "工作项",
-    "work_items": "工作项",
    "sub_work_item": "子工作项",
    "add": "添加",
    "warning": "警告",
@@ -845,16 +844,6 @@
    "disconnecting": "正在断开连接",
    "installing": "正在安装",
    "install": "安装",
-    "reset": "重置",
-    "live": "实时",
-    "change_history": "变更历史",
-    "coming_soon": "即将推出",
-    "members": "成员",
-    "you": "你",
-    "upgrade_cta": {
-      "higher_subscription": "升级到更高订阅",
-      "talk_to_sales": "联系销售"
-    },
    "category": "类别",
    "categories": "类别",
    "saving": "保存中",
@@ -1,6 +1,6 @@
 {
  "name": "@plane/logger",
-  "version": "0.25.0",
+  "version": "0.24.1",
  "description": "Logger shared across multiple apps internally",
  "private": true,
  "main": "./src/index.ts",
@@ -1,6 +1,6 @@
 {
  "name": "@plane/propel",
-  "version": "0.25.0",
+  "version": "0.24.1",
  "private": true,
  "scripts": {
    "lint": "eslint src --ext .ts,.tsx",
@@ -1,6 +1,6 @@
 {
  "name": "@plane/services",
-  "version": "0.25.0",
+  "version": "0.24.1",
  "private": true,
  "main": "./src/index.ts",
  "scripts": {
@@ -1,6 +1,6 @@
 {
  "name": "@plane/shared-state",
-  "version": "0.25.0",
+  "version": "0.24.1",
  "description": "Shared state shared across multiple apps internally",
  "private": true,
  "main": "./src/index.ts",
@@ -1,6 +1,6 @@
 {
  "name": "@plane/tailwind-config",
-  "version": "0.25.0",
+  "version": "0.24.1",
  "description": "common tailwind configuration across monorepo",
  "main": "tailwind.config.js",
  "private": true,
@@ -1,6 +1,6 @@
 {
  "name": "@plane/types",
-  "version": "0.25.0",
+  "version": "0.24.1",
  "private": true,
  "types": "./src/index.d.ts",
  "main": "./src/index.d.ts"
@@ -11,7 +11,6 @@ export type TIssueAttachment = {
  // required
  updated_at: string;
  updated_by: string;
-  created_by: string;
 };

 export type TIssueAttachmentUploadResponse = TFileSignedURLResponse & {
@@ -1,6 +1,6 @@
 {
  "name": "@plane/typescript-config",
-  "version": "0.25.0",
+  "version": "0.24.1",
  "private": true,
  "files": [
    "base.json",
@@ -2,7 +2,7 @@
  "name": "@plane/ui",
  "description": "UI components shared across multiple apps internally",
  "private": true,
-  "version": "0.25.0",
+  "version": "0.24.1",
  "main": "./dist/index.js",
  "module": "./dist/index.mjs",
  "types": "./dist/index.d.ts",
@@ -40,7 +40,6 @@
    "lodash": "^4.17.21",
    "lucide-react": "^0.469.0",
    "react-color": "^2.19.3",
-    "react-day-picker": "9.5.0",
    "react-popper": "^2.3.0",
    "sonner": "^1.4.41",
    "tailwind-merge": "^2.0.0",
@@ -1,78 +0,0 @@
-"use client";
-
-import { ChevronLeft } from "lucide-react";
-import * as React from "react";
-import { DayPicker } from "react-day-picker";
-
-import { cn } from "../helpers";
-
-export type CalendarProps = React.ComponentProps<typeof DayPicker>;
-
-export const Calendar = ({ className, classNames, showOutsideDays = true, ...props }: CalendarProps) => (
-  <DayPicker
-    showOutsideDays={showOutsideDays}
-    className={cn("p-3", className)}
-    // classNames={{
-    //   months: "flex flex-col sm:flex-row space-y-4 sm:space-x-4 sm:space-y-0",
-    //   month: "space-y-4",
-    //   // caption: "flex justify-center pt-1 relative items-center",
-    //   // caption_label: "hidden",
-    //   nav: "box-border absolute top-[1.2rem] right-[1rem] flex items-center",
-    //   button_next:
-    //     "size-[1.25rem] border-none bg-none p-[0.25rem] m-0 cursor-pointer inline-flex items-center justify-center relative appearance-none rounded-sm hover:bg-custom-background-80 focus-visible:bg-custom-background-80",
-    //   button_previous:
-    //     "size-[1.25rem] border-none bg-none p-[0.25rem] m-0 cursor-pointer inline-flex items-center justify-center relative appearance-none rounded-sm hover:bg-custom-background-80 focus-visible:bg-custom-background-80",
-    //   chevron: "m-0 ml-1 size-[0.75rem]",
-    //   // nav_button: cn("h-10 bg-transparent p-0 opacity-50 hover:opacity-100"),
-    //   // nav_button_previous: "absolute left-1",
-    //   // nav_button_next: "absolute right-1",
-    //   table: "w-full border-collapse space-y-1",
-    //   head_row: "flex w-full items-center",
-    //   head_cell: "rounded-md w-10 text-[10px] text-center m-auto font-semibold uppercase",
-    //   row: "flex w-full mt-2",
-    //   cell: cn(
-    //     "relative p-0 text-center text-sm focus-within:relative focus-within:z-20 [&:has([aria-selected])]:bg-custom-primary-100/50 [&:has([aria-selected].day-range-end)]:rounded-r-full",
-    //     props.mode === "range"
-    //       ? "[&:has(>.day-range-end)]:rounded-r-full [&:has(>.day-range-start)]:rounded-l-full first:[&:has([aria-selected])]:rounded-l-full last:[&:has([aria-selected])]:rounded-r-full"
-    //       : "[&:has([aria-selected])]:rounded-full [&:has([aria-selected])]:bg-custom-primary-100 [&:has([aria-selected])]:text-white"
-    //   ),
-    //   // day_button:
-    //   //   "size-10 flex items-center justify-center overflow-hidden box-border m-0 border-2 border-transparent rounded-full",
-    //   day: "size-10 p-0 font-normal aria-selected:opacity-100 rounded-full hover:bg-custom-primary-100/60",
-    //   day_range_start: "day-range-start bg-custom-primary-100 text-white",
-    //   day_range_end: "day-range-end bg-custom-primary-100 text-white",
-    //   day_selected: "",
-    //   day_today:
-    //     "relative after:content-[''] after:absolute after:m-auto after:left-1/3  after:bottom-[6px] after:w-[6px] after:h-[6px] after:bg-custom-primary-100/50 after:rounded-full after:translate-x-1/2 after:translate-y-1/2",
-    //   day_outside: "day-outside",
-    //   day_disabled: "opacity-50 hover:!bg-transparent",
-    //   day_range_middle: "text-black",
-    //   day_hidden: "invisible",
-    //   caption_dropdowns: "inline-flex bg-transparent",
-    //   dropdown_root: "m-0 relative inline-flex items-center",
-    //   dropdowns: "relative inline-flex items-center",
-    //   dropdown:
-    //     "appearance-none absolute z-[2] top-0 bottom-0 left-0 w-full m-0 p-0 opacity-0 border-none text-[1rem] cursor-pointer bg-transparent hover:bg-custom-background-80",
-    //   months_dropdown: "capitalize",
-    //   caption_label:
-    //     "z-[1] inline-flex items-center gap-[0.25rem] m-0 py-0 px-[0.25rem] whitespace-nowrap border-2 border-transparent font-semibold bg-transparent rounded",
-    //   ...classNames,
-    // }}
-    components={{
-      Chevron: ({ className, ...props }) => (
-        <ChevronLeft
-          className={cn(
-            "size-4",
-            {
-              "rotate-180": props.orientation === "right",
-              "-rotate-90": props.orientation === "down",
-            },
-            className
-          )}
-          {...props}
-        />
-      ),
-    }}
-    {...props}
-  />
-);
@@ -3,11 +3,11 @@ import * as React from "react";
 import { ISvgIcons } from "./type";

 export const OverviewIcon: React.FC<ISvgIcons> = ({ className = "text-current", ...rest }) => (
-  <svg viewBox="0 0 12 12" className={className} fill="none" xmlns="http://www.w3.org/2000/svg" {...rest}>
+  <svg viewBox="0 0 16 16" className={className} xmlns="http://www.w3.org/2000/svg" {...rest}>
    <path
      fillRule="evenodd"
      clipRule="evenodd"
-      d="M0.5 1C0.5 0.867392 0.552678 0.740215 0.646447 0.646447C0.740215 0.552678 0.867392 0.5 1 0.5H1.5C7.02267 0.5 11.5 4.97733 11.5 10.5V11C11.5 11.1326 11.4473 11.2598 11.3536 11.3536C11.2598 11.4473 11.1326 11.5 11 11.5H10.5C10.3674 11.5 10.2402 11.4473 10.1464 11.3536C10.0527 11.2598 10 11.1326 10 11V10.5C10 5.80533 6.19467 2 1.5 2H1C0.867392 2 0.740215 1.94732 0.646447 1.85355C0.552678 1.75979 0.5 1.63261 0.5 1.5V1ZM0.5 5.5C0.5 5.36739 0.552678 5.24022 0.646447 5.14645C0.740215 5.05268 0.867392 5 1 5H1.5C2.22227 5 2.93747 5.14226 3.60476 5.41866C4.27205 5.69506 4.87837 6.10019 5.38909 6.61091C5.89981 7.12164 6.30494 7.72795 6.58134 8.39524C6.85774 9.06253 7 9.77773 7 10.5V11C7 11.1326 6.94732 11.2598 6.85355 11.3536C6.75978 11.4473 6.63261 11.5 6.5 11.5H6C5.86739 11.5 5.74022 11.4473 5.64645 11.3536C5.55268 11.2598 5.5 11.1326 5.5 11V10.5C5.5 9.43913 5.07857 8.42172 4.32843 7.67157C3.57828 6.92143 2.56087 6.5 1.5 6.5H1C0.867392 6.5 0.740215 6.44732 0.646447 6.35355C0.552678 6.25978 0.5 6.13261 0.5 6V5.5ZM0.5 10.5C0.5 10.2348 0.605357 9.98043 0.792893 9.79289C0.98043 9.60536 1.23478 9.5 1.5 9.5C1.76522 9.5 2.01957 9.60536 2.20711 9.79289C2.39464 9.98043 2.5 10.2348 2.5 10.5C2.5 10.7652 2.39464 11.0196 2.20711 11.2071C2.01957 11.3946 1.76522 11.5 1.5 11.5C1.23478 11.5 0.98043 11.3946 0.792893 11.2071C0.605357 11.0196 0.5 10.7652 0.5 10.5Z"
+      d="M2.5 3C2.5 2.86739 2.55268 2.74021 2.64645 2.64645C2.74021 2.55268 2.86739 2.5 3 2.5H3.5C9.02267 2.5 13.5 6.97733 13.5 12.5V13C13.5 13.1326 13.4473 13.2598 13.3536 13.3536C13.2598 13.4473 13.1326 13.5 13 13.5H12.5C12.3674 13.5 12.2402 13.4473 12.1464 13.3536C12.0527 13.2598 12 13.1326 12 13V12.5C12 7.80533 8.19467 4 3.5 4H3C2.86739 4 2.74021 3.94732 2.64645 3.85355C2.55268 3.75979 2.5 3.63261 2.5 3.5V3ZM2.5 7.5C2.5 7.36739 2.55268 7.24022 2.64645 7.14645C2.74021 7.05268 2.86739 7 3 7H3.5C4.22227 7 4.93747 7.14226 5.60476 7.41866C6.27205 7.69506 6.87837 8.10019 7.38909 8.61091C7.89981 9.12164 8.30494 9.72795 8.58134 10.3952C8.85774 11.0625 9 11.7777 9 12.5V13C9 13.1326 8.94732 13.2598 8.85355 13.3536C8.75978 13.4473 8.63261 13.5 8.5 13.5H8C7.86739 13.5 7.74022 13.4473 7.64645 13.3536C7.55268 13.2598 7.5 13.1326 7.5 13V12.5C7.5 11.4391 7.07857 10.4217 6.32843 9.67157C5.57828 8.92143 4.56087 8.5 3.5 8.5H3C2.86739 8.5 2.74021 8.44732 2.64645 8.35355C2.55268 8.25978 2.5 8.13261 2.5 8V7.5ZM2.5 12.5C2.5 12.2348 2.60536 11.9804 2.79289 11.7929C2.98043 11.6054 3.23478 11.5 3.5 11.5C3.76522 11.5 4.01957 11.6054 4.20711 11.7929C4.39464 11.9804 4.5 12.2348 4.5 12.5C4.5 12.7652 4.39464 13.0196 4.20711 13.2071C4.01957 13.3946 3.76522 13.5 3.5 13.5C3.23478 13.5 2.98043 13.3946 2.79289 13.2071C2.60536 13.0196 2.5 12.7652 2.5 12.5Z"
      fill="currentColor"
    />
  </svg>
@@ -30,4 +30,3 @@ export * from "./content-wrapper";
 export * from "./card";
 export * from "./tag";
 export * from "./tabs";
-export * from "./calendar";
@@ -1,5 +1,5 @@
-import { Tooltip2 } from "@blueprintjs/popover2";
 import React, { useEffect, useRef, useState } from "react";
+import { Tooltip2 } from "@blueprintjs/popover2";
 // helpers
 import { cn } from "../../helpers";

@@ -23,6 +23,7 @@ export type TPosition =
 interface ITooltipProps {
  tooltipHeading?: string;
  tooltipContent: string | React.ReactNode;
+  jsxContent?: string | React.ReactNode;
  position?: TPosition;
  children: JSX.Element;
  disabled?: boolean;
@@ -38,13 +39,14 @@ export const Tooltip: React.FC<ITooltipProps> = ({
  tooltipContent,
  position = "top",
  children,
+  jsxContent,
  disabled = false,
  className = "",
  openDelay = 200,
  closeDelay,
  isMobile = false,
  renderByDefault = true, //FIXME: tooltip should always render on hover and not by default, this is a temporary fix
-}) => {
+}: ITooltipProps) => {
  const toolTipRef = useRef<HTMLDivElement | null>(null);

  const [shouldRender, setShouldRender] = useState(renderByDefault);
@@ -79,18 +81,22 @@ export const Tooltip: React.FC<ITooltipProps> = ({
      hoverOpenDelay={openDelay}
      hoverCloseDelay={closeDelay}
      content={
-        <div
-          className={cn(
-            "relative block z-50 max-w-xs gap-1 overflow-hidden break-words rounded-md bg-custom-background-100 p-2 text-xs text-custom-text-200 shadow-md",
-            {
-              hidden: isMobile,
-            },
-            className
-          )}
-        >
-          {tooltipHeading && <h5 className="font-medium text-custom-text-100">{tooltipHeading}</h5>}
-          {tooltipContent}
-        </div>
+        jsxContent ? (
+          <>{jsxContent}</>
+        ) : (
+          <div
+            className={cn(
+              "relative block z-50 max-w-xs gap-1 overflow-hidden break-words rounded-md bg-custom-background-100 p-2 text-xs text-custom-text-200 shadow-md",
+              {
+                hidden: isMobile,
+              },
+              className
+            )}
+          >
+            {tooltipHeading && <h5 className="font-medium text-custom-text-100">{tooltipHeading}</h5>}
+            {tooltipContent}
+          </div>
+        )
      }
      position={position}
      renderTarget={({
@@ -1,6 +1,6 @@
 {
  "name": "@plane/utils",
-  "version": "0.25.0",
+  "version": "0.24.1",
  "description": "Helper functions shared across multiple apps internally",
  "private": true,
  "main": "./dist/index.js",
@@ -1,6 +1,6 @@
 import React from "react";
 // editor
-import { EditorRefApi, ILiteTextEditor, LiteTextEditorWithRef, TFileHandler } from "@plane/editor";
+import { EditorRefApi, ILiteTextEditor, LiteTextEditorWithRef } from "@plane/editor";
 // components
 import { EditorMentionsRoot, IssueCommentToolbar } from "@/components/editor";
 // helpers
@@ -14,7 +14,7 @@ interface LiteTextEditorWrapperProps
  workspaceId: string;
  isSubmitting?: boolean;
  showSubmitButton?: boolean;
-  uploadFile: TFileHandler["upload"];
+  uploadFile: (file: File) => Promise<string>;
 }

 export const LiteTextEditor = React.forwardRef<EditorRefApi, LiteTextEditorWrapperProps>((props, ref) => {
@@ -12,17 +12,15 @@ type LiteTextReadOnlyEditorWrapperProps = Omit<
  "disabledExtensions" | "fileHandler" | "mentionHandler"
 > & {
  anchor: string;
-  workspaceId: string;
 };

 export const LiteTextReadOnlyEditor = React.forwardRef<EditorReadOnlyRefApi, LiteTextReadOnlyEditorWrapperProps>(
-  ({ anchor, workspaceId, ...props }, ref) => (
+  ({ anchor, ...props }, ref) => (
    <LiteTextReadOnlyEditorWithRef
      ref={ref}
      disabledExtensions={[]}
      fileHandler={getReadOnlyEditorFileHandlers({
        anchor,
-        workspaceId,
      })}
      mentionHandler={{
        renderComponent: (props) => <EditorMentionsRoot {...props} />,
@@ -1,6 +1,6 @@
 import React, { forwardRef } from "react";
 // editor
-import { EditorRefApi, IRichTextEditor, RichTextEditorWithRef, TFileHandler } from "@plane/editor";
+import { EditorRefApi, IRichTextEditor, RichTextEditorWithRef } from "@plane/editor";
 // components
 import { EditorMentionsRoot } from "@/components/editor";
 // helpers
@@ -8,13 +8,11 @@ import { getEditorFileHandlers } from "@/helpers/editor.helper";

 interface RichTextEditorWrapperProps
  extends Omit<IRichTextEditor, "disabledExtensions" | "fileHandler" | "mentionHandler"> {
-  anchor: string;
-  uploadFile: TFileHandler["upload"];
-  workspaceId: string;
+  uploadFile: (file: File) => Promise<string>;
 }

 export const RichTextEditor = forwardRef<EditorRefApi, RichTextEditorWrapperProps>((props, ref) => {
-  const { anchor, containerClassName, uploadFile, workspaceId, ...rest } = props;
+  const { containerClassName, uploadFile, ...rest } = props;

  return (
    <RichTextEditorWithRef
@@ -24,9 +22,9 @@ export const RichTextEditor = forwardRef<EditorRefApi, RichTextEditorWrapperProp
      ref={ref}
      disabledExtensions={[]}
      fileHandler={getEditorFileHandlers({
-        anchor,
        uploadFile,
-        workspaceId,
+        workspaceId: "",
+        anchor: "",
      })}
      {...rest}
      containerClassName={containerClassName}
@@ -12,17 +12,15 @@ type RichTextReadOnlyEditorWrapperProps = Omit<
  "disabledExtensions" | "fileHandler" | "mentionHandler"
 > & {
  anchor: string;
-  workspaceId: string;
 };

 export const RichTextReadOnlyEditor = React.forwardRef<EditorReadOnlyRefApi, RichTextReadOnlyEditorWrapperProps>(
-  ({ anchor, workspaceId, ...props }, ref) => (
+  ({ anchor, ...props }, ref) => (
    <RichTextReadOnlyEditorWithRef
      ref={ref}
      disabledExtensions={[]}
      fileHandler={getReadOnlyEditorFileHandlers({
        anchor,
-        workspaceId,
      })}
      mentionHandler={{
        renderComponent: (props) => <EditorMentionsRoot {...props} />,
@@ -90,7 +90,7 @@ export const AddComment: React.FC<Props> = observer((props) => {
              onChange={(comment_json, comment_html) => onChange(comment_html)}
              isSubmitting={isSubmitting}
              placeholder="Add comment..."
-              uploadFile={async (blockId, file) => {
+              uploadFile={async (file) => {
                const { asset_id } = await uploadCommentAsset(file, anchor);
                setUploadAssetIds((prev) => [...prev, asset_id]);
                return asset_id;
@@ -112,7 +112,7 @@ export const CommentCard: React.FC<Props> = observer((props) => {
                    onChange={(comment_json, comment_html) => onChange(comment_html)}
                    isSubmitting={isSubmitting}
                    showSubmitButton={false}
-                    uploadFile={async (blockId, file) => {
+                    uploadFile={async (file) => {
                      const { asset_id } = await uploadCommentAsset(file, anchor, comment.id);
                      return asset_id;
                    }}
@@ -140,7 +140,6 @@ export const CommentCard: React.FC<Props> = observer((props) => {
          <div className={`${isEditing ? "hidden" : ""}`}>
            <LiteTextReadOnlyEditor
              anchor={anchor}
-              workspaceId={workspaceID?.toString() ?? ""}
              ref={showEditorRef}
              id={comment.id}
              initialValue={comment.comment_html}
@@ -13,9 +13,9 @@ type Props = {

 export const PeekOverviewIssueDetails: React.FC<Props> = observer((props) => {
  const { anchor, issueDetails } = props;
-  // store hooks
-  const { project_details, workspace: workspaceID } = usePublish(anchor);
-  // derived values
+
+  const { project_details } = usePublish(anchor);
+
  const description = issueDetails.description_html;

  return (
@@ -35,7 +35,6 @@ export const PeekOverviewIssueDetails: React.FC<Props> = observer((props) => {
              ? "<p></p>"
              : description
          }
-          workspaceId={workspaceID?.toString() ?? ""}
        />
      )}
      <IssueReactions anchor={anchor} />
@@ -1,6 +1,6 @@
 // plane internal
 import { MAX_FILE_SIZE } from "@plane/constants";
-import { TFileHandler, TReadOnlyFileHandler } from "@plane/editor";
+import { TFileHandler } from "@plane/editor";
 import { SitesFileService } from "@plane/services";
 // helpers
 import { getFileURL } from "@/helpers/file.helper";
@@ -18,35 +18,10 @@ export const getEditorAssetSrc = (anchor: string, assetId: string): string | und

 type TArgs = {
  anchor: string;
-  uploadFile: TFileHandler["upload"];
+  uploadFile: (file: File) => Promise<string>;
  workspaceId: string;
 };

-/**
- * @description this function returns the file handler required by the read-only editors
- */
-export const getReadOnlyEditorFileHandlers = (args: Pick<TArgs, "anchor" | "workspaceId">): TReadOnlyFileHandler => {
-  const { anchor, workspaceId } = args;
-
-  return {
-    getAssetSrc: async (path) => {
-      if (!path) return "";
-      if (path?.startsWith("http")) {
-        return path;
-      } else {
-        return getEditorAssetSrc(anchor, path) ?? "";
-      }
-    },
-    restore: async (src: string) => {
-      if (src?.startsWith("http")) {
-        await sitesFileService.restoreOldEditorAsset(workspaceId, src);
-      } else {
-        await sitesFileService.restoreNewAsset(anchor, src);
-      }
-    },
-  };
-};
-
 /**
 * @description this function returns the file handler required by the editors
 * @param {TArgs} args
@@ -55,11 +30,14 @@ export const getEditorFileHandlers = (args: TArgs): TFileHandler => {
  const { anchor, uploadFile, workspaceId } = args;

  return {
-    ...getReadOnlyEditorFileHandlers({
-      anchor,
-      workspaceId,
-    }),
-    assetsUploadStatus: {},
+    getAssetSrc: async (path) => {
+      if (!path) return "";
+      if (path?.startsWith("http")) {
+        return path;
+      } else {
+        return getEditorAssetSrc(anchor, path) ?? "";
+      }
+    },
    upload: uploadFile,
    delete: async (src: string) => {
      if (src?.startsWith("http")) {
@@ -68,9 +46,36 @@ export const getEditorFileHandlers = (args: TArgs): TFileHandler => {
        await sitesFileService.deleteNewAsset(getEditorAssetSrc(anchor, src) ?? "");
      }
    },
+    restore: async (src: string) => {
+      if (src?.startsWith("http")) {
+        await sitesFileService.restoreOldEditorAsset(workspaceId, src);
+      } else {
+        await sitesFileService.restoreNewAsset(anchor, src);
+      }
+    },
    cancel: sitesFileService.cancelUpload,
    validation: {
      maxFileSize: MAX_FILE_SIZE,
    },
  };
 };
+
+/**
+ * @description this function returns the file handler required by the read-only editors
+ */
+export const getReadOnlyEditorFileHandlers = (
+  args: Pick<TArgs, "anchor">
+): { getAssetSrc: TFileHandler["getAssetSrc"] } => {
+  const { anchor } = args;
+
+  return {
+    getAssetSrc: async (path) => {
+      if (!path) return "";
+      if (path?.startsWith("http")) {
+        return path;
+      } else {
+        return getEditorAssetSrc(anchor, path) ?? "";
+      }
+    },
+  };
+};
@@ -1,6 +1,6 @@
 {
  "name": "space",
-  "version": "0.25.0",
+  "version": "0.24.1",
  "private": true,
  "scripts": {
    "dev": "turbo run develop",
@@ -3,8 +3,7 @@
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 import { Briefcase } from "lucide-react";
-// plane imports
-import { useTranslation } from "@plane/i18n";
+// ui
 import { Breadcrumbs, LayersIcon, Header, Logo } from "@plane/ui";
 // components
 import { BreadcrumbLink } from "@/components/common";
@@ -18,7 +17,6 @@ export const ProjectIssueDetailsHeader = observer(() => {
  const router = useAppRouter();
  const { workspaceSlug, workItem } = useParams();
  // store hooks
-  const { t } = useTranslation();
  const { getProjectById, loader } = useProject();
  const {
    issue: { getIssueById, getIssueIdByIdentifier },
@@ -63,7 +61,7 @@ export const ProjectIssueDetailsHeader = observer(() => {
              link={
                <BreadcrumbLink
                  href={`/${workspaceSlug}/projects/${projectId}/issues`}
-                  label={t("common.work_items")}
+                  label="Issues"
                  icon={<LayersIcon className="h-4 w-4 text-custom-text-300" />}
                />
              }
@@ -14,7 +14,6 @@ import { CreateProjectModal } from "@/components/project";
 import { SidebarProjectsListItem } from "@/components/workspace";
 // hooks
 import { orderJoinedProjects } from "@/helpers/project.helper";
-import { copyUrlToClipboard } from "@/helpers/string.helper";
 import { useAppTheme, useProject, useUserPermissions } from "@/hooks/store";
 import useExtendedSidebarOutsideClickDetector from "@/hooks/use-extended-sidebar-overview-outside-click";
 import { TProject } from "@/plane-web/types";
@@ -86,15 +85,6 @@ export const ExtendedProjectSidebar = observer(() => {
    "extended-project-sidebar-toggle"
  );

-  const handleCopyText = (projectId: string) => {
-    copyUrlToClipboard(`${workspaceSlug}/projects/${projectId}/issues`).then(() => {
-      setToast({
-        type: TOAST_TYPE.SUCCESS,
-        title: t("link_copied"),
-        message: t("project_link_copied_to_clipboard"),
-      });
-    });
-  };
  return (
    <>
      {workspaceSlug && (
@@ -108,16 +98,16 @@ export const ExtendedProjectSidebar = observer(() => {
      <div
        ref={extendedProjectSidebarRef}
        className={cn(
-          "fixed top-0 h-full z-[19] flex flex-col gap-2 w-[300px] transform transition-all duration-300 ease-in-out bg-custom-sidebar-background-100 border-r border-custom-sidebar-border-200 shadow-md",
+          "fixed top-0 h-full z-[19] flex flex-col gap-2 w-[300px] transform transition-all duration-300 ease-in-out bg-custom-sidebar-background-100 border-r border-custom-sidebar-border-200 p-4 shadow-md",
          {
-            "translate-x-0 opacity-100 pointer-events-auto": extendedProjectSidebarCollapsed,
-            "-translate-x-full opacity-0 pointer-events-none": !extendedProjectSidebarCollapsed,
+            "translate-x-0 opacity-100": extendedProjectSidebarCollapsed,
+            "-translate-x-full opacity-0": !extendedProjectSidebarCollapsed,
            "left-[70px]": sidebarCollapsed,
            "left-[250px]": !sidebarCollapsed,
          }
        )}
      >
-        <div className="flex flex-col gap-1 w-full sticky top-4 pt-0 px-4">
+        <div className="flex flex-col gap-1 w-full">
          <div className="flex items-center justify-between">
            <span className="text-sm font-semibold text-custom-text-300 py-1.5">Projects</span>
            {isAuthorizedUser && (
@@ -145,18 +135,17 @@ export const ExtendedProjectSidebar = observer(() => {
            />
          </div>
        </div>
-        <div className="flex flex-col gap-0.5 overflow-x-hidden overflow-y-auto vertical-scrollbar scrollbar-sm flex-grow mt-4 px-4">
+        <div className="flex flex-col gap-0.5">
          {filteredProjects.map((projectId, index) => (
            <SidebarProjectsListItem
              key={projectId}
              projectId={projectId}
-              handleCopyText={() => handleCopyText(projectId)}
+              handleCopyText={() => {}}
              projectListType={"JOINED"}
              disableDrag={false}
              disableDrop={false}
              isLastChild={index === joinedProjects.length - 1}
              handleOnProjectDrop={handleOnProjectDrop}
-              renderInExtendedSidebar
            />
          ))}
        </div>
@@ -104,10 +104,10 @@ export const ExtendedAppSidebar = observer(() => {
    <div
      ref={extendedSidebarRef}
      className={cn(
-        "fixed top-0 h-full z-[19] flex flex-col gap-0.5 w-[300px] transform transition-all duration-300 ease-in-out bg-custom-sidebar-background-100 border-r border-custom-sidebar-border-200 p-4 shadow-md pb-6",
+        "fixed top-0 h-full z-[19] flex flex-col w-[300px] transform transition-all duration-300 ease-in-out bg-custom-sidebar-background-100 border-r border-custom-sidebar-border-200 p-4 shadow-md",
        {
-          "translate-x-0 opacity-100 pointer-events-auto": extendedSidebarCollapsed,
-          "-translate-x-full opacity-0 pointer-events-none": !extendedSidebarCollapsed,
+          "translate-x-0 opacity-100": extendedSidebarCollapsed,
+          "-translate-x-full opacity-0": !extendedSidebarCollapsed,
          "left-[70px]": sidebarCollapsed,
          "left-[250px]": !sidebarCollapsed,
        }
@@ -29,7 +29,7 @@ const CycleDetailPage = observer(() => {
  const { setValue, storedValue } = useLocalStorage("cycle_sidebar_collapsed", "false");

  useCyclesDetails({
-    workspaceSlug: workspaceSlug?.toString(),
+    workspaceSlug: workspaceSlug.toString(),
    projectId: projectId.toString(),
    cycleId: cycleId.toString(),
  });
@@ -6,7 +6,7 @@ import Link from "next/link";
 import { useParams } from "next/navigation";
 import useSWR from "swr";
 // plane types
-import { TSearchEntityRequestPayload, TWebhookConnectionQueryParams } from "@plane/types";
+import { TSearchEntityRequestPayload } from "@plane/types";
 import { EFileAssetType } from "@plane/types/src/enums";
 // plane ui
 import { getButtonStyling } from "@plane/ui";
@@ -17,32 +17,31 @@ import { LogoSpinner } from "@/components/common";
 import { PageHead } from "@/components/core";
 import { IssuePeekOverview } from "@/components/issues";
 import { PageRoot, TPageRootConfig, TPageRootHandlers } from "@/components/pages";
+// helpers
+import { getEditorFileHandlers } from "@/helpers/editor.helper";
 // hooks
-import { useEditorConfig } from "@/hooks/editor";
-import { useEditorAsset, useWorkspace } from "@/hooks/store";
+import { useProjectPage, useProjectPages, useWorkspace } from "@/hooks/store";
 // plane web hooks
-import { EPageStoreType, usePage, usePageStore } from "@/plane-web/hooks/store";
+import { useFileSize } from "@/plane-web/hooks/use-file-size";
 // plane web services
 import { WorkspaceService } from "@/plane-web/services";
 // services
+import { FileService } from "@/services/file.service";
 import { ProjectPageService, ProjectPageVersionService } from "@/services/page";
 const workspaceService = new WorkspaceService();
+const fileService = new FileService();
 const projectPageService = new ProjectPageService();
 const projectPageVersionService = new ProjectPageVersionService();

 const PageDetailsPage = observer(() => {
  const { workspaceSlug, projectId, pageId } = useParams();
  // store hooks
-  const { createPage, fetchPageDetails } = usePageStore(EPageStoreType.PROJECT);
-  const page = usePage({
-    pageId: pageId?.toString() ?? "",
-    storeType: EPageStoreType.PROJECT,
-  });
+  const { createPage, getPageById } = useProjectPages();
+  const page = useProjectPage(pageId?.toString() ?? "");
  const { getWorkspaceBySlug } = useWorkspace();
-  const { uploadEditorAsset } = useEditorAsset();
  // derived values
  const workspaceId = workspaceSlug ? (getWorkspaceBySlug(workspaceSlug.toString())?.id ?? "") : "";
-  const { canCurrentUserAccessPage, id, name, updateDescription } = page ?? {};
+  const { canCurrentUserAccessPage, id, name, updateDescription } = page;
  // entity search handler
  const fetchEntityCallback = useCallback(
    async (payload: TSearchEntityRequestPayload) =>
@@ -52,13 +51,13 @@ const PageDetailsPage = observer(() => {
      }),
    [projectId, workspaceSlug]
  );
-  // editor config
-  const { getEditorFileHandlers } = useEditorConfig();
+  // file size
+  const { maxFileSize } = useFileSize();
  // fetch page details
  const { error: pageDetailsError } = useSWR(
    workspaceSlug && projectId && pageId ? `PAGE_DETAILS_${pageId}` : null,
    workspaceSlug && projectId && pageId
-      ? () => fetchPageDetails(workspaceSlug?.toString(), projectId?.toString(), pageId.toString())
+      ? () => getPageById(workspaceSlug?.toString(), projectId?.toString(), pageId.toString())
      : null,
    {
      revalidateIfStale: true,
@@ -75,8 +74,8 @@ const PageDetailsPage = observer(() => {
        return await projectPageVersionService.fetchAllVersions(workspaceSlug.toString(), projectId.toString(), pageId);
      },
      fetchDescriptionBinary: async () => {
-        if (!workspaceSlug || !projectId || !id) return;
-        return await projectPageService.fetchDescriptionBinary(workspaceSlug.toString(), projectId.toString(), id);
+        if (!workspaceSlug || !projectId || !page.id) return;
+        return await projectPageService.fetchDescriptionBinary(workspaceSlug.toString(), projectId.toString(), page.id);
      },
      fetchEntity: fetchEntityCallback,
      fetchVersionDetails: async (pageId, versionId) => {
@@ -89,42 +88,38 @@ const PageDetailsPage = observer(() => {
        );
      },
      getRedirectionLink: (pageId) => `/${workspaceSlug}/projects/${projectId}/pages/${pageId}`,
-      updateDescription: updateDescription ?? (async () => {}),
+      updateDescription,
    }),
-    [createPage, fetchEntityCallback, id, projectId, updateDescription, workspaceSlug]
+    [createPage, fetchEntityCallback, page.id, projectId, updateDescription, workspaceSlug]
  );
  // page root config
  const pageRootConfig: TPageRootConfig = useMemo(
    () => ({
      fileHandler: getEditorFileHandlers({
+        maxFileSize,
        projectId: projectId?.toString() ?? "",
-        uploadFile: async (blockId, file) => {
-          const { asset_id } = await uploadEditorAsset({
-            blockId,
-            data: {
+        uploadFile: async (file) => {
+          const { asset_id } = await fileService.uploadProjectAsset(
+            workspaceSlug?.toString() ?? "",
+            projectId?.toString() ?? "",
+            {
              entity_identifier: id ?? "",
              entity_type: EFileAssetType.PAGE_DESCRIPTION,
            },
-            file,
-            projectId: projectId?.toString() ?? "",
-            workspaceSlug: workspaceSlug?.toString() ?? "",
-          });
+            file
+          );
          return asset_id;
        },
        workspaceId,
        workspaceSlug: workspaceSlug?.toString() ?? "",
      }),
+      webhookConnectionParams: {
+        documentType: "project_page",
+        projectId: projectId?.toString() ?? "",
+        workspaceSlug: workspaceSlug?.toString() ?? "",
+      },
    }),
-    [getEditorFileHandlers, id, projectId, uploadEditorAsset, workspaceId, workspaceSlug]
-  );
-
-  const webhookConnectionParams: TWebhookConnectionQueryParams = useMemo(
-    () => ({
-      documentType: "project_page",
-      projectId: projectId?.toString() ?? "",
-      workspaceSlug: workspaceSlug?.toString() ?? "",
-    }),
-    [projectId, workspaceSlug]
+    [id, maxFileSize, projectId, workspaceId, workspaceSlug]
  );

  if ((!page || !id) && !pageDetailsError)
@@ -150,8 +145,6 @@ const PageDetailsPage = observer(() => {
      </div>
    );

-  if (!page) return null;
-
  return (
    <>
      <PageHead title={name} />
@@ -161,8 +154,6 @@ const PageDetailsPage = observer(() => {
            config={pageRootConfig}
            handlers={pageRootHandlers}
            page={page}
-            storeType={EPageStoreType.PROJECT}
-            webhookConnectionParams={webhookConnectionParams}
            workspaceSlug={workspaceSlug?.toString() ?? ""}
          />
          <IssuePeekOverview />
@@ -15,13 +15,11 @@ import { PageEditInformationPopover } from "@/components/pages";
 import { convertHexEmojiToDecimal } from "@/helpers/emoji.helper";
 import { getPageName } from "@/helpers/page.helper";
 // hooks
-import { useProject } from "@/hooks/store";
+import { useProjectPage, useProject } from "@/hooks/store";
 import { usePlatformOS } from "@/hooks/use-platform-os";
 // plane web components
 import { ProjectBreadcrumb } from "@/plane-web/components/breadcrumbs";
 import { PageDetailsHeaderExtraActions } from "@/plane-web/components/pages";
-// plane web hooks
-import { EPageStoreType, usePage } from "@/plane-web/hooks/store";

 export interface IPagesHeaderProps {
  showButton?: boolean;
@@ -34,12 +32,7 @@ export const PageDetailsHeader = observer(() => {
  const [isOpen, setIsOpen] = useState(false);
  // store hooks
  const { currentProjectDetails, loader } = useProject();
-  const page = usePage({
-    pageId: pageId?.toString() ?? "",
-    storeType: EPageStoreType.PROJECT,
-  });
-  if (!page) return null;
-  // derived values
+  const page = useProjectPage(pageId?.toString() ?? "");
  const { name, logo_props, updatePageLogo, isContentEditable } = page;
  // use platform
  const { isMobile } = usePlatformOS();
@@ -13,11 +13,9 @@ import { Breadcrumbs, Button, Header, setToast, TOAST_TYPE } from "@plane/ui";
 // helpers
 import { BreadcrumbLink } from "@/components/common";
 // hooks
-import { useEventTracker, useProject } from "@/hooks/store";
+import { useEventTracker, useProject, useProjectPages } from "@/hooks/store";
 // plane web
 import { ProjectBreadcrumb } from "@/plane-web/components/breadcrumbs";
-// plane web hooks
-import { EPageStoreType, usePageStore } from "@/plane-web/hooks/store";

 export const PagesListHeader = observer(() => {
  // states
@@ -29,7 +27,7 @@ export const PagesListHeader = observer(() => {
  const pageType = searchParams.get("type");
  // store hooks
  const { currentProjectDetails, loader } = useProject();
-  const { canCurrentUserCreatePage, createPage } = usePageStore(EPageStoreType.PROJECT);
+  const { canCurrentUserCreatePage, createPage } = useProjectPages();
  const { setTrackElement } = useEventTracker();
  // handle page create
  const handleCreatePage = async () => {
@@ -14,8 +14,6 @@ import { PagesListRoot, PagesListView } from "@/components/pages";
 import { useProject, useUserPermissions } from "@/hooks/store";
 import { useAppRouter } from "@/hooks/use-app-router";
 import { useResolvedAssetPath } from "@/hooks/use-resolved-asset-path";
-// plane web hooks
-import { EPageStoreType } from "@/plane-web/hooks/store";

 const ProjectPagesPage = observer(() => {
  // router
@@ -65,12 +63,11 @@ const ProjectPagesPage = observer(() => {
    <>
      <PageHead title={pageTitle} />
      <PagesListView
-        pageType={currentPageType()}
-        projectId={projectId.toString()}
-        storeType={EPageStoreType.PROJECT}
        workspaceSlug={workspaceSlug.toString()}
+        projectId={projectId.toString()}
+        pageType={currentPageType()}
      >
-        <PagesListRoot pageType={currentPageType()} storeType={EPageStoreType.PROJECT} />
+        <PagesListRoot pageType={currentPageType()} />
      </PagesListView>
    </>
  );
@@ -90,9 +90,11 @@ export const AppSidebar: FC = observer(() => {
            })}
          >
            <SidebarMenuItems />
-            {sidebarCollapsed && (
-              <hr className="flex-shrink-0 border-custom-sidebar-border-300 h-[0.5px] w-3/5 mx-auto my-1" />
-            )}
+            <hr
+              className={cn("flex-shrink-0 border-custom-sidebar-border-300 h-[0.5px] w-3/5 mx-auto my-1", {
+                "opacity-0": !sidebarCollapsed,
+              })}
+            />
            {/* Favorites Menu */}
            {canPerformWorkspaceMemberActions && !isFavoriteEmpty && <SidebarFavoritesMenu />}
            {/* Teams List */}
@@ -1 +0,0 @@
-export * from "./work-item-actions";
@@ -1,43 +0,0 @@
-import { Command } from "cmdk";
-import { observer } from "mobx-react";
-import { Check } from "lucide-react";
-// plane imports
-import { Spinner, StateGroupIcon } from "@plane/ui";
-// store hooks
-import { useProjectState } from "@/hooks/store";
-
-export type TChangeWorkItemStateListProps = {
-  projectId: string | null;
-  currentStateId: string | null;
-  handleStateChange: (stateId: string) => void;
-};
-
-export const ChangeWorkItemStateList = observer((props: TChangeWorkItemStateListProps) => {
-  const { projectId, currentStateId, handleStateChange } = props;
-  // store hooks
-  const { getProjectStates } = useProjectState();
-  // derived values
-  const projectStates = getProjectStates(projectId);
-
-  return (
-    <>
-      {projectStates ? (
-        projectStates.length > 0 ? (
-          projectStates.map((state) => (
-            <Command.Item key={state.id} onSelect={() => handleStateChange(state.id)} className="focus:outline-none">
-              <div className="flex items-center space-x-3">
-                <StateGroupIcon stateGroup={state.group} color={state.color} height="16px" width="16px" />
-                <p>{state.name}</p>
-              </div>
-              <div>{state.id === currentStateId && <Check className="h-3 w-3" />}</div>
-            </Command.Item>
-          ))
-        ) : (
-          <div className="text-center">No states found</div>
-        )
-      ) : (
-        <Spinner />
-      )}
-    </>
-  );
-});
@@ -1 +0,0 @@
-export * from "./change-state-list";
@@ -1,6 +1,6 @@
-import { FC } from "react";
 import { observer } from "mobx-react";
 import { useParams, usePathname } from "next/navigation";
+import useSWR from "swr";
 // components
 import { BulkDeleteIssuesModal } from "@/components/core";
 import { CreateUpdateIssueModal, DeleteIssueModal } from "@/components/issues";
@@ -10,25 +10,17 @@ import { useCommandPalette, useIssueDetail, useUser } from "@/hooks/store";
 import { useAppRouter } from "@/hooks/use-app-router";
 import { useIssuesStore } from "@/hooks/use-issue-layout-store";

-export type TIssueLevelModalsProps = {
-  projectId: string | undefined;
-  issueId: string | undefined;
-};
-
-export const IssueLevelModals: FC<TIssueLevelModalsProps> = observer((props) => {
-  const { projectId, issueId } = props;
+export const IssueLevelModals = observer(() => {
  // router
  const pathname = usePathname();
-  const { workspaceSlug, cycleId, moduleId } = useParams();
+  const { workspaceSlug, projectId: paramsProjectId, workItem, cycleId, moduleId } = useParams();
  const router = useAppRouter();
  // store hooks
  const { data: currentUser } = useUser();
-  const {
-    issue: { getIssueById },
-  } = useIssueDetail();
  const {
    issues: { removeIssue },
  } = useIssuesStore();
+  const { fetchIssueWithIdentifier } = useIssueDetail();
  const {
    isCreateIssueModalOpen,
    toggleCreateIssueModal,
@@ -38,9 +30,21 @@ export const IssueLevelModals: FC<TIssueLevelModalsProps> = observer((props) =>
    toggleBulkDeleteIssueModal,
  } = useCommandPalette();
  // derived values
-  const issueDetails = issueId ? getIssueById(issueId) : undefined;
  const isDraftIssue = pathname?.includes("draft-issues") || false;

+  const projectIdentifier = workItem?.toString().split("-")[0];
+  const sequence_id = workItem?.toString().split("-")[1];
+
+  const { data: issueDetails } = useSWR(
+    workspaceSlug && workItem ? `ISSUE_DETAIL_${workspaceSlug}_${projectIdentifier}_${sequence_id}` : null,
+    workspaceSlug && workItem
+      ? () => fetchIssueWithIdentifier(workspaceSlug.toString(), projectIdentifier, sequence_id)
+      : null
+  );
+
+  const issueId = issueDetails?.id;
+  const projectId = paramsProjectId ?? issueDetails?.project_id;
+
  return (
    <>
      <CreateUpdateIssueModal
@@ -6,8 +6,6 @@ import { CreatePageModal } from "@/components/pages";
 import { CreateUpdateProjectViewModal } from "@/components/views";
 // hooks
 import { useCommandPalette } from "@/hooks/store";
-// plane web hooks
-import { EPageStoreType } from "@/plane-web/hooks/store";

 export type TProjectLevelModalsProps = {
  workspaceSlug: string;
@@ -55,7 +53,6 @@ export const ProjectLevelModals = observer((props: TProjectLevelModalsProps) =>
        pageAccess={createPageModal.pageAccess}
        handleModalClose={() => toggleCreatePageModal({ isOpen: false })}
        redirectionEnabled
-        storeType={EPageStoreType.PROJECT}
      />
    </>
  );
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
pablohashescobar	2fbf0d6eda	fix: uuid validation error	2025-02-19 16:36:58 +05:30
pablohashescobar	4e381c0943	fix: module activity	2025-02-18 21:16:20 +05:30
pablohashescobar	563ca2ff07	fix: meta endpoint to return correct error message	2025-02-18 21:04:31 +05:30
pablohashescobar	76c80ced14	fix: error handling for db based integrity errors	2025-02-18 18:51:13 +05:30