feat: created new cycle analytics

fix: yjs dependencies revert
fix: disable turbo telemetry on live service
2024-09-17 14:41:07 +05:30 · 2024-09-16 21:06:40 +05:30 · 2024-09-16 20:58:35 +05:30 · 2024-09-16 19:36:20 +05:30 · 2024-09-16 19:22:47 +05:30 · 2024-09-16 18:56:28 +05:30
337 changed files with 5245 additions and 3381 deletions
@@ -8,7 +8,6 @@ on:

 env:
  CURRENT_BRANCH: ${{ github.ref_name }}
-  SOURCE_BRANCH: ${{ vars.SYNC_SOURCE_BRANCH_NAME }} # The sync branch such as "sync/ce"
  TARGET_BRANCH: ${{ vars.SYNC_TARGET_BRANCH_NAME }} # The target branch that you would like to merge changes like develop
  GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} # Personal access token required to modify contents and workflows
  REVIEWER: ${{ vars.SYNC_PR_REVIEWER }}
@@ -16,22 +15,7 @@ env:
  ACCOUNT_USER_EMAIL: ${{ vars.ACCOUNT_USER_EMAIL }}

 jobs:
-  Check_Branch:
-    runs-on: ubuntu-latest
-    outputs:
-      BRANCH_MATCH: ${{ steps.check-branch.outputs.MATCH }}
-    steps:
-      - name: Check if current branch matches the secret
-        id: check-branch
-        run: |
-          if [ "$CURRENT_BRANCH" = "$SOURCE_BRANCH" ]; then
-            echo "MATCH=true" >> $GITHUB_OUTPUT
-          else
-            echo "MATCH=false" >> $GITHUB_OUTPUT
-          fi
  Create_PR:
-    if: ${{ needs.Check_Branch.outputs.BRANCH_MATCH == 'true' }}
-    needs: [Check_Branch]
    runs-on: ubuntu-latest
    permissions:
      pull-requests: write
@@ -59,11 +43,11 @@ jobs:
      - name: Create PR to Target Branch
        run: |
          # get all pull requests and check if there is already a PR
-          PR_EXISTS=$(gh pr list --base $TARGET_BRANCH --head $SOURCE_BRANCH --state open --json number | jq '.[] | .number')
+          PR_EXISTS=$(gh pr list --base $TARGET_BRANCH --head $CURRENT_BRANCH --state open --json number | jq '.[] | .number')
          if [ -n "$PR_EXISTS" ]; then
            echo "Pull Request already exists: $PR_EXISTS"
          else
            echo "Creating new pull request"
-            PR_URL=$(gh pr create --base $TARGET_BRANCH --head $SOURCE_BRANCH --title "sync: community changes" --body "")
+            PR_URL=$(gh pr create --base $TARGET_BRANCH --head $CURRENT_BRANCH --title "sync: community changes" --body "")
            echo "Pull Request created: $PR_URL"
          fi
@@ -35,8 +35,9 @@ jobs:
        env:
          GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
        run: |
+          RUN_ID="${{ github.run_id }}"
          TARGET_REPO="${{ vars.SYNC_TARGET_REPO }}"
-          TARGET_BRANCH="${{ vars.SYNC_TARGET_BRANCH_NAME }}"
+          TARGET_BRANCH="sync/${RUN_ID}"
          SOURCE_BRANCH="${{ env.SOURCE_BRANCH_NAME }}"

          git checkout $SOURCE_BRANCH
@@ -2,11 +2,12 @@

 import { FC, useEffect, useRef } from "react";
 import { observer } from "mobx-react";
-// hooks
-import { HelpSection, SidebarMenu, SidebarDropdown } from "@/components/admin-sidebar";
-import { useTheme } from "@/hooks/store";
-import useOutsideClickDetector from "@/hooks/use-outside-click-detector";
+// plane helpers
+import { useOutsideClickDetector } from "@plane/helpers";
 // components
+import { HelpSection, SidebarMenu, SidebarDropdown } from "@/components/admin-sidebar";
+// hooks
+import { useTheme } from "@/hooks/store";

 export interface IInstanceSidebar {}

@@ -1,21 +0,0 @@
-"use client";
-
-import React, { useEffect } from "react";
-
-const useOutsideClickDetector = (ref: React.RefObject<HTMLElement>, callback: () => void) => {
-  const handleClick = (event: MouseEvent) => {
-    if (ref.current && !ref.current.contains(event.target as Node)) {
-      callback();
-    }
-  };
-
-  useEffect(() => {
-    document.addEventListener("mousedown", handleClick);
-
-    return () => {
-      document.removeEventListener("mousedown", handleClick);
-    };
-  });
-};
-
-export default useOutsideClickDetector;
@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />

 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
@@ -12,9 +12,10 @@
  },
  "dependencies": {
    "@headlessui/react": "^1.7.19",
+    "@plane/constants": "*",
+    "@plane/helpers": "*",
    "@plane/types": "*",
    "@plane/ui": "*",
-    "@plane/constants": "*",
    "@tailwindcss/typography": "^0.5.9",
    "@types/lodash": "^4.17.0",
    "autoprefixer": "10.4.14",
@@ -45,6 +46,6 @@
    "eslint-config-custom": "*",
    "tailwind-config-custom": "*",
    "tsconfig": "*",
-    "typescript": "^5.4.2"
+    "typescript": "5.4.5"
  }
 }
@@ -210,7 +210,7 @@ class InboxIssueAPIEndpoint(BaseAPIView):
        )

        # Only project members admins and created_by users can access this endpoint
-        if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(
+        if project_member.role <= 5 and str(inbox_issue.created_by_id) != str(
            request.user.id
        ):
            return Response(
@@ -244,9 +244,8 @@ class InboxIssueAPIEndpoint(BaseAPIView):
                workspace__slug=slug,
                project_id=project_id,
            )
-            # Only allow guests and viewers to edit name and description
-            if project_member.role <= 10:
-                # viewers and guests since only viewers and guests
+            # Only allow guests to edit name and description
+            if project_member.role <= 5:
                issue_data = {
                    "name": issue_data.get("name", issue.name),
                    "description_html": issue_data.get(
@@ -286,7 +285,7 @@ class InboxIssueAPIEndpoint(BaseAPIView):
                )

        # Only project admins and members can edit inbox issue attributes
-        if project_member.role > 10:
+        if project_member.role > 5:
            serializer = InboxIssueSerializer(
                inbox_issue, data=request.data, partial=True
            )
@@ -133,7 +133,7 @@ class ProjectMemberAPIEndpoint(BaseAPIView):
            workspace_member = WorkspaceMember.objects.create(
                workspace=workspace,
                member=user,
-                role=request.data.get("role", 10),
+                role=request.data.get("role", 5),
            )
            workspace_member.save()

@@ -142,7 +142,7 @@ class ProjectMemberAPIEndpoint(BaseAPIView):
            project_member = ProjectMember.objects.create(
                project=project,
                member=user,
-                role=request.data.get("role", 10),
+                role=request.data.get("role", 5),
            )
            project_member.save()

@@ -8,7 +8,6 @@ from enum import Enum
 class ROLE(Enum):
    ADMIN = 20
    MEMBER = 15
-    VIEWER = 10
    GUEST = 5


@@ -7,7 +7,6 @@ from plane.db.models import ProjectMember, WorkspaceMember
 # Permission Mappings
 Admin = 20
 Member = 15
-Viewer = 10
 Guest = 5


@@ -6,9 +6,8 @@ from plane.db.models import WorkspaceMember


 # Permission Mappings
-Owner = 20
-Admin = 15
-Member = 10
+Admin = 20
+Member = 15
 Guest = 5


@@ -31,7 +30,7 @@ class WorkSpaceBasePermission(BasePermission):
            return WorkspaceMember.objects.filter(
                member=request.user,
                workspace__slug=view.workspace_slug,
-                role__in=[Owner, Admin],
+                role__in=[Admin, Member],
                is_active=True,
            ).exists()

@@ -40,7 +39,7 @@ class WorkSpaceBasePermission(BasePermission):
            return WorkspaceMember.objects.filter(
                member=request.user,
                workspace__slug=view.workspace_slug,
-                role=Owner,
+                role=Admin,
                is_active=True,
            ).exists()

@@ -53,7 +52,7 @@ class WorkspaceOwnerPermission(BasePermission):
        return WorkspaceMember.objects.filter(
            workspace__slug=view.workspace_slug,
            member=request.user,
-            role=Owner,
+            role=Admin,
        ).exists()


@@ -65,7 +64,7 @@ class WorkSpaceAdminPermission(BasePermission):
        return WorkspaceMember.objects.filter(
            member=request.user,
            workspace__slug=view.workspace_slug,
-            role__in=[Owner, Admin],
+            role__in=[Admin, Member],
            is_active=True,
        ).exists()

@@ -86,7 +85,7 @@ class WorkspaceEntityPermission(BasePermission):
        return WorkspaceMember.objects.filter(
            member=request.user,
            workspace__slug=view.workspace_slug,
-            role__in=[Owner, Admin],
+            role__in=[Admin, Member],
            is_active=True,
        ).exists()

@@ -44,6 +44,7 @@ from .cycle import (
    CycleIssueSerializer,
    CycleWriteSerializer,
    CycleUserPropertiesSerializer,
+    CycleAnalyticsSerializer,
 )
 from .asset import FileAssetSerializer
 from .issue import (
@@ -7,6 +7,7 @@ from .issue import IssueStateSerializer
 from plane.db.models import (
    Cycle,
    CycleIssue,
+    CycleAnalytics,
    CycleUserProperties,
 )

@@ -93,6 +94,7 @@ class CycleIssueSerializer(BaseSerializer):
            "cycle",
        ]

+
 class CycleUserPropertiesSerializer(BaseSerializer):
    class Meta:
        model = CycleUserProperties
@@ -102,3 +104,9 @@ class CycleUserPropertiesSerializer(BaseSerializer):
            "project",
            "cycle" "user",
        ]
+
+
+class CycleAnalyticsSerializer(BaseSerializer):
+    class Meta:
+        model = CycleAnalytics
+        fields = "__all__"
@@ -176,6 +176,7 @@ class UserAdminLiteSerializer(BaseSerializer):
            "is_bot",
            "display_name",
            "email",
+            "last_login_medium",
        ]
        read_only_fields = [
            "id",
@@ -9,6 +9,7 @@ from plane.app.views import (
    CycleProgressEndpoint,
    CycleAnalyticsEndpoint,
    TransferCycleIssueEndpoint,
+    CycleIssueStateAnalyticsEndpoint,
    CycleUserPropertiesEndpoint,
    CycleArchiveUnarchiveEndpoint,
 )
@@ -118,4 +119,9 @@ urlpatterns = [
        CycleAnalyticsEndpoint.as_view(),
        name="project-cycle",
    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/cycles/<uuid:cycle_id>/cycle-progress/",
+        CycleIssueStateAnalyticsEndpoint.as_view(),
+        name="project-cycle-progress",
+    ),
 ]
@@ -100,10 +100,9 @@ from .cycle.base import (
    TransferCycleIssueEndpoint,
    CycleAnalyticsEndpoint,
    CycleProgressEndpoint,
+    CycleIssueStateAnalyticsEndpoint,
 )
-from .cycle.issue import (
-    CycleIssueViewSet,
-)
+from .cycle.issue import CycleIssueViewSet
 from .cycle.archive import (
    CycleArchiveUnarchiveEndpoint,
 )
@@ -21,7 +21,11 @@ from plane.app.permissions import allow_permission, ROLE
 class AnalyticsEndpoint(BaseAPIView):

    @allow_permission(
-        [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER], level="WORKSPACE"
+        [
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+        ],
+        level="WORKSPACE",
    )
    def get(self, request, slug):
        x_axis = request.GET.get("x_axis", False)
@@ -203,7 +207,11 @@ class AnalyticViewViewset(BaseViewSet):
 class SavedAnalyticEndpoint(BaseAPIView):

    @allow_permission(
-        [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER], level="WORKSPACE"
+        [
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+        ],
+        level="WORKSPACE",
    )
    def get(self, request, slug, analytic_id):
        analytic_view = AnalyticView.objects.get(
@@ -236,7 +244,11 @@ class SavedAnalyticEndpoint(BaseAPIView):
 class ExportAnalyticsEndpoint(BaseAPIView):

    @allow_permission(
-        [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER], level="WORKSPACE"
+        [
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+        ],
+        level="WORKSPACE",
    )
    def post(self, request, slug):
        x_axis = request.data.get("x_axis", False)
@@ -302,9 +314,7 @@ class ExportAnalyticsEndpoint(BaseAPIView):

 class DefaultAnalyticsEndpoint(BaseAPIView):

-    @allow_permission(
-        [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST], level="WORKSPACE"
-    )
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
    def get(self, request, slug):
        filters = issue_filters(request.GET, "GET")
        base_issues = Issue.issue_objects.filter(
@@ -288,7 +288,12 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
            .distinct()
        )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
+    @allow_permission(
+        [
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+        ]
+    )
    def get(self, request, slug, project_id, pk=None):
        if pk is None:
            queryset = (
@@ -31,6 +31,7 @@ from plane.app.permissions import allow_permission, ROLE
 from plane.app.serializers import (
    CycleSerializer,
    CycleUserPropertiesSerializer,
+    CycleAnalyticsSerializer,
    CycleWriteSerializer,
 )
 from plane.bgtasks.issue_activities_task import issue_activity
@@ -44,6 +45,8 @@ from plane.db.models import (
    User,
    Project,
    ProjectMember,
+    CycleAnalytics,
+    CycleIssueStateProgress,
 )
 from plane.utils.analytics_plot import burndown_plot
 from plane.bgtasks.recent_visited_task import recent_visited_task
@@ -150,7 +153,7 @@ class CycleViewSet(BaseViewSet):
            .distinct()
        )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def list(self, request, slug, project_id):
        queryset = self.get_queryset().filter(archived_at__isnull=True)
        cycle_view = request.GET.get("cycle_view", "all")
@@ -370,7 +373,12 @@ class CycleViewSet(BaseViewSet):
            return Response(cycle, status=status.HTTP_200_OK)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
+    @allow_permission(
+        [
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+        ]
+    )
    def retrieve(self, request, slug, project_id, pk):
        queryset = (
            self.get_queryset().filter(archived_at__isnull=True).filter(pk=pk)
@@ -497,7 +505,6 @@ class CycleViewSet(BaseViewSet):


 class CycleDateCheckEndpoint(BaseAPIView):
-
    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def post(self, request, slug, project_id):
        start_date = request.data.get("start_date", False)
@@ -566,7 +573,6 @@ class CycleFavoriteViewSet(BaseViewSet):


 class TransferCycleIssueEndpoint(BaseAPIView):
-
    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def post(self, request, slug, project_id, cycle_id):
        new_cycle_id = request.data.get("new_cycle_id", False)
@@ -955,6 +961,37 @@ class TransferCycleIssueEndpoint(BaseAPIView):
            updated_cycles, ["cycle_id"], batch_size=100
        )

+        estimate_type = Project.objects.filter(
+            workspace__slug=slug,
+            pk=project_id,
+            estimate__isnull=False,
+            estimate__type="points",
+        ).exists()
+
+        CycleIssueStateProgress.objects.bulk_create(
+            [
+                CycleIssueStateProgress(
+                    cycle_id=new_cycle_id,
+                    state_id=cycle_issue.issue.state_id,
+                    issue_id=cycle_issue.issue_id,
+                    state_group=cycle_issue.issue.state.group,
+                    type="ADDED",
+                    estimate_id=cycle_issue.issue.estimate_point_id,
+                    estimate_value=(
+                        cycle_issue.issue.estimate_point.value
+                        if estimate_type
+                        else None
+                    ),
+                    project_id=project_id,
+                    workspace_id=cycle_issue.workspace_id,
+                    created_by_id=request.user.id,
+                    updated_by_id=request.user.id,
+                )
+                for cycle_issue in cycle_issues
+            ],
+            batch_size=10,
+        )
+
        # Capture Issue Activity
        issue_activity.delay(
            type="cycle.activity.created",
@@ -977,8 +1014,7 @@ class TransferCycleIssueEndpoint(BaseAPIView):


 class CycleUserPropertiesEndpoint(BaseAPIView):
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def patch(self, request, slug, project_id, cycle_id):
        cycle_properties = CycleUserProperties.objects.get(
            user=request.user,
@@ -1001,7 +1037,7 @@ class CycleUserPropertiesEndpoint(BaseAPIView):
        serializer = CycleUserPropertiesSerializer(cycle_properties)
        return Response(serializer.data, status=status.HTTP_201_CREATED)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def get(self, request, slug, project_id, cycle_id):
        cycle_properties, _ = CycleUserProperties.objects.get_or_create(
            user=request.user,
@@ -1014,10 +1050,8 @@ class CycleUserPropertiesEndpoint(BaseAPIView):


 class CycleProgressEndpoint(BaseAPIView):
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def get(self, request, slug, project_id, cycle_id):
-
        aggregate_estimates = (
            Issue.issue_objects.filter(
                estimate_point__estimate__type="points",
@@ -1151,7 +1185,7 @@ class CycleProgressEndpoint(BaseAPIView):

 class CycleAnalyticsEndpoint(BaseAPIView):

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def get(self, request, slug, project_id, cycle_id):
        analytic_type = request.GET.get("type", "issues")
        cycle = (
@@ -1368,3 +1402,19 @@ class CycleAnalyticsEndpoint(BaseAPIView):
            },
            status=status.HTTP_200_OK,
        )
+
+
+class CycleIssueStateAnalyticsEndpoint(BaseAPIView):
+
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    def get(self, request, slug, project_id, cycle_id):
+        cycle_state_progress = CycleAnalytics.objects.filter(
+            cycle_id=cycle_id,
+            project_id=project_id,
+            workspace__slug=slug,
+        )
+
+        return Response(
+            CycleAnalyticsSerializer(cycle_state_progress, many=True).data,
+            status=status.HTTP_200_OK,
+        )
@@ -24,6 +24,8 @@ from plane.db.models import (
    Issue,
    IssueAttachment,
    IssueLink,
+    CycleIssueStateProgress,
+    Project,
 )
 from plane.utils.grouper import (
    issue_group_values,
@@ -80,7 +82,12 @@ class CycleIssueViewSet(BaseViewSet):
        )

    @method_decorator(gzip_page)
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
+    @allow_permission(
+        [
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+        ]
+    )
    def list(self, request, slug, project_id, cycle_id):
        order_by_param = request.GET.get("order_by", "created_at")
        filters = issue_filters(request.query_params, "GET")
@@ -263,6 +270,10 @@ class CycleIssueViewSet(BaseViewSet):
        ]
        new_issues = list(set(issues) - set(existing_issues))

+        # Fetch issue details
+        issue_objects = Issue.objects.filter(id__in=new_issues)
+        issue_dict = {issue.id: issue for issue in issue_objects}
+
        # New issues to create
        created_records = CycleIssue.objects.bulk_create(
            [
@@ -279,6 +290,42 @@ class CycleIssueViewSet(BaseViewSet):
            batch_size=10,
        )

+        # estimate_type = Project.objects.filter(
+        #     workspace__slug=slug,
+        #     pk=project_id,
+        #     estimate__isnull=False,
+        #     estimate__type="points",
+        # ).exists()
+
+        # for issue_id in new_issues:
+        #     print(issue_id, "issue id")
+        #     print(issue_dict[issue_id].state_id, "state_id")
+
+        # CycleIssueStateProgress.objects.bulk_create(
+        #     [
+        #         CycleIssueStateProgress(
+        #             cycle_id=cycle_id,
+        #             state_id=str(issue_dict[issue_id].state_id),
+        #             issue_id=issue_id,
+        #             state_group=issue_dict[issue_id].state.group,
+        #             type="ADDED",
+        #             estimate_id=issue_dict[issue_id].estimate_id,
+        #             estimate_value=(
+        #                 issue_dict[issue_id].estimate_point.value
+        #                 if estimate_type
+        #                 else None
+        #             ),
+        #             project_id=project_id,
+        #             workspace_id=cycle.workspace_id,
+        #             created_by_id=request.user.id,
+        #             updated_by_id=request.user.id,
+        #         )
+        #         print(issue_id, "issue id")
+        #         for issue_id in new_issues
+        #     ],
+        #     batch_size=10,
+        # )
+
        # Updated Issues
        updated_records = []
        update_cycle_issue_activity = []
@@ -331,6 +378,28 @@ class CycleIssueViewSet(BaseViewSet):
            project_id=project_id,
            cycle_id=cycle_id,
        )
+        issue = Issue.objects.get(pk=issue_id)
+        estimate_type = Project.objects.filter(
+            workspace__slug=slug,
+            pk=project_id,
+            estimate__isnull=False,
+            estimate__type="points",
+        ).exists()
+
+        CycleIssueStateProgress.objects.create(
+            cycle_id=cycle_id,
+            state_id=issue.state_id,
+            issue_id=issue_id,
+            state_group=issue.state.group,
+            type="REMOVED",
+            estimate_id=issue.estimate_id,
+            estimate_value=(
+                issue.estimate_point.value if estimate_type else None
+            ),
+            project_id=project_id,
+            created_by_id=request.user.id,
+            updated_by_id=request.user.id,
+        )
        issue_activity.delay(
            type="cycle.activity.deleted",
            requested_data=json.dumps(
@@ -52,23 +52,28 @@ from .. import BaseAPIView


 def dashboard_overview_stats(self, request, slug):
-    extra_filters = {}
-    if WorkspaceMember.objects.filter(
-        workspace__slug=slug,
-        member=request.user,
-        role=5,
-        is_active=True,
-    ).exists():
-        extra_filters = {"created_by": request.user}
-
    assigned_issues = (
        Issue.issue_objects.filter(
            project__project_projectmember__is_active=True,
            project__project_projectmember__member=request.user,
            workspace__slug=slug,
            assignees__in=[request.user],
+        ).filter(
+            Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=True,
+            )
+            | Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=False,
+                created_by=self.request.user,
+            )
+            |
+            # For other roles (role < 5), show all issues
+            Q(project__project_projectmember__role__gt=5),
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
        )
-        .filter(**extra_filters)
        .count()
    )

@@ -80,8 +85,22 @@ def dashboard_overview_stats(self, request, slug):
            project__project_projectmember__member=request.user,
            workspace__slug=slug,
            assignees__in=[request.user],
+        ).filter(
+            Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=True,
+            )
+            | Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=False,
+                created_by=self.request.user,
+            )
+            |
+            # For other roles (role < 5), show all issues
+            Q(project__project_projectmember__role__gt=5),
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
        )
-        .filter(**extra_filters)
        .count()
    )

@@ -91,8 +110,22 @@ def dashboard_overview_stats(self, request, slug):
            project__project_projectmember__is_active=True,
            project__project_projectmember__member=request.user,
            created_by_id=request.user.id,
+        ).filter(
+            Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=True,
+            )
+            | Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=False,
+                created_by=self.request.user,
+            )
+            |
+            # For other roles (role < 5), show all issues
+            Q(project__project_projectmember__role__gt=5),
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
        )
-        .filter(**extra_filters)
        .count()
    )

@@ -103,8 +136,22 @@ def dashboard_overview_stats(self, request, slug):
            project__project_projectmember__member=request.user,
            assignees__in=[request.user],
            state__group="completed",
+        ).filter(
+            Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=True,
+            )
+            | Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=False,
+                created_by=self.request.user,
+            )
+            |
+            # For other roles (role < 5), show all issues
+            Q(project__project_projectmember__role__gt=5),
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
        )
-        .filter(**extra_filters)
        .count()
    )

@@ -28,7 +28,12 @@ def generate_random_name(length=10):

 class ProjectEstimatePointEndpoint(BaseAPIView):

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
+    @allow_permission(
+        [
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+        ]
+    )
    def get(self, request, slug, project_id):
        project = Project.objects.get(workspace__slug=slug, pk=project_id)
        if project.estimate_id is not None:
@@ -165,11 +165,12 @@ class InboxIssueViewSet(BaseViewSet):
            )
        ).distinct()

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def list(self, request, slug, project_id):
        inbox_id = Inbox.objects.get(
            workspace__slug=slug, project_id=project_id
        )
+        project = Project.objects.get(pk=project_id) 
        filters = issue_filters(request.GET, "GET", "issue__")
        inbox_issue = (
            InboxIssue.objects.filter(
@@ -199,13 +200,16 @@ class InboxIssueViewSet(BaseViewSet):
        if inbox_status:
            inbox_issue = inbox_issue.filter(status__in=inbox_status)

-        if ProjectMember.objects.filter(
-            workspace__slug=slug,
-            project_id=project_id,
-            member=request.user,
-            role=5,
-            is_active=True,
-        ).exists():
+        if (
+            ProjectMember.objects.filter(
+                workspace__slug=slug,
+                project_id=project_id,
+                member=request.user,
+                role=5,
+                is_active=True,
+            ).exists()
+            and not project.guest_view_all_features
+        ):
            inbox_issue = inbox_issue.filter(created_by=request.user)
        return self.paginate(
            request=request,
@@ -338,7 +342,7 @@ class InboxIssueViewSet(BaseViewSet):
            is_active=True,
        )
        # Only project members admins and created_by users can access this endpoint
-        if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(
+        if project_member.role <= 5 and str(inbox_issue.created_by_id) != str(
            request.user.id
        ):
            return Response(
@@ -371,9 +375,8 @@ class InboxIssueViewSet(BaseViewSet):
                workspace__slug=slug,
                project_id=project_id,
            )
-            # Only allow guests and viewers to edit name and description
-            if project_member.role <= 10:
-                # viewers and guests since only viewers and guests
+            # Only allow guests to edit name and description
+            if project_member.role <= 5:
                issue_data = {
                    "name": issue_data.get("name", issue.name),
                    "description_html": issue_data.get(
@@ -415,7 +418,7 @@ class InboxIssueViewSet(BaseViewSet):
                )

        # Only project admins and members can edit inbox issue attributes
-        if project_member.role > 10:
+        if project_member.role > 5:
            serializer = InboxIssueSerializer(
                inbox_issue, data=request.data, partial=True
            )
@@ -515,7 +518,11 @@ class InboxIssueViewSet(BaseViewSet):
            return Response(serializer, status=status.HTTP_200_OK)

    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER],
+        allowed_roles=[
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+            ROLE.GUEST,
+        ],
        creator=True,
        model=Issue,
    )
@@ -523,6 +530,7 @@ class InboxIssueViewSet(BaseViewSet):
        inbox_id = Inbox.objects.get(
            workspace__slug=slug, project_id=project_id
        )
+        project = Project.objects.get(pk=project_id)
        inbox_issue = (
            InboxIssue.objects.select_related("issue")
            .prefetch_related(
@@ -549,6 +557,21 @@ class InboxIssueViewSet(BaseViewSet):
            )
            .get(inbox_id=inbox_id.id, issue_id=pk, project_id=project_id)
        )
+        if (
+            ProjectMember.objects.filter(
+                workspace__slug=slug,
+                project_id=project_id,
+                member=request.user,
+                role=5,
+                is_active=True,
+            ).exists()
+            and not project.guest_view_all_features
+            and not inbox_issue.created_by == request.user
+        ):
+            return Response(
+                {"error": "You are not allowed to view this issue"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
        issue = InboxIssueDetailSerializer(inbox_issue).data
        return Response(
            issue,
@@ -19,7 +19,11 @@ from plane.app.serializers import (
    IssueActivitySerializer,
    IssueCommentSerializer,
 )
-from plane.app.permissions import ProjectEntityPermission, allow_permission, ROLE
+from plane.app.permissions import (
+    ProjectEntityPermission,
+    allow_permission,
+    ROLE,
+)
 from plane.db.models import (
    IssueActivity,
    IssueComment,
@@ -33,7 +37,13 @@ class IssueActivityEndpoint(BaseAPIView):
    ]

    @method_decorator(gzip_page)
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST, ROLE.VIEWER])
+    @allow_permission(
+        [
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+            ROLE.GUEST,
+        ]
+    )
    def get(self, request, slug, project_id, issue_id):
        filters = {}
        if request.GET.get("created_at__gt", None) is not None:
@@ -97,7 +97,12 @@ class IssueArchiveViewSet(BaseViewSet):
        )

    @method_decorator(gzip_page)
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
+    @allow_permission(
+        [
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+        ]
+    )
    def list(self, request, slug, project_id):
        filters = issue_filters(request.query_params, "GET")
        show_sub_issues = request.GET.get("show_sub_issues", "true")
@@ -213,7 +218,12 @@ class IssueArchiveViewSet(BaseViewSet):
                ),
            )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
+    @allow_permission(
+        [
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+        ]
+    )
    def retrieve(self, request, slug, project_id, pk=None):
        issue = (
            self.get_queryset()
@@ -64,7 +64,13 @@ class IssueAttachmentEndpoint(BaseAPIView):

        return Response(status=status.HTTP_204_NO_CONTENT)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST, ROLE.VIEWER])
+    @allow_permission(
+        [
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+            ROLE.GUEST,
+        ]
+    )
    def get(self, request, slug, project_id, issue_id):
        issue_attachments = IssueAttachment.objects.filter(
            issue_id=issue_id, workspace__slug=slug, project_id=project_id
@@ -42,6 +42,7 @@ from plane.db.models import (
    IssueSubscriber,
    Project,
    ProjectMember,
+    CycleIssueStateProgress,
 )
 from plane.utils.grouper import (
    issue_group_values,
@@ -62,7 +63,7 @@ from plane.bgtasks.webhook_task import model_activity


 class IssueListEndpoint(BaseAPIView):
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def get(self, request, slug, project_id):
        issue_ids = request.GET.get("issues", False)

@@ -232,8 +233,9 @@ class IssueViewSet(BaseViewSet):
        ).distinct()

    @method_decorator(gzip_page)
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def list(self, request, slug, project_id):
+        project = Project.objects.get(pk=project_id, workspace__slug=slug)
        filters = issue_filters(request.query_params, "GET")
        order_by_param = request.GET.get("order_by", "-created_at")

@@ -264,13 +266,16 @@ class IssueViewSet(BaseViewSet):
            entity_identifier=project_id,
            user_id=request.user.id,
        )
-        if ProjectMember.objects.filter(
-            workspace__slug=slug,
-            project_id=project_id,
-            member=request.user,
-            role=5,
-            is_active=True,
-        ).exists():
+        if (
+            ProjectMember.objects.filter(
+                workspace__slug=slug,
+                project_id=project_id,
+                member=request.user,
+                role=5,
+                is_active=True,
+            ).exists()
+            and not project.guest_view_all_features
+        ):
            issue_queryset = issue_queryset.filter(created_by=request.user)

        if group_by:
@@ -440,9 +445,17 @@ class IssueViewSet(BaseViewSet):
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

    @allow_permission(
-        [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER], creator=True, model=Issue
+        allowed_roles=[
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+            ROLE.GUEST,
+        ],
+        creator=True,
+        model=Issue,
    )
    def retrieve(self, request, slug, project_id, pk=None):
+        project = Project.objects.get(pk=project_id, workspace__slug=slug)
+
        issue = (
            self.get_queryset()
            .filter(pk=pk)
@@ -511,6 +524,29 @@ class IssueViewSet(BaseViewSet):
                status=status.HTTP_404_NOT_FOUND,
            )

+        """
+        if the role is guest and guest_view_all_features is false and owned by is not 
+        the requesting user then dont show the issue
+        """
+
+        if (
+            ProjectMember.objects.filter(
+                workspace__slug=slug,
+                project_id=project_id,
+                member=request.user,
+                role=5,
+                is_active=True,
+            ).exists()
+            and not project.guest_view_all_features
+            and not issue.created_by == request.user
+        ):
+            return Response(
+                {"error": "You are not allowed to view this issue"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+
+
        recent_visited_task.delay(
            slug=slug,
            entity_name="issue",
@@ -522,7 +558,9 @@ class IssueViewSet(BaseViewSet):
        serializer = IssueDetailSerializer(issue, expand=self.expand)
        return Response(serializer.data, status=status.HTTP_200_OK)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
+    @allow_permission(
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], creator=True, model=Issue
+    )
    def partial_update(self, request, slug, project_id, pk=None):
        issue = (
            self.get_queryset()
@@ -566,6 +604,29 @@ class IssueViewSet(BaseViewSet):
        current_instance = json.dumps(
            IssueSerializer(issue).data, cls=DjangoJSONEncoder
        )
+        estimate_type = Project.objects.filter(
+            workspace__slug=slug,
+            pk=project_id,
+            estimate__isnull=False,
+            estimate__type="points",
+        ).exists()
+
+        if issue.cycle_id:
+            CycleIssueStateProgress.objects.create(
+                cycle_id=issue.cycle_id,
+                state_id=issue.state_id,
+                issue_id=issue.id,
+                state_group=issue.state.group,
+                type="UPDATED",
+                estimate_id=issue.estimate_point_id,
+                estimate_value=(
+                    issue.estimate_point.value if estimate_type else None
+                ),
+                project_id=project_id,
+                workspace_id=issue.workspace_id,
+                created_by_id=request.user.id,
+                updated_by_id=request.user.id,
+            )

        requested_data = json.dumps(self.request.data, cls=DjangoJSONEncoder)
        serializer = IssueCreateSerializer(
@@ -618,7 +679,7 @@ class IssueViewSet(BaseViewSet):


 class IssueUserDisplayPropertyEndpoint(BaseAPIView):
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST, ROLE.VIEWER])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def patch(self, request, slug, project_id):
        issue_property = IssueUserProperty.objects.get(
            user=request.user,
@@ -638,7 +699,13 @@ class IssueUserDisplayPropertyEndpoint(BaseAPIView):
        serializer = IssueUserPropertySerializer(issue_property)
        return Response(serializer.data, status=status.HTTP_201_CREATED)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST, ROLE.VIEWER])
+    @allow_permission(
+        [
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+            ROLE.GUEST,
+        ]
+    )
    def get(self, request, slug, project_id):
        issue_property, _ = IssueUserProperty.objects.get_or_create(
            user=request.user, project_id=project_id
@@ -719,7 +786,7 @@ class IssuePaginatedViewSet(BaseViewSet):

        return paginated_data

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def list(self, request, slug, project_id):
        cursor = request.GET.get("cursor", None)
        is_description_required = request.GET.get("description", False)
@@ -16,11 +16,13 @@ from plane.app.serializers import (
    IssueCommentSerializer,
    CommentReactionSerializer,
 )
-from plane.app.permissions import ProjectLitePermission, allow_permission, ROLE
+from plane.app.permissions import allow_permission, ROLE
 from plane.db.models import (
    IssueComment,
    ProjectMember,
    CommentReaction,
+    Project,
+    Issue,
 )
 from plane.bgtasks.issue_activities_task import issue_activity

@@ -63,8 +65,31 @@ class IssueCommentViewSet(BaseViewSet):
            .distinct()
        )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST, ROLE.VIEWER])
+    @allow_permission(
+        [
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+            ROLE.GUEST,
+        ]
+    )
    def create(self, request, slug, project_id, issue_id):
+        project = Project.objects.get(pk=project_id)
+        issue = Issue.objects.get(pk=issue_id)
+        if (
+            ProjectMember.objects.filter(
+                workspace__slug=slug,
+                project_id=project_id,
+                member=request.user,
+                role=5,
+                is_active=True,
+            ).exists()
+            and not project.guest_view_all_features
+            and not issue.created_by == request.user
+        ):
+            return Response(
+                {"error": "You are not allowed to comment on the issue"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
        serializer = IssueCommentSerializer(data=request.data)
        if serializer.is_valid():
            serializer.save(
@@ -89,7 +114,7 @@ class IssueCommentViewSet(BaseViewSet):
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER],
+        allowed_roles=[ROLE.ADMIN],
        creator=True,
        model=IssueComment,
    )
@@ -156,9 +181,6 @@ class IssueCommentViewSet(BaseViewSet):
 class CommentReactionViewSet(BaseViewSet):
    serializer_class = CommentReactionSerializer
    model = CommentReaction
-    permission_classes = [
-        ProjectLitePermission,
-    ]

    def get_queryset(self):
        return (
@@ -176,6 +198,13 @@ class CommentReactionViewSet(BaseViewSet):
            .distinct()
        )

+    @allow_permission(
+        [
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+            ROLE.GUEST,
+        ]
+    )
    def create(self, request, slug, project_id, comment_id):
        serializer = CommentReactionSerializer(data=request.data)
        if serializer.is_valid():
@@ -198,6 +227,13 @@ class CommentReactionViewSet(BaseViewSet):
            return Response(serializer.data, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

+    @allow_permission(
+        [
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+            ROLE.GUEST,
+        ]
+    )
    def destroy(self, request, slug, project_id, comment_id, reaction_code):
        comment_reaction = CommentReaction.objects.get(
            workspace__slug=slug,
@@ -43,7 +43,7 @@ class LabelViewSet(BaseViewSet):
    @invalidate_cache(
        path="/api/workspaces/:slug/labels/", url_params=True, user=False
    )
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
+    @allow_permission([ROLE.ADMIN])
    def create(self, request, slug, project_id):
        try:
            serializer = LabelSerializer(data=request.data)
@@ -66,14 +66,14 @@ class LabelViewSet(BaseViewSet):
    @invalidate_cache(
        path="/api/workspaces/:slug/labels/", url_params=True, user=False
    )
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
+    @allow_permission([ROLE.ADMIN])
    def partial_update(self, request, *args, **kwargs):
        return super().partial_update(request, *args, **kwargs)

    @invalidate_cache(
        path="/api/workspaces/:slug/labels/", url_params=True, user=False
    )
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
+    @allow_permission([ROLE.ADMIN])
    def destroy(self, request, *args, **kwargs):
        return super().destroy(request, *args, **kwargs)

@@ -12,7 +12,7 @@ from rest_framework import status
 # Module imports
 from .. import BaseViewSet
 from plane.app.serializers import IssueReactionSerializer
-from plane.app.permissions import ProjectLitePermission
+from plane.app.permissions import allow_permission, ROLE
 from plane.db.models import IssueReaction
 from plane.bgtasks.issue_activities_task import issue_activity

@@ -20,9 +20,6 @@ from plane.bgtasks.issue_activities_task import issue_activity
 class IssueReactionViewSet(BaseViewSet):
    serializer_class = IssueReactionSerializer
    model = IssueReaction
-    permission_classes = [
-        ProjectLitePermission,
-    ]

    def get_queryset(self):
        return (
@@ -40,6 +37,7 @@ class IssueReactionViewSet(BaseViewSet):
            .distinct()
        )

+    @allow_permission(ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST)
    def create(self, request, slug, project_id, issue_id):
        serializer = IssueReactionSerializer(data=request.data)
        if serializer.is_valid():
@@ -62,6 +60,7 @@ class IssueReactionViewSet(BaseViewSet):
            return Response(serializer.data, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

+    @allow_permission(ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST)
    def destroy(self, request, slug, project_id, issue_id, reaction_code):
        issue_reaction = IssueReaction.objects.get(
            workspace__slug=slug,
@@ -317,7 +317,12 @@ class ModuleViewSet(BaseViewSet):
            .order_by("-is_favorite", "-created_at")
        )

-    allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
+    allow_permission(
+        [
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+        ]
+    )

    def create(self, request, slug, project_id):
        project = Project.objects.get(workspace__slug=slug, pk=project_id)
@@ -381,7 +386,7 @@ class ModuleViewSet(BaseViewSet):
            return Response(module, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

-    allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
+    allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])

    def list(self, request, slug, project_id):
        queryset = self.get_queryset().filter(archived_at__isnull=True)
@@ -430,7 +435,12 @@ class ModuleViewSet(BaseViewSet):
            )
        return Response(modules, status=status.HTTP_200_OK)

-    allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
+    allow_permission(
+        [
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+        ]
+    )

    def retrieve(self, request, slug, project_id, pk):
        queryset = (
@@ -861,7 +871,7 @@ class ModuleFavoriteViewSet(BaseViewSet):

 class ModuleUserPropertiesEndpoint(BaseAPIView):

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def patch(self, request, slug, project_id, module_id):
        module_properties = ModuleUserProperties.objects.get(
            user=request.user,
@@ -884,7 +894,7 @@ class ModuleUserPropertiesEndpoint(BaseAPIView):
        serializer = ModuleUserPropertiesSerializer(module_properties)
        return Response(serializer.data, status=status.HTTP_201_CREATED)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def get(self, request, slug, project_id, module_id):
        module_properties, _ = ModuleUserProperties.objects.get_or_create(
            user=request.user,
@@ -91,7 +91,12 @@ class ModuleIssueViewSet(BaseViewSet):
        ).distinct()

    @method_decorator(gzip_page)
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
+    @allow_permission(
+        [
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+        ]
+    )
    def list(self, request, slug, project_id, module_id):
        filters = issue_filters(request.query_params, "GET")
        issue_queryset = self.get_queryset().filter(**filters)
@@ -41,7 +41,7 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
        )

    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER],
        level="WORKSPACE",
    )
    def list(self, request, slug):
@@ -174,7 +174,7 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
        return Response(serializer.data, status=status.HTTP_200_OK)

    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST],
        level="WORKSPACE",
    )
    def partial_update(self, request, slug, pk):
@@ -195,8 +195,7 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
-        level="WORKSPACE",
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE"
    )
    def mark_read(self, request, slug, pk):
        notification = Notification.objects.get(
@@ -246,7 +245,7 @@ class NotificationViewSet(BaseViewSet, BasePaginator):

 class UnreadNotificationEndpoint(BaseAPIView):
    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST],
        level="WORKSPACE",
    )
    def get(self, request, slug):
@@ -32,8 +32,10 @@ from plane.db.models import (
    UserFavorite,
    ProjectMember,
    ProjectPage,
+    Project,
 )
 from plane.utils.error_codes import ERROR_CODES
+
 # Module imports
 from ..base import BaseAPIView, BaseViewSet

@@ -120,7 +122,7 @@ class PageViewSet(BaseViewSet):
            .distinct()
        )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def create(self, request, slug, project_id):
        serializer = PageSerializer(
            data=request.data,
@@ -142,7 +144,7 @@ class PageViewSet(BaseViewSet):
            return Response(serializer.data, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def partial_update(self, request, slug, project_id, pk):
        try:
            page = Page.objects.get(
@@ -208,9 +210,38 @@ class PageViewSet(BaseViewSet):
                status=status.HTTP_400_BAD_REQUEST,
            )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
+    @allow_permission(
+        [
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+            ROLE.GUEST,
+        ]
+    )
    def retrieve(self, request, slug, project_id, pk=None):
        page = self.get_queryset().filter(pk=pk).first()
+        project = Project.objects.get(pk=project_id)
+
+        """
+        if the role is guest and guest_view_all_features is false and owned by is not 
+        the requesting user then dont show the page
+        """
+
+        if (
+            ProjectMember.objects.filter(
+                workspace__slug=slug,
+                project_id=project_id,
+                member=request.user,
+                role=5,
+                is_active=True,
+            ).exists()
+            and not project.guest_view_all_features
+            and not page.owned_by == request.user
+        ):
+            return Response(
+                {"error": "You are not allowed to view this page"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
        if page is None:
            return Response(
                {"error": "Page not found"},
@@ -234,7 +265,7 @@ class PageViewSet(BaseViewSet):
                status=status.HTTP_200_OK,
            )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def lock(self, request, slug, project_id, pk):
        page = Page.objects.filter(
            pk=pk, workspace__slug=slug, projects__id=project_id
@@ -244,7 +275,7 @@ class PageViewSet(BaseViewSet):
        page.save()
        return Response(status=status.HTTP_204_NO_CONTENT)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def unlock(self, request, slug, project_id, pk):
        page = Page.objects.filter(
            pk=pk, workspace__slug=slug, projects__id=project_id
@@ -255,7 +286,7 @@ class PageViewSet(BaseViewSet):

        return Response(status=status.HTTP_204_NO_CONTENT)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def access(self, request, slug, project_id, pk):
        access = request.data.get("access", 0)
        page = Page.objects.filter(
@@ -278,13 +309,31 @@ class PageViewSet(BaseViewSet):
        page.save()
        return Response(status=status.HTTP_204_NO_CONTENT)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
+    @allow_permission(
+        [
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+            ROLE.GUEST,
+        ]
+    )
    def list(self, request, slug, project_id):
        queryset = self.get_queryset()
+        project = Project.objects.get(pk=project_id)
+        if (
+            ProjectMember.objects.filter(
+                workspace__slug=slug,
+                project_id=project_id,
+                member=request.user,
+                role=5,
+                is_active=True,
+            ).exists()
+            and not project.guest_view_all_features
+        ):
+            queryset = queryset.filter(owned_by=request.user)
        pages = PageSerializer(queryset, many=True).data
        return Response(pages, status=status.HTTP_200_OK)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def archive(self, request, slug, project_id, pk):
        page = Page.objects.get(
            pk=pk, workspace__slug=slug, projects__id=project_id
@@ -319,7 +368,7 @@ class PageViewSet(BaseViewSet):
            status=status.HTTP_200_OK,
        )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def unarchive(self, request, slug, project_id, pk):
        page = Page.objects.get(
            pk=pk, workspace__slug=slug, projects__id=project_id
@@ -477,7 +526,13 @@ class SubPagesEndpoint(BaseAPIView):

 class PagesDescriptionViewSet(BaseViewSet):

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
+    @allow_permission(
+        [
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+            ROLE.GUEST,
+        ]
+    )
    def retrieve(self, request, slug, project_id, pk):
        page = (
            Page.objects.filter(
@@ -507,7 +562,7 @@ class PagesDescriptionViewSet(BaseViewSet):
        )
        return response

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def partial_update(self, request, slug, project_id, pk):
        page = (
            Page.objects.filter(
@@ -15,7 +15,7 @@ from plane.app.permissions import allow_permission, ROLE
 class PageVersionEndpoint(BaseAPIView):

    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST]
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST]
    )
    def get(self, request, slug, project_id, page_id, pk=None):
        # Check if pk is provided
@@ -71,13 +71,6 @@ class ProjectViewSet(BaseViewSet):
            super()
            .get_queryset()
            .filter(workspace__slug=self.kwargs.get("slug"))
-            .filter(
-                Q(
-                    project_projectmember__member=self.request.user,
-                    project_projectmember__is_active=True,
-                )
-                | Q(network=2)
-            )
            .select_related(
                "workspace",
                "workspace__owner",
@@ -155,7 +148,7 @@ class ProjectViewSet(BaseViewSet):
        )

    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST],
        level="WORKSPACE",
    )
    def list(self, request, slug):
@@ -165,6 +158,31 @@ class ProjectViewSet(BaseViewSet):
            if field
        ]
        projects = self.get_queryset().order_by("sort_order", "name")
+        if WorkspaceMember.objects.filter(
+            member=request.user,
+            workspace__slug=slug,
+            is_active=True,
+            role=5,
+        ).exists():
+            projects = projects.filter(
+                project_projectmember__member=self.request.user,
+                project_projectmember__is_active=True,
+            )
+
+        if WorkspaceMember.objects.filter(
+            member=request.user,
+            workspace__slug=slug,
+            is_active=True,
+            role=10,
+        ).exists():
+            projects = projects.filter(
+                Q(
+                    project_projectmember__member=self.request.user,
+                    project_projectmember__is_active=True,
+                )
+                | Q(network=2)
+            )
+
        if request.GET.get("per_page", False) and request.GET.get(
            "cursor", False
        ):
@@ -177,24 +195,13 @@ class ProjectViewSet(BaseViewSet):
                ).data,
            )

-        if WorkspaceMember.objects.filter(
-            member=request.user,
-            workspace__slug=slug,
-            is_active=True,
-            role__in=[5, 10],
-        ).exists():
-            projects = projects.filter(
-                project_projectmember__member=self.request.user,
-                project_projectmember__is_active=True,
-            )
-
        projects = ProjectListSerializer(
            projects, many=True, fields=fields if fields else None
        ).data
        return Response(projects, status=status.HTTP_200_OK)

    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST],
        level="WORKSPACE",
    )
    def retrieve(self, request, slug, pk):
@@ -17,7 +17,7 @@ from rest_framework.permissions import AllowAny
 from .base import BaseViewSet, BaseAPIView
 from plane.app.serializers import ProjectMemberInviteSerializer

-from plane.app.permissions import ProjectBasePermission
+from plane.app.permissions import allow_permission, ROLE

 from plane.db.models import (
    ProjectMember,
@@ -35,10 +35,6 @@ class ProjectInvitationsViewset(BaseViewSet):

    search_fields = []

-    permission_classes = [
-        ProjectBasePermission,
-    ]
-
    def get_queryset(self):
        return self.filter_queryset(
            super()
@@ -49,6 +45,7 @@ class ProjectInvitationsViewset(BaseViewSet):
            .select_related("workspace", "workspace__owner")
        )

+    @allow_permission([ROLE.ADMIN])
    def create(self, request, slug, project_id):
        emails = request.data.get("emails", [])

@@ -59,24 +56,21 @@ class ProjectInvitationsViewset(BaseViewSet):
                status=status.HTTP_400_BAD_REQUEST,
            )

-        requesting_user = ProjectMember.objects.get(
-            workspace__slug=slug,
-            project_id=project_id,
-            member_id=request.user.id,
-        )
+        for email in emails:
+            workspace_role = WorkspaceMember.objects.filter(
+                workspace__slug=slug,
+                member__email=email.get("email"),
+                is_active=True,
+            ).role

-        # Check if any invited user has an higher role
-        if len(
-            [
-                email
-                for email in emails
-                if int(email.get("role", 10)) > requesting_user.role
-            ]
-        ):
-            return Response(
-                {"error": "You cannot invite a user with higher role"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
+            if workspace_role in [5, 20] and workspace_role != email.get(
+                "role", 5
+            ):
+                return Response(
+                    {
+                        "error": "You cannot invite a user with different role than workspace role"
+                    },
+                )

        workspace = Workspace.objects.get(slug=slug)

@@ -97,7 +91,7 @@ class ProjectInvitationsViewset(BaseViewSet):
                            settings.SECRET_KEY,
                            algorithm="HS256",
                        ),
-                        role=email.get("role", 10),
+                        role=email.get("role", 5),
                        created_by=request.user,
                    )
                )
@@ -170,7 +164,7 @@ class UserProjectInvitationsViewset(BaseViewSet):
                ProjectMember(
                    project_id=project_id,
                    member=request.user,
-                    role=15 if workspace_role >= 15 else 10,
+                    role=workspace_role,
                    workspace=workspace,
                    created_by=request.user,
                )
@@ -95,9 +95,21 @@ class ProjectMemberViewSet(BaseViewSet):
                member=member,
                is_active=True,
            ).role
-            if workspace_member_role in [5, 10] and member_roles.get(
-                member
-            ) in [15, 20]:
+            if workspace_member_role in [20] and member_roles.get(member) in [
+                5,
+                15,
+            ]:
+                return Response(
+                    {
+                        "error": "You cannot add a user with role lower than the workspace role"
+                    },
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
+            if workspace_member_role in [5] and member_roles.get(member) in [
+                15,
+                20,
+            ]:
                return Response(
                    {
                        "error": "You cannot add a user with role higher than the workspace role"
@@ -143,7 +155,7 @@ class ProjectMemberViewSet(BaseViewSet):
            bulk_project_members.append(
                ProjectMember(
                    member_id=member.get("member_id"),
-                    role=member.get("role", 10),
+                    role=member.get("role", 5),
                    project_id=project_id,
                    workspace_id=project.workspace_id,
                    sort_order=(
@@ -189,7 +201,7 @@ class ProjectMemberViewSet(BaseViewSet):
        # Return the serialized data
        return Response(serializer.data, status=status.HTTP_201_CREATED)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def list(self, request, slug, project_id):
        # Get the list of project members for the project
        project_members = ProjectMember.objects.filter(
@@ -230,7 +242,7 @@ class ProjectMemberViewSet(BaseViewSet):
            member=project_member.member,
            is_active=True,
        ).role
-        if workspace_role in [5, 10] and int(
+        if workspace_role in [5] and int(
            request.data.get("role", project_member.role)
        ) in [15, 20]:
            return Response(
@@ -261,7 +273,7 @@ class ProjectMemberViewSet(BaseViewSet):
            return Response(serializer.data, status=status.HTTP_200_OK)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
+    @allow_permission([ROLE.ADMIN])
    def destroy(self, request, slug, project_id, pk):
        project_member = ProjectMember.objects.get(
            workspace__slug=slug,
@@ -298,7 +310,7 @@ class ProjectMemberViewSet(BaseViewSet):
        project_member.save()
        return Response(status=status.HTTP_204_NO_CONTENT)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def leave(self, request, slug, project_id):
        project_member = ProjectMember.objects.get(
            workspace__slug=slug,
@@ -9,7 +9,8 @@ from rest_framework import status
 from .. import BaseViewSet
 from plane.app.serializers import StateSerializer
 from plane.app.permissions import (
-    ProjectEntityPermission,
+    ROLE,
+    allow_permission
 )
 from plane.db.models import State, Issue
 from plane.utils.cache import invalidate_cache
@@ -18,9 +19,6 @@ from plane.utils.cache import invalidate_cache
 class StateViewSet(BaseViewSet):
    serializer_class = StateSerializer
    model = State
-    permission_classes = [
-        ProjectEntityPermission,
-    ]

    def get_queryset(self):
        return self.filter_queryset(
@@ -42,6 +40,7 @@ class StateViewSet(BaseViewSet):
    @invalidate_cache(
        path="workspaces/:slug/states/", url_params=True, user=False
    )
+    @allow_permission([ROLE.ADMIN])
    def create(self, request, slug, project_id):
        serializer = StateSerializer(data=request.data)
        if serializer.is_valid():
@@ -49,6 +48,7 @@ class StateViewSet(BaseViewSet):
            return Response(serializer.data, status=status.HTTP_200_OK)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

+    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def list(self, request, slug, project_id):
        states = StateSerializer(self.get_queryset(), many=True).data
        grouped = request.GET.get("grouped", False)
@@ -65,6 +65,7 @@ class StateViewSet(BaseViewSet):
    @invalidate_cache(
        path="workspaces/:slug/states/", url_params=True, user=False
    )
+    @allow_permission([ROLE.ADMIN])
    def mark_as_default(self, request, slug, project_id, pk):
        # Select all the states which are marked as default
        _ = State.objects.filter(
@@ -78,6 +79,7 @@ class StateViewSet(BaseViewSet):
    @invalidate_cache(
        path="workspaces/:slug/states/", url_params=True, user=False
    )
+    @allow_permission([ROLE.ADMIN])
    def destroy(self, request, slug, project_id, pk):
        state = State.objects.get(
            is_triage=False,
@@ -35,6 +35,7 @@ from plane.db.models import (
    Workspace,
    WorkspaceMember,
    ProjectMember,
+    Project,
 )
 from plane.utils.grouper import (
    issue_group_values,
@@ -75,7 +76,7 @@ class WorkspaceViewViewSet(BaseViewSet):
        )

    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST],
        level="WORKSPACE",
    )
    def list(self, request, slug):
@@ -259,7 +260,7 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):

    @method_decorator(gzip_page)
    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST],
        level="WORKSPACE",
    )
    def list(self, request, slug):
@@ -272,15 +273,24 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):
            .annotate(cycle_id=F("issue_cycle__cycle_id"))
        )

-        if WorkspaceMember.objects.filter(
-            workspace__slug=slug,
-            member=request.user,
-            role=5,
-            is_active=True,
-        ).exists():
-            issue_queryset = issue_queryset.filter(
-                created_by=request.user,
+        # check for the project member role, if the role is 5 then check for the guest_view_all_features if it is true then show all the issues else show only the issues created by the user
+
+        issue_queryset = issue_queryset.filter(
+            Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=True,
            )
+            | Q(
+                project__project_projectmember__role=5,
+                project__guest_view_all_features=False,
+                created_by=self.request.user,
+            )
+            |
+            # For other roles (role < 5), show all issues
+            Q(project__project_projectmember__role__gt=5),
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
+        )

        # Issue queryset
        issue_queryset, order_by_param = order_issue_queryset(
@@ -421,19 +431,21 @@ class IssueViewViewSet(BaseViewSet):
            .distinct()
        )

-    allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST]
-    )
+    allow_permission(allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])

    def list(self, request, slug, project_id):
        queryset = self.get_queryset()
-        if ProjectMember.objects.filter(
-            workspace__slug=slug,
-            project_id=project_id,
-            member=request.user,
-            role=5,
-            is_active=True,
-        ).exists():
+        project = Project.objects.get(id=project_id)
+        if (
+            ProjectMember.objects.filter(
+                workspace__slug=slug,
+                project_id=project_id,
+                member=request.user,
+                role=5,
+                is_active=True,
+            ).exists()
+            and not project.guest_view_all_features
+        ):
            queryset = queryset.filter(owned_by=request.user)
        fields = [
            field
@@ -445,14 +457,34 @@ class IssueViewViewSet(BaseViewSet):
        ).data
        return Response(views, status=status.HTTP_200_OK)

-    allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST]
-    )
+    allow_permission(allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])

    def retrieve(self, request, slug, project_id, pk):
        issue_view = (
            self.get_queryset().filter(pk=pk, project_id=project_id).first()
        )
+        project = Project.objects.get(id=project_id)
+        """
+        if the role is guest and guest_view_all_features is false and owned by is not 
+        the requesting user then dont show the view
+        """
+
+        if (
+            ProjectMember.objects.filter(
+                workspace__slug=slug,
+                project_id=project_id,
+                member=request.user,
+                role=5,
+                is_active=True,
+            ).exists()
+            and not project.guest_view_all_features
+            and not issue_view.owned_by == request.user
+        ):
+            return Response(
+                {"error": "You are not allowed to view this issue"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
        serializer = IssueViewSerializer(issue_view)
        recent_visited_task.delay(
            slug=slug,
@@ -43,6 +43,7 @@ from plane.db.models import (
    WorkspaceMember,
    WorkspaceTheme,
 )
+from plane.app.permissions import ROLE, allow_permission
 from plane.utils.cache import cache_response, invalidate_cache
 from django.utils.decorators import method_decorator
 from django.views.decorators.cache import cache_control
@@ -147,11 +148,25 @@ class WorkSpaceViewSet(BaseViewSet):
                )

    @cache_response(60 * 60 * 2)
+    @allow_permission(
+        [
+            ROLE.ADMIN,
+            ROLE.MEMBER,
+            ROLE.GUEST,
+        ],
+        level="WORKSPACE",
+    )
    def list(self, request, *args, **kwargs):
        return super().list(request, *args, **kwargs)

    @invalidate_cache(path="/api/workspaces/", user=False)
    @invalidate_cache(path="/api/users/me/workspaces/")
+    @allow_permission(
+        [
+            ROLE.ADMIN,
+        ],
+        level="WORKSPACE",
+    )
    def partial_update(self, request, *args, **kwargs):
        return super().partial_update(request, *args, **kwargs)

@@ -162,6 +177,7 @@ class WorkSpaceViewSet(BaseViewSet):
    @invalidate_cache(
        path="/api/users/me/settings/", multiple=True, user=False
    )
+    @allow_permission([ROLE.ADMIN], level="WORKSPACE")
    def destroy(self, request, *args, **kwargs):
        return super().destroy(request, *args, **kwargs)

@@ -74,7 +74,7 @@ class WorkspaceInvitationsViewset(BaseViewSet):
            [
                email
                for email in emails
-                if int(email.get("role", 10)) > requesting_user.role
+                if int(email.get("role", 5)) > requesting_user.role
            ]
        ):
            return Response(
@@ -119,7 +119,7 @@ class WorkspaceInvitationsViewset(BaseViewSet):
                            settings.SECRET_KEY,
                            algorithm="HS256",
                        ),
-                        role=email.get("role", 10),
+                        role=email.get("role", 5),
                        created_by=request.user,
                    )
                )
@@ -13,7 +13,8 @@ from rest_framework.response import Response
 from plane.app.permissions import (
    WorkSpaceAdminPermission,
    WorkspaceEntityPermission,
-    WorkspaceUserPermission,
+    allow_permission,
+    ROLE,
 )

 # Module imports
@@ -43,22 +44,6 @@ class WorkSpaceMemberViewSet(BaseViewSet):
    serializer_class = WorkspaceMemberAdminSerializer
    model = WorkspaceMember

-    permission_classes = [
-        WorkspaceEntityPermission,
-    ]
-
-    def get_permissions(self):
-        if self.action == "leave":
-            self.permission_classes = [
-                WorkspaceUserPermission,
-            ]
-        else:
-            self.permission_classes = [
-                WorkspaceEntityPermission,
-            ]
-
-        return super(WorkSpaceMemberViewSet, self).get_permissions()
-
    search_fields = [
        "member__display_name",
        "member__first_name",
@@ -77,6 +62,9 @@ class WorkSpaceMemberViewSet(BaseViewSet):
        )

    @cache_response(60 * 60 * 2)
+    @allow_permission(
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE"
+    )
    def list(self, request, slug):
        workspace_member = WorkspaceMember.objects.get(
            member=request.user,
@@ -87,7 +75,7 @@ class WorkSpaceMemberViewSet(BaseViewSet):
        # Get all active workspace members
        workspace_members = self.get_queryset()

-        if workspace_member.role > 10:
+        if workspace_member.role > 5:
            serializer = WorkspaceMemberAdminSerializer(
                workspace_members,
                fields=("id", "member", "role"),
@@ -107,6 +95,7 @@ class WorkSpaceMemberViewSet(BaseViewSet):
        user=False,
        multiple=True,
    )
+    @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")
    def partial_update(self, request, slug, pk):
        workspace_member = WorkspaceMember.objects.get(
            pk=pk,
@@ -120,25 +109,10 @@ class WorkSpaceMemberViewSet(BaseViewSet):
                status=status.HTTP_400_BAD_REQUEST,
            )

-        # Get the requested user role
-        requested_workspace_member = WorkspaceMember.objects.get(
-            workspace__slug=slug,
-            member=request.user,
-            is_active=True,
-        )
-        # Check if role is being updated
-        # One cannot update role higher than his own role
-        if (
-            "role" in request.data
-            and int(request.data.get("role", workspace_member.role))
-            > requested_workspace_member.role
-        ):
-            return Response(
-                {
-                    "error": "You cannot update a role that is higher than your own role"
-                },
-                status=status.HTTP_400_BAD_REQUEST,
-            )
+        if workspace_member.role > int(request.data.get("role")):
+            _ = ProjectMember.objects.filter(
+                workspace__slug=slug, member_id=workspace_member.member_id
+            ).update(role=int(request.data.get("role")))

        serializer = WorkSpaceMemberSerializer(
            workspace_member, data=request.data, partial=True
@@ -159,6 +133,7 @@ class WorkSpaceMemberViewSet(BaseViewSet):
    @invalidate_cache(
        path="/api/users/me/workspaces/", user=False, multiple=True
    )
+    @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")
    def destroy(self, request, slug, pk):
        # Check the user role who is deleting the user
        workspace_member = WorkspaceMember.objects.get(
@@ -233,6 +208,9 @@ class WorkSpaceMemberViewSet(BaseViewSet):
    @invalidate_cache(
        path="api/users/me/workspaces/", user=False, multiple=True
    )
+    @allow_permission(
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE"
+    )
    def leave(self, request, slug):
        workspace_member = WorkspaceMember.objects.get(
            workspace__slug=slug,
@@ -288,7 +288,7 @@ class WorkspaceUserProfileEndpoint(BaseAPIView):
            is_active=True,
        )
        projects = []
-        if requesting_workspace_member.role >= 10:
+        if requesting_workspace_member.role >= 15:
            projects = (
                Project.objects.filter(
                    workspace__slug=slug,
@@ -49,7 +49,7 @@ def process_workspace_project_invitations(user):
                workspace_id=project_member_invite.workspace_id,
                role=(
                    project_member_invite.role
-                    if project_member_invite.role in [5, 10, 15]
+                    if project_member_invite.role in [5, 15]
                    else 15
                ),
                member=user,
@@ -67,7 +67,7 @@ def process_workspace_project_invitations(user):
                workspace_id=project_member_invite.workspace_id,
                role=(
                    project_member_invite.role
-                    if project_member_invite.role in [5, 10, 15]
+                    if project_member_invite.role in [5, 15]
                    else 15
                ),
                member=user,
@@ -0,0 +1,120 @@
+# Django imports
+from django.db.models import Sum
+from django.utils import timezone
+from django.db.models import F
+from django.db.models.functions import RowNumber
+from django.db.models import Max, Subquery, OuterRef
+
+# Third party imports
+from celery import shared_task
+from plane.db.models import Cycle, CycleIssueStateProgress, CycleAnalytics
+
+
+@shared_task
+def track_cycle_issue_state_progress():
+
+    active_cycles = Cycle.objects.filter(
+        start_date__lte=timezone.now(), end_date__gte=timezone.now()
+    ).values_list("id", "project_id", "workspace_id")
+
+    analytics_records = []
+    current_date = timezone.now().date()
+
+    for cycle_id, project_id, workspace_id in active_cycles:
+        # Subquery to get the latest id for each issue_id
+        # Subquery to get the latest created_at for each issue_id
+        # latest_created_at = CycleIssueStateProgress.objects.filter(
+        #     cycle_id=cycle_id,
+        #     type__in=["ADDED", "UPDATED"],
+        #     issue_id=OuterRef("issue_id"),
+        #     created_at__lte=timezone.now(),
+        # ).values('issue_id').annotate(
+        #     latest_created=Max('created_at')
+        # ).values('latest_created')
+
+        # # Main query to get the latest unique issues
+        # cycle_issues = CycleIssueStateProgress.objects.filter(
+        #     cycle_id=cycle_id,
+        #     type__in=["ADDED", "UPDATED"],
+        #     created_at=Subquery(latest_created_at),
+        #     issue_id=OuterRef("issue_id")
+        # ).order_by("issue_id")
+
+        cycle_issues = CycleIssueStateProgress.objects.filter(
+            id=Subquery(
+                CycleIssueStateProgress.objects.filter(
+                    cycle_id=cycle_id,
+                    type__in=["ADDED", "UPDATED"],
+                    issue=OuterRef("issue"),
+                )
+                .order_by("-created_at")
+                .values("id")[:1]
+            )
+        )
+        # print()
+        for issue in cycle_issues.values():
+            print(issue, "issues")
+
+        total_issues = cycle_issues.count()
+        total_estimate_points = (
+            cycle_issues.aggregate(
+                total_estimate_points=Sum("estimate_value")
+            )["total_estimate_points"]
+            or 0
+        )
+
+        state_groups = [
+            "backlog",
+            "unstarted",
+            "started",
+            "completed",
+            "cancelled",
+        ]
+        state_data = {
+            group: {
+                "count": cycle_issues.filter(state_group=group).count(),
+                "estimate_points": cycle_issues.filter(
+                    state_group=group
+                ).aggregate(total_estimate_points=Sum("estimate_value"))[
+                    "total_estimate_points"
+                ]
+                or 0,
+            }
+            for group in state_groups
+        }
+
+        # Prepare analytics record for bulk insert
+        analytics_records.append(
+            CycleAnalytics(
+                cycle_id=cycle_id,
+                date=current_date,
+                total_issues=total_issues,
+                total_estimate_points=total_estimate_points,
+                backlog_issues=state_data["backlog"]["count"],
+                unstarted_issues=state_data["unstarted"]["count"],
+                started_issues=state_data["started"]["count"],
+                completed_issues=state_data["completed"]["count"],
+                cancelled_issues=state_data["cancelled"]["count"],
+                backlog_estimate_points=state_data["backlog"][
+                    "estimate_points"
+                ],
+                unstarted_estimate_points=state_data["unstarted"][
+                    "estimate_points"
+                ],
+                started_estimate_points=state_data["started"][
+                    "estimate_points"
+                ],
+                completed_estimate_points=state_data["completed"][
+                    "estimate_points"
+                ],
+                cancelled_estimate_points=state_data["cancelled"][
+                    "estimate_points"
+                ],
+                project_id=project_id,
+                workspace_id=workspace_id,
+            )
+        )
+
+    # Bulk create the records at once
+    if analytics_records:
+        CycleAnalytics.objects.bulk_create(analytics_records)
@@ -244,9 +244,13 @@ def update_json_row(rows, row):
        )
        assignee, label = row["Assignee"], row["Labels"]

-        if assignee is not None and assignee not in existing_assignees:
+        if assignee is not None and (
+            existing_assignees is None or label not in existing_assignees
+        ):
            rows[matched_index]["Assignee"] += f", {assignee}"
-        if label is not None and label not in existing_labels:
+        if label is not None and (
+            existing_labels is None or label not in existing_labels
+        ):
            rows[matched_index]["Labels"] += f", {label}"
    else:
        rows.append(row)
@@ -266,9 +270,13 @@ def update_table_row(rows, row):
        existing_assignees, existing_labels = rows[matched_index][7:9]
        assignee, label = row[7:9]

-        if assignee is not None and assignee not in existing_assignees:
-            rows[matched_index][7] += f", {assignee}"
-        if label is not None and label not in existing_labels:
+        if assignee is not None and (
+            existing_assignees is None or label not in existing_assignees
+        ):
+            rows[matched_index][8] += f", {assignee}"
+        if label is not None and (
+            existing_labels is None or label not in existing_labels
+        ):
            rows[matched_index][8] += f", {label}"
    else:
        rows.append(row)
@@ -40,6 +40,10 @@ app.conf.beat_schedule = {
        "task": "plane.bgtasks.deletion_task.hard_delete",
        "schedule": crontab(hour=0, minute=0),
    },
+    "track-cycle-issue-state-progress": {
+        "task": "plane.bgtasks.cycle_issue_state_progress_task.track_cycle_issue_state_progress",
+        "schedule": crontab(hour=9, minute=6),
+    },
 }

 # Load task modules from all registered Django app configs.
@@ -0,0 +1,60 @@
+# Generated by Django 4.2.15 on 2024-08-30 07:34
+
+from django.db import migrations, models
+
+
+def update_workspace_project_member_role(apps, schema_editor):
+    WorkspaceMember = apps.get_model("db", "WorkspaceMember")
+    ProjectMember = apps.get_model("db", "ProjectMember")
+
+    # update all existing members with role 10 to role 5
+    WorkspaceMember.objects.filter(role=10).update(role=5)
+    ProjectMember.objects.filter(role=10).update(role=5)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("db", "0075_alter_fileasset_asset"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="projectmember",
+            name="role",
+            field=models.PositiveSmallIntegerField(
+                choices=[(20, "Admin"), (15, "Member"), (5, "Guest")],
+                default=5,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="projectmemberinvite",
+            name="role",
+            field=models.PositiveSmallIntegerField(
+                choices=[(20, "Admin"), (15, "Member"), (5, "Guest")],
+                default=5,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="workspacemember",
+            name="role",
+            field=models.PositiveSmallIntegerField(
+                choices=[(20, "Admin"), (15, "Member"), (5, "Guest")],
+                default=5,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="workspacememberinvite",
+            name="role",
+            field=models.PositiveSmallIntegerField(
+                choices=[(20, "Admin"), (15, "Member"), (5, "Guest")],
+                default=5,
+            ),
+        ),
+        migrations.AddField(
+            model_name="project",
+            name="guest_view_all_features",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.RunPython(update_workspace_project_member_role),
+    ]
@@ -2,7 +2,16 @@ from .analytic import AnalyticView
 from .api import APIActivityLog, APIToken
 from .asset import FileAsset
 from .base import BaseModel
-from .cycle import Cycle, CycleFavorite, CycleIssue, CycleUserProperties
+from .cycle import (
+    Cycle,
+    CycleFavorite,
+    CycleIssue,
+    CycleUserProperties,
+    CycleAnalytics,
+    CycleUpdates,
+    CycleUpdateReaction,
+    CycleIssueStateProgress,
+)
 from .dashboard import Dashboard, DashboardWidget, Widget
 from .deploy_board import DeployBoard
 from .estimate import Estimate, EstimatePoint
@@ -1,3 +1,6 @@
+# Python Imports
+import pytz
+
 # Django imports
 from django.conf import settings
 from django.db import models
@@ -55,10 +58,12 @@ class Cycle(ProjectBaseModel):
    description = models.TextField(
        verbose_name="Cycle Description", blank=True
    )
-    start_date = models.DateField(
+    start_date = models.DateTimeField(
        verbose_name="Start Date", blank=True, null=True
    )
-    end_date = models.DateField(verbose_name="End Date", blank=True, null=True)
+    end_date = models.DateTimeField(
+        verbose_name="End Date", blank=True, null=True
+    )
    owned_by = models.ForeignKey(
        settings.AUTH_USER_MODEL,
        on_delete=models.CASCADE,
@@ -71,6 +76,11 @@ class Cycle(ProjectBaseModel):
    progress_snapshot = models.JSONField(default=dict)
    archived_at = models.DateTimeField(null=True)
    logo_props = models.JSONField(default=dict)
+    # timezone
+    USER_TIMEZONE_CHOICES = tuple(zip(pytz.all_timezones, pytz.all_timezones))
+    user_timezone = models.CharField(
+        max_length=255, default="UTC", choices=USER_TIMEZONE_CHOICES
+    )

    class Meta:
        verbose_name = "Cycle"
@@ -176,3 +186,140 @@ class CycleUserProperties(ProjectBaseModel):

    def __str__(self):
        return f"{self.cycle.name} {self.user.email}"
+
+
+class TypeEnum(models.TextChoices):
+    ADDED = "ADDED", "Added"
+    UPDATED = "UPDATED", "Updated"
+    REMOVED = "REMOVED", "Removed"
+    TRANSFER = "TRANSFER", "Transfer"
+
+
+class CycleIssueStateProgress(ProjectBaseModel):
+    cycle = models.ForeignKey(
+        "db.Cycle",
+        on_delete=models.DO_NOTHING,
+        related_name="cycle_issue_state_progress",
+    )
+    state = models.ForeignKey(
+        "db.State",
+        on_delete=models.DO_NOTHING,
+        related_name="cycle_issue_state_progress",
+    )
+    issue = models.ForeignKey(
+        "db.Issue",
+        on_delete=models.DO_NOTHING,
+        related_name="cycle_issue_state_progress",
+    )
+    state_group = models.CharField(max_length=255)
+    type = models.CharField(
+        max_length=30,
+        choices=TypeEnum.choices,
+    )
+    estimate_id = models.UUIDField(null=True)
+    estimate_value = models.FloatField(null=True)
+
+
+    class Meta:
+        verbose_name = "Cycle Issue State Progress"
+        verbose_name_plural = "Cycle Issue State Progress"
+        db_table = "cycle_issue_state_progress"
+        ordering = ("-created_at",)
+    
+    def __str__(self):
+        return f"{self.cycle.name} {self.issue.name}"
+
+
+class CycleAnalytics(ProjectBaseModel):
+    cycle = models.ForeignKey(
+        "db.Cycle", on_delete=models.CASCADE, related_name="cycle_analytics"
+    )
+    date = models.DateField()
+    data = models.JSONField(default=dict)
+
+    total_issues = models.FloatField(default=0)
+    total_estimate_points = models.FloatField(default=0)
+
+    # state group wise distribution
+    backlog_issues = models.FloatField(default=0)
+    unstarted_issues = models.FloatField(default=0)
+    started_issues = models.FloatField(default=0)
+    completed_issues = models.FloatField(default=0)
+    cancelled_issues = models.FloatField(default=0)
+
+    backlog_estimate_points = models.FloatField(default=0)
+    unstarted_estimate_points = models.FloatField(default=0)
+    started_estimate_points = models.FloatField(default=0)
+    completed_estimate_points = models.FloatField(default=0)
+    cancelled_estimate_points = models.FloatField(default=0)
+
+    class Meta:
+        unique_together = ["cycle", "date"]
+        verbose_name = "Cycle Analytics"
+        verbose_name_plural = "Cycle Analytics"
+        db_table = "cycle_analytics"
+        ordering = ("-created_at",)
+
+    def __str__(self):
+        return f"{self.user.email} <{self.cycle.name}>"
+
+
+class UpdatesEnum(models.TextChoices):
+    ONTRACK = "ONTRACK", "On Track"
+    OFFTRACK = "OFFTRACK", "Off Track"
+    AT_RISK = "AT_RISK", "At Risk"
+    STARTED = "STARTED", "Started"
+    SCOPE_INCREASED = "SCOPE_INCREASED", "Scope Increased"
+    SCOPE_DECREASED = "SCOPE_DECREASED", "Scope Decreased"
+
+
+class CycleUpdates(ProjectBaseModel):
+    cycle = models.ForeignKey(
+        "db.Cycle", on_delete=models.CASCADE, related_name="cycle_updates"
+    )
+    description = models.TextField(blank=True)
+    status = models.CharField(
+        max_length=30,
+        choices=UpdatesEnum.choices,
+    )
+    completed_issues = models.FloatField(default=0)
+    total_issues = models.FloatField(default=0)
+    total_estimate_points = models.FloatField(default=0)
+    completed_estimate_points = models.FloatField(default=0)
+
+    class Meta:
+        verbose_name = "Cycle Updates"
+        verbose_name_plural = "Cycle Updates"
+        db_table = "cycle_updates"
+        ordering = ("-created_at",)
+
+    def __str__(self):
+        return f"{self.cycle.name}"
+
+
+class CycleUpdateReaction(ProjectBaseModel):
+    cycle = models.ForeignKey(
+        "db.Cycle",
+        on_delete=models.CASCADE,
+        related_name="cycle_update_reactions",
+    )
+    update = models.ForeignKey(
+        "db.CycleUpdates",
+        on_delete=models.CASCADE,
+        related_name="cycle_update_reactions",
+    )
+    reaction = models.CharField(max_length=20)
+    actor = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE,
+        related_name="cycle_update_reactions",
+    )
+
+    class Meta:
+        verbose_name = "Cycle Update Reaction"
+        verbose_name_plural = "Cycle Update Reactions"
+        db_table = "cycle_update_reactions"
+        ordering = ("-created_at",)
+
+    def __str__(self):
+        return f"{self.actor.email} <{self.cycle.name}>"
@@ -1,4 +1,5 @@
 # Python imports
+import pytz
 from uuid import uuid4

 # Django imports
@@ -16,7 +17,6 @@ from .base import BaseModel
 ROLE_CHOICES = (
    (20, "Admin"),
    (15, "Member"),
-    (10, "Viewer"),
    (5, "Guest"),
 )

@@ -98,6 +98,7 @@ class Project(BaseModel):
    inbox_view = models.BooleanField(default=False)
    is_time_tracking_enabled = models.BooleanField(default=False)
    is_issue_type_enabled = models.BooleanField(default=False)
+    guest_view_all_features = models.BooleanField(default=False)
    cover_image = models.URLField(blank=True, null=True, max_length=800)
    estimate = models.ForeignKey(
        "db.Estimate",
@@ -119,6 +120,11 @@ class Project(BaseModel):
        related_name="default_state",
    )
    archived_at = models.DateTimeField(null=True)
+    # timezone
+    USER_TIMEZONE_CHOICES = tuple(zip(pytz.all_timezones, pytz.all_timezones))
+    user_timezone = models.CharField(
+        max_length=255, default="UTC", choices=USER_TIMEZONE_CHOICES
+    )

    def __str__(self):
        """Return name of the project"""
@@ -173,7 +179,7 @@ class ProjectMemberInvite(ProjectBaseModel):
    token = models.CharField(max_length=255)
    message = models.TextField(null=True)
    responded_at = models.DateTimeField(null=True)
-    role = models.PositiveSmallIntegerField(choices=ROLE_CHOICES, default=10)
+    role = models.PositiveSmallIntegerField(choices=ROLE_CHOICES, default=5)

    class Meta:
        verbose_name = "Project Member Invite"
@@ -194,7 +200,7 @@ class ProjectMember(ProjectBaseModel):
        related_name="member_project",
    )
    comment = models.TextField(blank=True, null=True)
-    role = models.PositiveSmallIntegerField(choices=ROLE_CHOICES, default=10)
+    role = models.PositiveSmallIntegerField(choices=ROLE_CHOICES, default=5)
    view_props = models.JSONField(default=get_default_props)
    default_props = models.JSONField(default=get_default_props)
    preferences = models.JSONField(default=get_default_preferences)
@@ -8,9 +8,8 @@ from .base import BaseModel
 from plane.utils.constants import RESTRICTED_WORKSPACE_SLUGS

 ROLE_CHOICES = (
-    (20, "Owner"),
-    (15, "Admin"),
-    (10, "Member"),
+    (20, "Admin"),
+    (15, "Member"),
    (5, "Guest"),
 )

@@ -177,7 +176,7 @@ class WorkspaceMember(BaseModel):
        on_delete=models.CASCADE,
        related_name="member_workspace",
    )
-    role = models.PositiveSmallIntegerField(choices=ROLE_CHOICES, default=10)
+    role = models.PositiveSmallIntegerField(choices=ROLE_CHOICES, default=5)
    company_role = models.TextField(null=True, blank=True)
    view_props = models.JSONField(default=get_default_props)
    default_props = models.JSONField(default=get_default_props)
@@ -214,7 +213,7 @@ class WorkspaceMemberInvite(BaseModel):
    token = models.CharField(max_length=255)
    message = models.TextField(null=True)
    responded_at = models.DateTimeField(null=True)
-    role = models.PositiveSmallIntegerField(choices=ROLE_CHOICES, default=10)
+    role = models.PositiveSmallIntegerField(choices=ROLE_CHOICES, default=5)

    class Meta:
        unique_together = ["email", "workspace", "deleted_at"]
@@ -265,7 +265,7 @@ if AMQP_URL:
    CELERY_BROKER_URL = AMQP_URL
 else:
    CELERY_BROKER_URL = f"amqp://{RABBITMQ_USER}:{RABBITMQ_PASSWORD}@{RABBITMQ_HOST}:{RABBITMQ_PORT}/{RABBITMQ_VHOST}"
- 
+
 CELERY_TIMEZONE = TIME_ZONE
 CELERY_TASK_SERIALIZER = "json"
 CELERY_RESULT_SERIALIZER = "json"
@@ -279,6 +279,7 @@ CELERY_IMPORTS = (
    "plane.bgtasks.file_asset_task",
    "plane.bgtasks.email_notification_task",
    "plane.bgtasks.api_logs_task",
+    "plane.bgtasks.cycle_issue_state_progress_task",
    # management tasks
    "plane.bgtasks.dummy_data_task",
 )
@@ -336,14 +337,14 @@ SESSION_COOKIE_SECURE = secure_origins
 SESSION_COOKIE_HTTPONLY = True
 SESSION_ENGINE = "plane.db.models.session"
 SESSION_COOKIE_AGE = os.environ.get("SESSION_COOKIE_AGE", 604800)
-SESSION_COOKIE_NAME = "plane-session-id"
+SESSION_COOKIE_NAME = os.environ.get("SESSION_COOKIE_NAME", "session-id")
 SESSION_COOKIE_DOMAIN = os.environ.get("COOKIE_DOMAIN", None)
 SESSION_SAVE_EVERY_REQUEST = (
    os.environ.get("SESSION_SAVE_EVERY_REQUEST", "0") == "1"
 )

 # Admin Cookie
-ADMIN_SESSION_COOKIE_NAME = "plane-admin-session-id"
+ADMIN_SESSION_COOKIE_NAME = "admin-session-id"
 ADMIN_SESSION_COOKIE_AGE = os.environ.get("ADMIN_SESSION_COOKIE_AGE", 3600)

 # CSRF cookies
@@ -1 +1 @@
-python-3.12.3
+python-3.12.6
@@ -3,11 +3,13 @@ RUN apk add --no-cache libc6-compat
 # Set working directory
 WORKDIR /app

-
 COPY . .
 RUN yarn global add turbo
 RUN yarn install
 EXPOSE 3003

+ENV TURBO_TELEMETRY_DISABLED 1
+
 VOLUME [ "/app/node_modules", "/app/live/node_modules"]
+
 CMD ["yarn","dev", "--filter=live"]
@@ -28,6 +28,8 @@ RUN yarn install
 COPY --from=builder /app/out/full/ .
 COPY turbo.json turbo.json

+ENV TURBO_TELEMETRY_DISABLED 1
+
 RUN yarn turbo build --filter=live

 FROM base AS runner
@@ -36,4 +38,6 @@ WORKDIR /app
 COPY --from=installer /app .
 # COPY --from=installer /app/live/node_modules ./node_modules

+ENV TURBO_TELEMETRY_DISABLED 1
+
 EXPOSE 3000
@@ -54,6 +54,6 @@
    "nodemon": "^3.1.0",
    "ts-node": "^10.9.2",
    "tsup": "^7.2.0",
-    "typescript": "^5.4.5"
+    "typescript": "5.4.5"
  }
 }
@@ -14,7 +14,8 @@
    "packages/tsconfig",
    "packages/ui",
    "packages/types",
-    "packages/constants"
+    "packages/constants",
+    "packages/helpers"
  ],
  "scripts": {
    "build": "turbo run build",
@@ -79,7 +79,7 @@
    "tailwind-config-custom": "*",
    "tsconfig": "*",
    "tsup": "^7.2.0",
-    "typescript": "4.9.5"
+    "typescript": "5.4.5"
  },
  "keywords": [
    "editor",
@@ -4,20 +4,17 @@ import { SlashCommand } from "@/extensions";
 // plane editor types
 import { TIssueEmbedConfig } from "@/plane-editor/types";
 // types
-import { TExtensions, TFileHandler, TUserDetails } from "@/types";
+import { TExtensions, TUserDetails } from "@/types";

 type Props = {
  disabledExtensions?: TExtensions[];
-  fileHandler: TFileHandler;
  issueEmbedConfig: TIssueEmbedConfig | undefined;
  provider: HocuspocusProvider;
  userDetails: TUserDetails;
 };

-export const DocumentEditorAdditionalExtensions = (props: Props) => {
-  const { fileHandler } = props;
-
-  const extensions: Extensions = [SlashCommand(fileHandler.upload)];
+export const DocumentEditorAdditionalExtensions = (_props: Props) => {
+  const extensions: Extensions = [SlashCommand()];

  return extensions;
 };
@@ -1,7 +1,5 @@
 import { FC, ReactNode } from "react";
 import { Editor, EditorContent } from "@tiptap/react";
-// extensions
-import { ImageResizer } from "@/extensions/image";

 interface EditorContentProps {
  children?: ReactNode;
@@ -16,7 +14,6 @@ export const EditorContentWrapper: FC<EditorContentProps> = (props) => {
  return (
    <div tabIndex={tabIndex} onFocus={() => editor?.chain().focus(undefined, { scrollIntoView: false }).run()}>
      <EditorContent editor={editor} />
-      {editor?.isActive("image") && editor?.isEditable && <ImageResizer editor={editor} id={id} />}
      {children}
    </div>
  );
@@ -8,10 +8,10 @@ import { SideMenuExtension, SlashCommand } from "@/extensions";
 import { EditorRefApi, IRichTextEditor } from "@/types";

 const RichTextEditor = (props: IRichTextEditor) => {
-  const { dragDropEnabled, fileHandler } = props;
+  const { dragDropEnabled } = props;

  const getExtensions = useCallback(() => {
-    const extensions = [SlashCommand(fileHandler.upload)];
+    const extensions = [SlashCommand()];

    extensions.push(
      SideMenuExtension({
@@ -21,7 +21,7 @@ const RichTextEditor = (props: IRichTextEditor) => {
    );

    return extensions;
-  }, [dragDropEnabled, fileHandler.upload]);
+  }, [dragDropEnabled]);

  return (
    <EditorWrapper {...props} extensions={getExtensions()}>
@@ -101,7 +101,8 @@ export const BlockMenu = (props: BlockMenuProps) => {
      icon: Copy,
      key: "duplicate",
      label: "Duplicate",
-      isDisabled: editor.state.selection.content().content.firstChild?.type.name === "image",
+      isDisabled:
+        editor.state.selection.content().content.firstChild?.type.name === "image" || editor.isActive("imageComponent"),
      onClick: (e) => {
        e.preventDefault();
        e.stopPropagation();
@@ -23,7 +23,6 @@ import {
 } from "lucide-react";
 // helpers
 import {
-  insertImageCommand,
  insertTableCommand,
  setText,
  toggleBlockquote,
@@ -43,7 +42,7 @@ import {
  toggleUnderline,
 } from "@/helpers/editor-commands";
 // types
-import { TEditorCommands, UploadImage } from "@/types";
+import { TEditorCommands } from "@/types";

 export interface EditorMenuItem {
  key: TEditorCommands;
@@ -189,16 +188,17 @@ export const TableItem = (editor: Editor): EditorMenuItem => ({
  icon: TableIcon,
 });

-export const ImageItem = (editor: Editor, uploadFile: UploadImage) =>
+export const ImageItem = (editor: Editor) =>
  ({
    key: "image",
    name: "Image",
    isActive: () => editor?.isActive("image"),
-    command: (savedSelection: Selection | null) => insertImageCommand(editor, uploadFile, savedSelection),
+    command: (savedSelection: Selection | null) =>
+      editor?.commands.setImageUpload({ event: "insert", pos: savedSelection?.from }),
    icon: ImageIcon,
  }) as const;

-export function getEditorMenuItems(editor: Editor | null, uploadFile: UploadImage) {
+export function getEditorMenuItems(editor: Editor | null) {
  if (!editor) {
    return [];
  }
@@ -220,6 +220,6 @@ export function getEditorMenuItems(editor: Editor | null, uploadFile: UploadImag
    NumberedListItem(editor),
    QuoteItem(editor),
    TableItem(editor),
-    ImageItem(editor, uploadFile),
+    ImageItem(editor),
  ];
 }
@@ -11,6 +11,7 @@ import { CustomCodeInlineExtension } from "./code-inline";
 import { CustomLinkExtension } from "./custom-link";
 import { CustomHorizontalRule } from "./horizontal-rule";
 import { ImageExtensionWithoutProps } from "./image";
+import { CustomImageComponentWithoutProps } from "./image/image-component-without-props";
 import { IssueWidgetWithoutProps } from "./issue-embed/issue-embed-without-props";
 import { CustomMentionWithoutProps } from "./mentions/mentions-without-props";
 import { CustomQuoteExtension } from "./quote";
@@ -61,6 +62,7 @@ export const CoreEditorExtensionsWithoutProps = [
      class: "rounded-md",
    },
  }),
+  CustomImageComponentWithoutProps(),
  TiptapUnderline,
  TextStyle,
  TaskList.configure({
@@ -0,0 +1,128 @@
+import React, { useRef, useState, useCallback, useLayoutEffect } from "react";
+import { NodeSelection } from "@tiptap/pm/state";
+// extensions
+import { CustomImageNodeViewProps } from "@/extensions/custom-image";
+// helpers
+import { cn } from "@/helpers/common";
+
+const MIN_SIZE = 100;
+
+export const CustomImageBlock: React.FC<CustomImageNodeViewProps> = (props) => {
+  const { node, updateAttributes, selected, getPos, editor } = props;
+  const { src, width, height } = node.attrs;
+
+  const [size, setSize] = useState({ width: width || "35%", height: height || "auto" });
+  const [isLoading, setIsLoading] = useState(true);
+
+  const containerRef = useRef<HTMLDivElement>(null);
+  const containerRect = useRef<DOMRect | null>(null);
+  const imageRef = useRef<HTMLImageElement>(null);
+  const isResizing = useRef(false);
+  const aspectRatio = useRef(1);
+
+  useLayoutEffect(() => {
+    if (imageRef.current) {
+      const img = imageRef.current;
+      img.onload = () => {
+        if (node.attrs.width === "35%" && node.attrs.height === "auto") {
+          aspectRatio.current = img.naturalWidth / img.naturalHeight;
+          const initialWidth = Math.max(img.naturalWidth * 0.35, MIN_SIZE);
+          const initialHeight = initialWidth / aspectRatio.current;
+          setSize({ width: `${initialWidth}px`, height: `${initialHeight}px` });
+        }
+        setIsLoading(false);
+      };
+    }
+  }, [src]);
+
+  const handleResizeStart = useCallback((e: React.MouseEvent | React.TouchEvent) => {
+    e.preventDefault();
+    e.stopPropagation();
+    isResizing.current = true;
+    if (containerRef.current) {
+      containerRect.current = containerRef.current.getBoundingClientRect();
+    }
+  }, []);
+
+  useLayoutEffect(() => {
+    // for realtime resizing and undo/redo
+    setSize({ width, height });
+  }, [width, height]);
+
+  const handleResize = useCallback((e: MouseEvent | TouchEvent) => {
+    if (!isResizing.current || !containerRef.current || !containerRect.current) return;
+
+    const clientX = "touches" in e ? e.touches[0].clientX : e.clientX;
+
+    const newWidth = Math.max(clientX - containerRect.current.left, MIN_SIZE);
+    const newHeight = newWidth / aspectRatio.current;
+
+    setSize({ width: `${newWidth}px`, height: `${newHeight}px` });
+  }, []);
+
+  const handleResizeEnd = useCallback(() => {
+    if (isResizing.current) {
+      isResizing.current = false;
+      updateAttributes(size);
+    }
+  }, [size, updateAttributes]);
+
+  const handleMouseDown = useCallback(
+    (e: React.MouseEvent) => {
+      e.stopPropagation();
+      const pos = getPos();
+      const nodeSelection = NodeSelection.create(editor.state.doc, pos);
+      editor.view.dispatch(editor.state.tr.setSelection(nodeSelection));
+    },
+    [editor, getPos]
+  );
+
+  useLayoutEffect(() => {
+    const handleGlobalMouseMove = (e: MouseEvent) => handleResize(e);
+    const handleGlobalMouseUp = () => handleResizeEnd();
+
+    document.addEventListener("mousemove", handleGlobalMouseMove);
+    document.addEventListener("mouseup", handleGlobalMouseUp);
+
+    return () => {
+      document.removeEventListener("mousemove", handleGlobalMouseMove);
+      document.removeEventListener("mouseup", handleGlobalMouseUp);
+    };
+  }, [handleResize, handleResizeEnd]);
+
+  return (
+    <div
+      ref={containerRef}
+      className="group/image-component relative inline-block max-w-full"
+      onMouseDown={handleMouseDown}
+      style={{
+        width: size.width,
+        height: size.height,
+      }}
+    >
+      {isLoading && <div className="animate-pulse bg-custom-background-80 rounded-md" style={{ width, height }} />}
+      <img
+        ref={imageRef}
+        src={src}
+        className={cn("block rounded-md", {
+          hidden: isLoading,
+          "read-only-image": !editor.isEditable,
+        })}
+        style={{
+          width: size.width,
+          height: size.height,
+        }}
+      />
+      {editor.isEditable && selected && <div className="absolute inset-0 size-full bg-custom-primary-500/30" />}
+      {editor.isEditable && (
+        <>
+          <div className="opacity-0 group-hover/image-component:opacity-100 absolute inset-0 border-2 border-custom-primary-100 pointer-events-none rounded-md transition-opacity duration-100 ease-in-out" />
+          <div
+            className="opacity-0 pointer-events-none group-hover/image-component:opacity-100 group-hover/image-component:pointer-events-auto absolute bottom-0 right-0 translate-y-1/2 translate-x-1/2 size-4 rounded-full bg-custom-primary-100 border-2 border-white cursor-nwse-resize transition-opacity duration-100 ease-in-out"
+            onMouseDown={handleResizeStart}
+          />
+        </>
+      )}
+    </div>
+  );
+};
@@ -0,0 +1,122 @@
+import React, { useCallback, useEffect, useRef, useState } from "react";
+import { Node as ProsemirrorNode } from "@tiptap/pm/model";
+import { Editor, NodeViewWrapper } from "@tiptap/react";
+// extensions
+import {
+  CustomImageBlock,
+  CustomImageUploader,
+  UploadEntity,
+  UploadImageExtensionStorage,
+} from "@/extensions/custom-image";
+
+export type CustomImageNodeViewProps = {
+  getPos: () => number;
+  editor: Editor;
+  node: ProsemirrorNode & {
+    attrs: {
+      src: string;
+      width: string;
+      height: string;
+    };
+  };
+  updateAttributes: (attrs: Record<string, any>) => void;
+  selected: boolean;
+};
+
+export const CustomImageNode = (props: CustomImageNodeViewProps) => {
+  const { getPos, editor, node, updateAttributes, selected } = props;
+
+  const fileInputRef = useRef<HTMLInputElement>(null);
+  const hasTriggeredFilePickerRef = useRef(false);
+  const [isUploaded, setIsUploaded] = useState(!!node.attrs.src);
+
+  const id = node.attrs.id as string;
+  const editorStorage = editor.storage.imageComponent as UploadImageExtensionStorage | undefined;
+
+  const getUploadEntity = useCallback(
+    (): UploadEntity | undefined => editorStorage?.fileMap.get(id),
+    [editorStorage, id]
+  );
+
+  const onUpload = useCallback(
+    (url: string) => {
+      if (url) {
+        setIsUploaded(true);
+        // Update the node view's src attribute
+        updateAttributes({ src: url });
+        editorStorage?.fileMap.delete(id);
+      }
+    },
+    [editorStorage?.fileMap, id, updateAttributes]
+  );
+
+  const uploadFile = useCallback(
+    async (file: File) => {
+      try {
+        // @ts-expect-error - TODO: fix typings, and don't remove await from
+        // here for now
+        const url: string = await editor?.commands.uploadImage(file);
+
+        if (!url) {
+          throw new Error("Something went wrong while uploading the image");
+        }
+        onUpload(url);
+      } catch (error) {
+        console.error("Error uploading file:", error);
+      }
+    },
+    [editor.commands, onUpload]
+  );
+
+  useEffect(() => {
+    const uploadEntity = getUploadEntity();
+
+    if (uploadEntity) {
+      if (uploadEntity.event === "drop" && "file" in uploadEntity) {
+        uploadFile(uploadEntity.file);
+      } else if (uploadEntity.event === "insert" && fileInputRef.current && !hasTriggeredFilePickerRef.current) {
+        const entity = editorStorage?.fileMap.get(id);
+        if (entity && entity.hasOpenedFileInputOnce) return;
+        fileInputRef.current.click();
+        hasTriggeredFilePickerRef.current = true;
+        if (!entity) return;
+        editorStorage?.fileMap.set(id, { ...entity, hasOpenedFileInputOnce: true });
+      }
+    }
+  }, [getUploadEntity, uploadFile]);
+
+  useEffect(() => {
+    if (node.attrs.src) {
+      setIsUploaded(true);
+    }
+  }, [node.attrs.src]);
+
+  const existingFile = React.useMemo(() => {
+    const entity = getUploadEntity();
+    return entity && entity.event === "drop" ? entity.file : undefined;
+  }, [getUploadEntity]);
+
+  return (
+    <NodeViewWrapper>
+      <div className="p-0 mx-0 my-2" data-drag-handle>
+        {isUploaded ? (
+          <CustomImageBlock
+            editor={editor}
+            getPos={getPos}
+            node={node}
+            updateAttributes={updateAttributes}
+            selected={selected}
+          />
+        ) : (
+          <CustomImageUploader
+            onUpload={onUpload}
+            editor={editor}
+            fileInputRef={fileInputRef}
+            existingFile={existingFile}
+            selected={selected}
+          />
+        )}
+      </div>
+    </NodeViewWrapper>
+  );
+};
@@ -0,0 +1,90 @@
+import { ChangeEvent, useCallback, useEffect, useRef } from "react";
+import { Editor } from "@tiptap/core";
+import { ImageIcon } from "lucide-react";
+// helpers
+import { cn } from "@/helpers/common";
+// hooks
+import { useUploader, useFileUpload, useDropZone } from "@/hooks/use-file-upload";
+// plugins
+import { isFileValid } from "@/plugins/image";
+
+type RefType = React.RefObject<HTMLInputElement> | ((instance: HTMLInputElement | null) => void);
+
+const assignRef = (ref: RefType, value: HTMLInputElement | null) => {
+  if (typeof ref === "function") {
+    ref(value);
+  } else if (ref && typeof ref === "object") {
+    (ref as React.MutableRefObject<HTMLInputElement | null>).current = value;
+  }
+};
+
+export const CustomImageUploader = (props: {
+  onUpload: (url: string) => void;
+  editor: Editor;
+  fileInputRef: RefType;
+  existingFile?: File;
+  selected: boolean;
+}) => {
+  const { selected, onUpload, editor, fileInputRef, existingFile } = props;
+  const { loading, uploadFile } = useUploader({ onUpload, editor });
+  const { handleUploadClick, ref: internalRef } = useFileUpload();
+  const { draggedInside, onDrop, onDragEnter, onDragLeave } = useDropZone({ uploader: uploadFile });
+
+  const localRef = useRef<HTMLInputElement | null>(null);
+
+  const onFileChange = useCallback(
+    (e: ChangeEvent<HTMLInputElement>) => {
+      const file = e.target.files?.[0];
+      if (file) {
+        if (isFileValid(file)) {
+          uploadFile(file);
+        }
+      }
+    },
+    [uploadFile]
+  );
+
+  useEffect(() => {
+    // no need to validate as the file is already validated before the drop onto
+    // the editor
+    if (existingFile) {
+      uploadFile(existingFile);
+    }
+  }, [existingFile, uploadFile]);
+
+  return (
+    <div
+      className={cn(
+        "image-upload-component flex items-center justify-start gap-2 py-3 px-2 rounded-lg text-custom-text-300 hover:text-custom-text-200 bg-custom-background-90 hover:bg-custom-background-80 border border-dashed border-custom-border-300 cursor-pointer transition-all duration-200 ease-in-out",
+        {
+          "bg-custom-background-80 text-custom-text-200": draggedInside,
+        },
+        {
+          "text-custom-primary-200 bg-custom-primary-100/10": selected,
+        }
+      )}
+      onDrop={onDrop}
+      onDragOver={onDragEnter}
+      onDragLeave={onDragLeave}
+      contentEditable={false}
+      onClick={handleUploadClick}
+    >
+      <ImageIcon className="size-4" />
+      <div className="text-base font-medium">
+        {loading ? "Uploading..." : draggedInside ? "Drop image here" : existingFile ? "Uploading..." : "Add an image"}
+      </div>
+      <input
+        className="size-0 overflow-hidden"
+        ref={(element) => {
+          localRef.current = element;
+          assignRef(fileInputRef, element);
+          assignRef(internalRef as RefType, element);
+        }}
+        hidden
+        type="file"
+        accept=".jpg,.jpeg,.png,.webp"
+        onChange={onFileChange}
+      />
+    </div>
+  );
+};
@@ -0,0 +1,3 @@
+export * from "./image-block";
+export * from "./image-node";
+export * from "./image-uploader";
@@ -0,0 +1,157 @@
+import { mergeAttributes } from "@tiptap/core";
+import { Image } from "@tiptap/extension-image";
+import { ReactNodeViewRenderer } from "@tiptap/react";
+import { v4 as uuidv4 } from "uuid";
+// extensions
+import { CustomImageNode } from "@/extensions/custom-image";
+// plugins
+import { TrackImageDeletionPlugin, TrackImageRestorationPlugin, isFileValid } from "@/plugins/image";
+// types
+import { TFileHandler } from "@/types";
+// helpers
+import { insertEmptyParagraphAtNodeBoundaries } from "@/helpers/insert-empty-paragraph-at-node-boundary";
+
+declare module "@tiptap/core" {
+  interface Commands<ReturnType> {
+    imageComponent: {
+      setImageUpload: ({ file, pos, event }: { file?: File; pos?: number; event: "insert" | "drop" }) => ReturnType;
+      uploadImage: (file: File) => () => Promise<string> | undefined;
+    };
+  }
+}
+
+export interface UploadImageExtensionStorage {
+  fileMap: Map<string, UploadEntity>;
+}
+
+export type UploadEntity = ({ event: "insert" } | { event: "drop"; file: File }) & { hasOpenedFileInputOnce?: boolean };
+
+export const CustomImageExtension = (props: TFileHandler) => {
+  const { upload, delete: deleteImage, restore: restoreImage } = props;
+
+  return Image.extend<Record<string, unknown>, UploadImageExtensionStorage>({
+    name: "imageComponent",
+    selectable: true,
+    group: "block",
+    atom: true,
+    draggable: true,
+
+    addAttributes() {
+      return {
+        ...this.parent?.(),
+        width: {
+          default: "35%",
+        },
+        src: {
+          default: null,
+        },
+        height: {
+          default: "auto",
+        },
+        ["id"]: {
+          default: null,
+        },
+      };
+    },
+
+    parseHTML() {
+      return [
+        {
+          tag: "image-component",
+        },
+      ];
+    },
+
+    renderHTML({ HTMLAttributes }) {
+      return ["image-component", mergeAttributes(HTMLAttributes)];
+    },
+
+    onCreate(this) {
+      const imageSources = new Set<string>();
+      this.editor.state.doc.descendants((node) => {
+        if (node.type.name === this.name) {
+          imageSources.add(node.attrs.src);
+        }
+      });
+      imageSources.forEach(async (src) => {
+        try {
+          const assetUrlWithWorkspaceId = new URL(src).pathname.substring(1);
+          await restoreImage(assetUrlWithWorkspaceId);
+        } catch (error) {
+          console.error("Error restoring image: ", error);
+        }
+      });
+    },
+
+    addKeyboardShortcuts() {
+      return {
+        ArrowDown: insertEmptyParagraphAtNodeBoundaries("down", this.name),
+        ArrowUp: insertEmptyParagraphAtNodeBoundaries("up", this.name),
+      };
+    },
+
+    addProseMirrorPlugins() {
+      return [
+        TrackImageDeletionPlugin(this.editor, deleteImage, this.name),
+        TrackImageRestorationPlugin(this.editor, restoreImage, this.name),
+      ];
+    },
+
+    addStorage() {
+      return {
+        fileMap: new Map(),
+        deletedImageSet: new Map<string, boolean>(),
+      };
+    },
+
+    addCommands() {
+      return {
+        setImageUpload:
+          (props: { file?: File; pos?: number; event: "insert" | "drop" }) =>
+          ({ commands }) => {
+            // Early return if there's an invalid file being dropped
+            if (props?.file && !isFileValid(props.file)) {
+              return false;
+            }
+
+            // generate a unique id for the image to keep track of dropped
+            // files' file data
+            const fileId = uuidv4();
+            if (props?.event === "drop" && props.file) {
+              (this.editor.storage.imageComponent as UploadImageExtensionStorage).fileMap.set(fileId, {
+                file: props.file,
+                event: props.event,
+              });
+            } else if (props.event === "insert") {
+              (this.editor.storage.imageComponent as UploadImageExtensionStorage).fileMap.set(fileId, {
+                event: props.event,
+              });
+            }
+
+            const attributes = {
+              id: fileId,
+            };
+
+            if (props.pos) {
+              return commands.insertContentAt(props.pos, {
+                type: this.name,
+                attrs: attributes,
+              });
+            }
+            return commands.insertContent({
+              type: this.name,
+              attrs: attributes,
+            });
+          },
+        uploadImage: (file: File) => async () => {
+          const fileUrl = await upload(file);
+          return fileUrl;
+        },
+      };
+    },
+
+    addNodeView() {
+      return ReactNodeViewRenderer(CustomImageNode);
+    },
+  });
+};
@@ -0,0 +1,3 @@
+export * from "./components";
+export * from "./custom-image";
+export * from "./read-only-custom-image";
@@ -0,0 +1,54 @@
+import { mergeAttributes } from "@tiptap/core";
+import { Image } from "@tiptap/extension-image";
+import { ReactNodeViewRenderer } from "@tiptap/react";
+// components
+import { CustomImageNode, UploadImageExtensionStorage } from "@/extensions/custom-image";
+
+export const CustomReadOnlyImageExtension = () =>
+  Image.extend<Record<string, unknown>, UploadImageExtensionStorage>({
+    name: "imageComponent",
+    selectable: false,
+    group: "block",
+    atom: true,
+    draggable: false,
+
+    addAttributes() {
+      return {
+        ...this.parent?.(),
+        width: {
+          default: "35%",
+        },
+        src: {
+          default: null,
+        },
+        height: {
+          default: "auto",
+        },
+        ["id"]: {
+          default: null,
+        },
+      };
+    },
+
+    parseHTML() {
+      return [
+        {
+          tag: "image-component",
+        },
+      ];
+    },
+
+    renderHTML({ HTMLAttributes }) {
+      return ["image-component", mergeAttributes(HTMLAttributes)];
+    },
+
+    addStorage() {
+      return {
+        fileMap: new Map(),
+      };
+    },
+
+    addNodeView() {
+      return ReactNodeViewRenderer(CustomImageNode);
+    },
+  });
@@ -1,11 +1,8 @@
 import { Extension } from "@tiptap/core";
 import { Plugin, PluginKey } from "prosemirror-state";
-// plugins
-import { startImageUpload } from "@/plugins/image";
-// types
-import { UploadImage } from "@/types";
+import { EditorView } from "prosemirror-view";

-export const DropHandlerExtension = (uploadFile: UploadImage) =>
+export const DropHandlerExtension = () =>
  Extension.create({
    name: "dropHandler",
    priority: 1000,
@@ -15,28 +12,51 @@ export const DropHandlerExtension = (uploadFile: UploadImage) =>
        new Plugin({
          key: new PluginKey("drop-handler-plugin"),
          props: {
-            handlePaste: (view, event) => {
-              if (event.clipboardData && event.clipboardData.files && event.clipboardData.files[0]) {
+            handlePaste: (view: EditorView, event: ClipboardEvent) => {
+              if (event.clipboardData && event.clipboardData.files && event.clipboardData.files.length > 0) {
                event.preventDefault();
-                const file = event.clipboardData.files[0];
-                const pos = view.state.selection.from;
-                startImageUpload(this.editor, file, view, pos, uploadFile);
-                return true;
+                const files = Array.from(event.clipboardData.files);
+                const imageFiles = files.filter((file) => file.type.startsWith("image"));
+
+                if (imageFiles.length > 0) {
+                  const pos = view.state.selection.from;
+                  imageFiles.forEach((file, index) => {
+                    this.editor
+                      .chain()
+                      .focus()
+                      .setImageUpload({ file, pos: pos + index, event: "drop" })
+                      .run();
+                  });
+                  return true;
+                }
              }
              return false;
            },
-            handleDrop: (view, event, _slice, moved) => {
-              if (!moved && event.dataTransfer && event.dataTransfer.files && event.dataTransfer.files[0]) {
+            handleDrop: (view: EditorView, event: DragEvent, _slice: any, moved: boolean) => {
+              if (!moved && event.dataTransfer && event.dataTransfer.files && event.dataTransfer.files.length > 0) {
                event.preventDefault();
-                const file = event.dataTransfer.files[0];
-                const coordinates = view.posAtCoords({
-                  left: event.clientX,
-                  top: event.clientY,
-                });
-                if (coordinates) {
-                  startImageUpload(this.editor, file, view, coordinates.pos - 1, uploadFile);
+                const files = Array.from(event.dataTransfer.files);
+                const imageFiles = files.filter((file) => file.type.startsWith("image"));
+
+                if (imageFiles.length > 0) {
+                  const coordinates = view.posAtCoords({
+                    left: event.clientX,
+                    top: event.clientY,
+                  });
+
+                  if (coordinates) {
+                    imageFiles.forEach((file, index) => {
+                      setTimeout(() => {
+                        this.editor
+                          .chain()
+                          .focus()
+                          .setImageUpload({ file, pos: coordinates.pos + index, event: "drop" })
+                          .run();
+                      }, index * 100); // Slight delay between insertions
+                    });
+                  }
+                  return true;
                }
-                return true;
              }
              return false;
            },
@@ -12,6 +12,7 @@ import {
  CustomCodeInlineExtension,
  CustomCodeMarkPlugin,
  CustomHorizontalRule,
+  CustomImageExtension,
  CustomKeymap,
  CustomLinkExtension,
  CustomMention,
@@ -79,7 +80,7 @@ export const CoreEditorExtensions = ({
    ...(enableHistory ? {} : { history: false }),
  }),
  CustomQuoteExtension,
-  DropHandlerExtension(uploadFile),
+  DropHandlerExtension(),
  CustomHorizontalRule.configure({
    HTMLAttributes: {
      class: "my-4 border-custom-border-400",
@@ -104,6 +105,12 @@ export const CoreEditorExtensions = ({
      class: "rounded-md",
    },
  }),
+  CustomImageExtension({
+    delete: deleteFile,
+    restore: restoreFile,
+    upload: uploadFile,
+    cancel: cancelUploadImage ?? (() => {}),
+  }),
  TiptapUnderline,
  TextStyle,
  TaskList.configure({
@@ -142,7 +149,7 @@ export const CoreEditorExtensions = ({
    placeholder: ({ editor, node }) => {
      if (node.type.name === "heading") return `Heading ${node.attrs.level}`;

-      if (editor.storage.image.uploadInProgress) return "";
+      // if (editor.storage.image.uploadInProgress) return "";

      const shouldHidePlaceholder =
        editor.isActive("table") || editor.isActive("codeBlock") || editor.isActive("image");
@@ -1,37 +1,33 @@
 import ImageExt from "@tiptap/extension-image";
+import { ReactNodeViewRenderer } from "@tiptap/react";
 // helpers
 import { insertEmptyParagraphAtNodeBoundaries } from "@/helpers/insert-empty-paragraph-at-node-boundary";
 // plugins
-import {
-  IMAGE_NODE_TYPE,
-  ImageExtensionStorage,
-  TrackImageDeletionPlugin,
-  TrackImageRestorationPlugin,
-  UploadImagesPlugin,
-} from "@/plugins/image";
+import { ImageExtensionStorage, TrackImageDeletionPlugin, TrackImageRestorationPlugin } from "@/plugins/image";
 // types
 import { DeleteImage, RestoreImage } from "@/types";
+// extensions
+import { CustomImageNode } from "@/extensions";

 export const ImageExtension = (deleteImage: DeleteImage, restoreImage: RestoreImage, cancelUploadImage?: () => void) =>
  ImageExt.extend<any, ImageExtensionStorage>({
    addKeyboardShortcuts() {
      return {
-        ArrowDown: insertEmptyParagraphAtNodeBoundaries("down", "image"),
-        ArrowUp: insertEmptyParagraphAtNodeBoundaries("up", "image"),
+        ArrowDown: insertEmptyParagraphAtNodeBoundaries("down", this.name),
+        ArrowUp: insertEmptyParagraphAtNodeBoundaries("up", this.name),
      };
    },
    addProseMirrorPlugins() {
      return [
-        UploadImagesPlugin(this.editor, cancelUploadImage),
-        TrackImageDeletionPlugin(this.editor, deleteImage),
-        TrackImageRestorationPlugin(this.editor, restoreImage),
+        TrackImageDeletionPlugin(this.editor, deleteImage, this.name),
+        TrackImageRestorationPlugin(this.editor, restoreImage, this.name),
      ];
    },

    onCreate(this) {
      const imageSources = new Set<string>();
      this.editor.state.doc.descendants((node) => {
-        if (node.type.name === IMAGE_NODE_TYPE) {
+        if (node.type.name === this.name) {
          imageSources.add(node.attrs.src);
        }
      });
@@ -64,4 +60,9 @@ export const ImageExtension = (deleteImage: DeleteImage, restoreImage: RestoreIm
        },
      };
    },
+
+    // render custom image node
+    addNodeView() {
+      return ReactNodeViewRenderer(CustomImageNode);
+    },
  });
@@ -0,0 +1,57 @@
+import { mergeAttributes } from "@tiptap/core";
+import { ReactNodeViewRenderer } from "@tiptap/react";
+import { Image } from "@tiptap/extension-image";
+// extensions
+import { CustomImageNode, UploadImageExtensionStorage } from "@/extensions";
+
+export const CustomImageComponentWithoutProps = () =>
+  Image.extend<Record<string, unknown>, UploadImageExtensionStorage>({
+    name: "imageComponent",
+    selectable: true,
+    group: "block",
+    atom: true,
+    draggable: true,
+
+    addAttributes() {
+      return {
+        ...this.parent?.(),
+        width: {
+          default: "35%",
+        },
+        src: {
+          default: null,
+        },
+        height: {
+          default: "auto",
+        },
+        ["id"]: {
+          default: null,
+        },
+      };
+    },
+
+    parseHTML() {
+      return [
+        {
+          tag: "image-component",
+        },
+      ];
+    },
+
+    renderHTML({ HTMLAttributes }) {
+      return ["image-component", mergeAttributes(HTMLAttributes)];
+    },
+
+    addStorage() {
+      return {
+        fileMap: new Map(),
+        deletedImageSet: new Map<string, boolean>(),
+      };
+    },
+
+    addNodeView() {
+      return ReactNodeViewRenderer(CustomImageNode);
+    },
+  });
+
+export default CustomImageComponentWithoutProps;
@@ -1,4 +1,7 @@
 import ImageExt from "@tiptap/extension-image";
+import { ReactNodeViewRenderer } from "@tiptap/react";
+// extensions
+import { CustomImageNode } from "@/extensions";

 export const ImageExtensionWithoutProps = () =>
  ImageExt.extend({
@@ -13,4 +16,8 @@ export const ImageExtensionWithoutProps = () =>
        },
      };
    },
+
+    addNodeView() {
+      return ReactNodeViewRenderer(CustomImageNode);
+    },
  });
@@ -1,85 +0,0 @@
-import { useState } from "react";
-import { Editor } from "@tiptap/react";
-import Moveable from "react-moveable";
-
-type Props = {
-  editor: Editor;
-  id: string;
-};
-
-const getImageElement = (editorId: string): HTMLImageElement | null =>
-  document.querySelector(`#editor-container-${editorId}.active-editor .ProseMirror-selectednode`);
-
-export const ImageResizer = (props: Props) => {
-  const { editor, id } = props;
-  // states
-  const [aspectRatio, setAspectRatio] = useState(1);
-
-  const updateMediaSize = () => {
-    const imageElement = getImageElement(id);
-
-    if (!imageElement) return;
-
-    const selection = editor.state.selection;
-
-    // Use the style width/height if available, otherwise fall back to the element's natural width/height
-    const width = imageElement.style.width
-      ? Number(imageElement.style.width.replace("px", ""))
-      : imageElement.getAttribute("width");
-    const height = imageElement.style.height
-      ? Number(imageElement.style.height.replace("px", ""))
-      : imageElement.getAttribute("height");
-
-    editor.commands.setImage({
-      src: imageElement.src,
-      width: width,
-      height: height,
-    } as any);
-    editor.commands.setNodeSelection(selection.from);
-  };
-
-  return (
-    <Moveable
-      target={getImageElement(id)}
-      container={null}
-      origin={false}
-      edge={false}
-      throttleDrag={0}
-      keepRatio
-      resizable
-      throttleResize={0}
-      onResizeStart={() => {
-        const imageElement = getImageElement(id);
-        if (imageElement) {
-          const originalWidth = Number(imageElement.width);
-          const originalHeight = Number(imageElement.height);
-          setAspectRatio(originalWidth / originalHeight);
-        }
-      }}
-      onResize={({ target, width, height, delta }) => {
-        if (delta[0] || delta[1]) {
-          let newWidth, newHeight;
-          if (delta[0]) {
-            // Width change detected
-            newWidth = Math.max(width, 100);
-            newHeight = newWidth / aspectRatio;
-          } else if (delta[1]) {
-            // Height change detected
-            newHeight = Math.max(height, 100);
-            newWidth = newHeight * aspectRatio;
-          }
-          target.style.width = `${newWidth}px`;
-          target.style.height = `${newHeight}px`;
-        }
-      }}
-      onResizeEnd={() => {
-        updateMediaSize();
-      }}
-      scalable
-      renderDirections={["se"]}
-      onScale={({ target, transform }) => {
-        target.style.transform = transform;
-      }}
-    />
-  );
-};
@@ -1,4 +1,3 @@
 export * from "./extension";
 export * from "./image-extension-without-props";
-export * from "./image-resize";
 export * from "./read-only-image";
@@ -1,4 +1,7 @@
 import Image from "@tiptap/extension-image";
+import { ReactNodeViewRenderer } from "@tiptap/react";
+// extensions
+import { CustomImageNode } from "@/extensions";

 export const ReadOnlyImageExtension = Image.extend({
  addAttributes() {
@@ -12,4 +15,7 @@ export const ReadOnlyImageExtension = Image.extend({
      },
    };
  },
+  addNodeView() {
+    return ReactNodeViewRenderer(CustomImageNode);
+  },
 });
@@ -1,5 +1,6 @@
 export * from "./code";
 export * from "./code-inline";
+export * from "./custom-image";
 export * from "./custom-link";
 export * from "./custom-list-keymap";
 export * from "./image";
@@ -19,6 +19,7 @@ import {
  TableRow,
  Table,
  CustomMention,
+  CustomReadOnlyImageExtension,
 } from "@/extensions";
 // helpers
 import { isValidHttpUrl } from "@/helpers/common";
@@ -74,6 +75,7 @@ export const CoreReadOnlyEditorExtensions = (mentionConfig: {
      class: "rounded-md",
    },
  }),
+  CustomReadOnlyImageExtension(),
  TiptapUnderline,
  TextStyle,
  TaskList.configure({
@@ -3,7 +3,7 @@ import { Plugin, PluginKey } from "@tiptap/pm/state";
 import { EditorView } from "@tiptap/pm/view";
 // plugins
 import { AIHandlePlugin } from "@/plugins/ai-handle";
-import { DragHandlePlugin } from "@/plugins/drag-handle";
+import { DragHandlePlugin, nodeDOMAtCoords } from "@/plugins/drag-handle";

 type Props = {
  aiEnabled: boolean;
@@ -59,41 +59,6 @@ const absoluteRect = (node: Element) => {
  };
 };

-const nodeDOMAtCoords = (coords: { x: number; y: number }) => {
-  const elements = document.elementsFromPoint(coords.x, coords.y);
-  const generalSelectors = [
-    "li",
-    "p:not(:first-child)",
-    ".code-block",
-    "blockquote",
-    "img",
-    "h1, h2, h3, h4, h5, h6",
-    "[data-type=horizontalRule]",
-    ".table-wrapper",
-    ".issue-embed",
-  ].join(", ");
-
-  for (const elem of elements) {
-    if (elem.matches("p:first-child") && elem.parentElement?.matches(".ProseMirror")) {
-      return elem;
-    }
-
-    // if the element is a <p> tag that is the first child of a td or th
-    if (
-      (elem.matches("td > p:first-child") || elem.matches("th > p:first-child")) &&
-      elem?.textContent?.trim() !== ""
-    ) {
-      return elem; // Return only if p tag is not empty in td or th
-    }
-
-    // apply general selector
-    if (elem.matches(generalSelectors)) {
-      return elem;
-    }
-  }
-  return null;
-};
-
 const SideMenu = (options: SideMenuPluginProps) => {
  const { handlesConfig } = options;
  const editorSideMenu: HTMLDivElement | null = document.createElement("div");
@@ -28,7 +28,6 @@ import {
  toggleBulletList,
  toggleOrderedList,
  toggleTaskList,
-  insertImageCommand,
  toggleHeadingOne,
  toggleHeadingTwo,
  toggleHeadingThree,
@@ -37,7 +36,7 @@ import {
  toggleHeadingSix,
 } from "@/helpers/editor-commands";
 // types
-import { CommandProps, ISlashCommandItem, UploadImage } from "@/types";
+import { CommandProps, ISlashCommandItem } from "@/types";

 interface CommandItemProps {
  key: string;
@@ -63,7 +62,7 @@ const Command = Extension.create<SlashCommandOptions>({
          const { selection } = editor.state;

          const parentNode = selection.$from.node(selection.$from.depth);
-          const blockType = parentNode?.type?.name;
+          const blockType = parentNode.type.name;

          if (blockType === "codeBlock") {
            return false;
@@ -89,7 +88,7 @@ const Command = Extension.create<SlashCommandOptions>({
 });

 const getSuggestionItems =
-  (uploadFile: UploadImage, additionalOptions?: Array<ISlashCommandItem>) =>
+  (additionalOptions?: Array<ISlashCommandItem>) =>
  ({ query }: { query: string }) => {
    let slashCommands: ISlashCommandItem[] = [
      {
@@ -224,11 +223,11 @@ const getSuggestionItems =
      {
        key: "image",
        title: "Image",
-        description: "Upload an image from your computer.",
-        searchTerms: ["img", "photo", "picture", "media"],
        icon: <ImageIcon className="size-3.5" />,
+        description: "Insert an image",
+        searchTerms: ["img", "photo", "picture", "media", "upload"],
        command: ({ editor, range }: CommandProps) => {
-          insertImageCommand(editor, uploadFile, null, range);
+          editor.chain().focus().deleteRange(range).setImageUpload({ event: "insert" }).run();
        },
      },
      {
@@ -415,10 +414,10 @@ const renderItems = () => {
  };
 };

-export const SlashCommand = (uploadFile: UploadImage, additionalOptions?: Array<ISlashCommandItem>) =>
+export const SlashCommand = (additionalOptions?: Array<ISlashCommandItem>) =>
  Command.configure({
    suggestion: {
-      items: getSuggestionItems(uploadFile, additionalOptions),
+      items: getSuggestionItems(additionalOptions),
      render: renderItems,
    },
  });
@@ -1,76 +0,0 @@
-import { Schema } from "@tiptap/pm/model";
-import { prosemirrorJSONToYDoc } from "y-prosemirror";
-import * as Y from "yjs";
-
-const defaultSchema: Schema = new Schema({
-  nodes: {
-    text: {},
-    doc: { content: "text*" },
-  },
-});
-
-/**
- * @description converts ProseMirror JSON to Yjs document
- * @param document prosemirror JSON
- * @param fieldName
- * @param schema
- * @returns {Y.Doc} Yjs document
- */
-export const proseMirrorJSONToBinaryString = (
-  document: any,
-  fieldName: string | Array<string> = "default",
-  schema?: Schema
-): string => {
-  if (!document) {
-    throw new Error(
-      `You've passed an empty or invalid document to the Transformer. Make sure to pass ProseMirror-compatible JSON. Actually passed JSON: ${document}`
-    );
-  }
-
-  // allow a single field name
-  if (typeof fieldName === "string") {
-    const yDoc = prosemirrorJSONToYDoc(schema ?? defaultSchema, document, fieldName);
-    const docAsUint8Array = Y.encodeStateAsUpdate(yDoc);
-    const base64Doc = Buffer.from(docAsUint8Array).toString("base64");
-    return base64Doc;
-  }
-
-  const yDoc = new Y.Doc();
-
-  fieldName.forEach((field) => {
-    const update = Y.encodeStateAsUpdate(prosemirrorJSONToYDoc(schema ?? defaultSchema, document, field));
-
-    Y.applyUpdate(yDoc, update);
-  });
-
-  const docAsUint8Array = Y.encodeStateAsUpdate(yDoc);
-  const base64Doc = Buffer.from(docAsUint8Array).toString("base64");
-
-  return base64Doc;
-};
-
-/**
- * @description apply updates to a doc and return the updated doc in base64(binary) format
- * @param {Uint8Array} document
- * @param {Uint8Array} updates
- * @returns {string} base64(binary) form of the updated doc
- */
-export const applyUpdates = (document: Uint8Array, updates: Uint8Array): string => {
-  const yDoc = new Y.Doc();
-  Y.applyUpdate(yDoc, document);
-  Y.applyUpdate(yDoc, updates);
-
-  const encodedDoc = Y.encodeStateAsUpdate(yDoc);
-  const base64Updates = Buffer.from(encodedDoc).toString("base64");
-  return base64Updates;
-};
-
-/**
- * @description merge multiple updates into one single update
- * @param {Uint8Array[]} updates
- * @returns {Uint8Array} merged updates
- */
-export const mergeUpdates = (updates: Uint8Array[]): Uint8Array => {
-  const mergedUpdates = Y.mergeUpdates(updates);
-  return mergedUpdates;
-};
@@ -83,7 +83,6 @@ export const useCollaborativeEditor = (props: TCollaborativeEditorProps) => {
      ...(extensions ?? []),
      ...DocumentEditorAdditionalExtensions({
        disabledExtensions,
-        fileHandler,
        issueEmbedConfig: embedHandler?.issue,
        provider,
        userDetails: user,
@@ -91,6 +91,7 @@ export const useEditor = (props: CustomEditorProps) => {
    onUpdate: ({ editor }) => onChange?.(editor.getJSON(), editor.getHTML()),
    onDestroy: () => handleEditorReady?.(false),
  });
+
  // Update the ref whenever savedSelection changes
  useEffect(() => {
    savedSelectionRef.current = savedSelection;
@@ -123,7 +124,7 @@ export const useEditor = (props: CustomEditorProps) => {
        editorRef.current?.commands.clearContent(emitUpdate);
      },
      setEditorValue: (content: string) => {
-        editorRef.current?.commands.setContent(content);
+        editorRef.current?.commands.setContent(content, false, { preserveWhitespace: "full" });
      },
      setEditorValueAtCursorPosition: (content: string) => {
        if (savedSelection) {
@@ -131,7 +132,7 @@ export const useEditor = (props: CustomEditorProps) => {
        }
      },
      executeMenuItemCommand: (itemKey: TEditorCommands) => {
-        const editorItems = getEditorMenuItems(editorRef.current, fileHandler.upload);
+        const editorItems = getEditorMenuItems(editorRef.current);

        const getEditorMenuItem = (itemKey: TEditorCommands) => editorItems.find((item) => item.key === itemKey);

@@ -147,7 +148,7 @@ export const useEditor = (props: CustomEditorProps) => {
        }
      },
      isMenuItemActive: (itemName: TEditorCommands): boolean => {
-        const editorItems = getEditorMenuItems(editorRef.current, fileHandler.upload);
+        const editorItems = getEditorMenuItems(editorRef.current);

        const getEditorMenuItem = (itemName: TEditorCommands) => editorItems.find((item) => item.key === itemName);
        const item = getEditorMenuItem(itemName);
@@ -214,20 +215,25 @@ export const useEditor = (props: CustomEditorProps) => {
          }
        });
        const selection = nodesArray.join("");
-        console.log(selection);
        return selection;
      },
      insertText: (contentHTML, insertOnNextLine) => {
-        if (!editor) return;
+        if (!editorRef.current) return;
        // get selection
-        const { from, to, empty } = editor.state.selection;
+        const { from, to, empty } = editorRef.current.state.selection;
        if (empty) return;
        if (insertOnNextLine) {
          // move cursor to the end of the selection and insert a new line
-          editor.chain().focus().setTextSelection(to).insertContent("<br />").insertContent(contentHTML).run();
+          editorRef.current
+            .chain()
+            .focus()
+            .setTextSelection(to)
+            .insertContent("<br />")
+            .insertContent(contentHTML)
+            .run();
        } else {
          // replace selected text with the content provided
-          editor.chain().focus().deleteRange({ from, to }).insertContent(contentHTML).run();
+          editorRef.current.chain().focus().deleteRange({ from, to }).insertContent(contentHTML).run();
        }
      },
      getDocumentInfo: () => {
@@ -238,7 +244,7 @@ export const useEditor = (props: CustomEditorProps) => {
        };
      },
    }),
-    [editorRef, savedSelection, fileHandler.upload]
+    [editorRef, savedSelection]
  );

  if (!editor) {
@@ -0,0 +1,111 @@
+import { DragEvent, useCallback, useEffect, useRef, useState } from "react";
+import { Editor } from "@tiptap/core";
+import { isFileValid } from "@/plugins/image";
+
+export const useUploader = ({ onUpload, editor }: { onUpload: (url: string) => void; editor: Editor }) => {
+  const [loading, setLoading] = useState(false);
+
+  const uploadFile = useCallback(
+    async (file: File) => {
+      setLoading(true);
+      try {
+        // @ts-expect-error - TODO: fix typings, and don't remove await from
+        // here for now
+        const url: string = await editor?.commands.uploadImage(file);
+
+        if (!url) {
+          throw new Error("Something went wrong while uploading the image");
+        }
+        onUpload(url);
+      } catch (errPayload: any) {
+        console.log(errPayload);
+        const error = errPayload?.response?.data?.error || "Something went wrong";
+        console.error(error);
+      }
+      setLoading(false);
+    },
+    [onUpload, editor]
+  );
+
+  return { loading, uploadFile };
+};
+
+export const useFileUpload = () => {
+  const fileInput = useRef<HTMLInputElement>(null);
+
+  const handleUploadClick = useCallback(() => {
+    fileInput.current?.click();
+  }, []);
+
+  return { ref: fileInput, handleUploadClick };
+};
+export const useDropZone = ({ uploader }: { uploader: (file: File) => void }) => {
+  const [isDragging, setIsDragging] = useState<boolean>(false);
+  const [draggedInside, setDraggedInside] = useState<boolean>(false);
+
+  useEffect(() => {
+    const dragStartHandler = () => {
+      setIsDragging(true);
+    };
+
+    const dragEndHandler = () => {
+      setIsDragging(false);
+    };
+
+    document.body.addEventListener("dragstart", dragStartHandler);
+    document.body.addEventListener("dragend", dragEndHandler);
+
+    return () => {
+      document.body.removeEventListener("dragstart", dragStartHandler);
+      document.body.removeEventListener("dragend", dragEndHandler);
+    };
+  }, []);
+
+  const onDrop = useCallback(
+    (e: DragEvent<HTMLDivElement>) => {
+      setDraggedInside(false);
+      if (e.dataTransfer.files.length === 0) {
+        return;
+      }
+
+      const fileList = e.dataTransfer.files;
+
+      const files: File[] = [];
+
+      for (let i = 0; i < fileList.length; i += 1) {
+        const item = fileList.item(i);
+        if (item) {
+          files.push(item);
+        }
+      }
+
+      if (files.some((file) => file.type.indexOf("image") === -1)) {
+        return;
+      }
+
+      e.preventDefault();
+
+      const filteredFiles = files.filter((f) => f.type.indexOf("image") !== -1);
+
+      const file = filteredFiles.length > 0 ? filteredFiles[0] : undefined;
+
+      if (file) {
+        const isValid = isFileValid(file);
+        if (isValid) {
+          uploader(file);
+        }
+      }
+    },
+    [uploader]
+  );
+
+  const onDragEnter = () => {
+    setDraggedInside(true);
+  };
+
+  const onDragLeave = () => {
+    setDraggedInside(false);
+  };
+
+  return { isDragging, draggedInside, onDragEnter, onDragLeave, onDrop };
+};
@@ -58,7 +58,7 @@ export const useReadOnlyEditor = ({
  // for syncing swr data on tab refocus etc
  useEffect(() => {
    if (initialValue === null || initialValue === undefined) return;
-    if (editor && !editor.isDestroyed) editor?.commands.setContent(initialValue);
+    if (editor && !editor.isDestroyed) editor?.commands.setContent(initialValue, false, { preserveWhitespace: "full" });
  }, [editor, initialValue]);

  const editorRef: MutableRefObject<Editor | null> = useRef(null);
@@ -68,7 +68,7 @@ export const useReadOnlyEditor = ({
      editorRef.current?.commands.clearContent();
    },
    setEditorValue: (content: string) => {
-      editorRef.current?.commands.setContent(content);
+      editorRef.current?.commands.setContent(content, false, { preserveWhitespace: "full" });
    },
    getMarkDown: (): string => {
      const markdownOutput = editorRef.current?.storage.markdown.getMarkdown();
@@ -30,7 +30,7 @@ const createDragHandleElement = (): HTMLElement => {
  return dragHandleElement;
 };

-const nodeDOMAtCoords = (coords: { x: number; y: number }) => {
+export const nodeDOMAtCoords = (coords: { x: number; y: number }) => {
  const elements = document.elementsFromPoint(coords.x, coords.y);
  const generalSelectors = [
    "li",
@@ -42,13 +42,34 @@ const nodeDOMAtCoords = (coords: { x: number; y: number }) => {
    "[data-type=horizontalRule]",
    ".table-wrapper",
    ".issue-embed",
+    ".image-upload-component",
  ].join(", ");

+  const hasNestedImg = (el: Element): boolean => {
+    if (el.tagName.toLowerCase() === "img") return true;
+    // @ts-expect-error todo
+    for (const child of el.children) {
+      if (hasNestedImg(child)) return true;
+    }
+    return false;
+  };
+
  for (const elem of elements) {
+    const elemHasNestedImg = hasNestedImg(elem);
    if (elem.matches("p:first-child") && elem.parentElement?.matches(".ProseMirror")) {
      return elem;
    }

+    // if the element is a <p> tag and has a nested img i.e. the new image
+    // component
+    if (elem.matches("p") && elemHasNestedImg) {
+      return null;
+    }
+
+    if (elem.matches("div") && elemHasNestedImg) {
+      return elem;
+    }
+
    // if the element is a <p> tag that is the first child of a td or th
    if (
      (elem.matches("td > p:first-child") || elem.matches("th > p:first-child")) &&
@@ -1,17 +1,17 @@
 import { Editor } from "@tiptap/core";
-import { EditorState, Plugin, Transaction } from "@tiptap/pm/state";
+import { EditorState, Plugin, PluginKey, Transaction } from "@tiptap/pm/state";
 // plugins
-import { IMAGE_NODE_TYPE, deleteKey, type ImageNode } from "@/plugins/image";
+import { type ImageNode } from "@/plugins/image";
 // types
 import { DeleteImage } from "@/types";

-export const TrackImageDeletionPlugin = (editor: Editor, deleteImage: DeleteImage): Plugin =>
+export const TrackImageDeletionPlugin = (editor: Editor, deleteImage: DeleteImage, nodeType: string): Plugin =>
  new Plugin({
-    key: deleteKey,
+    key: new PluginKey(`delete-${nodeType}`),
    appendTransaction: (transactions: readonly Transaction[], oldState: EditorState, newState: EditorState) => {
      const newImageSources = new Set<string>();
      newState.doc.descendants((node) => {
-        if (node.type.name === IMAGE_NODE_TYPE) {
+        if (node.type.name === nodeType) {
          newImageSources.add(node.attrs.src);
        }
      });
@@ -25,7 +25,7 @@ export const TrackImageDeletionPlugin = (editor: Editor, deleteImage: DeleteImag
        // iterate through all the nodes in the old state
        oldState.doc.descendants((oldNode) => {
          // if the node is not an image, then return as no point in checking
-          if (oldNode.type.name !== IMAGE_NODE_TYPE) return;
+          if (oldNode.type.name !== nodeType) return;

          // Check if the node has been deleted or replaced
          if (!newImageSources.has(oldNode.attrs.src)) {
@@ -35,7 +35,7 @@ export const TrackImageDeletionPlugin = (editor: Editor, deleteImage: DeleteImag

        removedImages.forEach(async (node) => {
          const src = node.attrs.src;
-          editor.storage.image.deletedImageSet.set(src, true);
+          editor.storage[nodeType].deletedImageSet.set(src, true);
          await onNodeDeleted(src, deleteImage);
        });
      });
@@ -1,17 +1,17 @@
 import { Editor } from "@tiptap/core";
-import { EditorState, Plugin, Transaction } from "@tiptap/pm/state";
+import { EditorState, Plugin, PluginKey, Transaction } from "@tiptap/pm/state";
 // plugins
-import { IMAGE_NODE_TYPE, ImageNode, restoreKey } from "@/plugins/image";
+import { ImageNode } from "@/plugins/image";
 // types
 import { RestoreImage } from "@/types";

-export const TrackImageRestorationPlugin = (editor: Editor, restoreImage: RestoreImage): Plugin =>
+export const TrackImageRestorationPlugin = (editor: Editor, restoreImage: RestoreImage, nodeType: string): Plugin =>
  new Plugin({
-    key: restoreKey,
+    key: new PluginKey(`restore-${nodeType}`),
    appendTransaction: (transactions: readonly Transaction[], oldState: EditorState, newState: EditorState) => {
      const oldImageSources = new Set<string>();
      oldState.doc.descendants((node) => {
-        if (node.type.name === IMAGE_NODE_TYPE) {
+        if (node.type.name === nodeType) {
          oldImageSources.add(node.attrs.src);
        }
      });
@@ -22,20 +22,21 @@ export const TrackImageRestorationPlugin = (editor: Editor, restoreImage: Restor
        const addedImages: ImageNode[] = [];

        newState.doc.descendants((node, pos) => {
-          if (node.type.name !== IMAGE_NODE_TYPE) return;
+          if (node.type.name !== nodeType) return;
          if (pos < 0 || pos > newState.doc.content.size) return;
          if (oldImageSources.has(node.attrs.src)) return;
          addedImages.push(node as ImageNode);
        });

        addedImages.forEach(async (image) => {
-          const wasDeleted = editor.storage.image.deletedImageSet.get(image.attrs.src);
+          const src = image.attrs.src;
+          const wasDeleted = editor.storage[nodeType].deletedImageSet.get(src);
          if (wasDeleted === undefined) {
-            editor.storage.image.deletedImageSet.set(image.attrs.src, false);
+            editor.storage[nodeType].deletedImageSet.set(src, false);
          } else if (wasDeleted === true) {
            try {
-              await onNodeRestored(image.attrs.src, restoreImage);
-              editor.storage.image.deletedImageSet.set(image.attrs.src, false);
+              await onNodeRestored(src, restoreImage);
+              editor.storage[nodeType].deletedImageSet.set(src, false);
            } catch (error) {
              console.error("Error restoring image: ", error);
            }
@@ -1,17 +1,23 @@
-export function isFileValid(file: File): boolean {
+export function isFileValid(file: File, showAlert = true): boolean {
  if (!file) {
-    alert("No file selected. Please select a file to upload.");
+    if (showAlert) {
+      alert("No file selected. Please select a file to upload.");
+    }
    return false;
  }

  const allowedTypes = ["image/jpeg", "image/jpg", "image/png", "image/webp"];
  if (!allowedTypes.includes(file.type)) {
-    alert("Invalid file type. Please select a JPEG, JPG, PNG, or WEBP image file.");
+    if (showAlert) {
+      alert("Invalid file type. Please select a JPEG, JPG, PNG, or WEBP image file.");
+    }
    return false;
  }

  if (file.size > 5 * 1024 * 1024) {
-    alert("File size too large. Please select a file smaller than 5MB.");
+    if (showAlert) {
+      alert("File size too large. Please select a file smaller than 5MB.");
+    }
    return false;
  }

@@ -21,9 +21,7 @@ export { isCellSelection } from "@/extensions/table/table/utilities/is-cell-sele
 // helpers
 export * from "@/helpers/common";
 export * from "@/helpers/editor-commands";
-export * from "@/helpers/yjs";
 export * from "@/extensions/table/table";
-export { startImageUpload } from "@/plugins/image";

 // components
 export * from "@/components/menus";
@@ -39,7 +39,7 @@
 }
 /* end ai handle */

-.ProseMirror:not(.dragging) .ProseMirror-selectednode {
+.ProseMirror:not(.dragging) .ProseMirror-selectednode:not(.node-imageComponent):not(.node-image) {
  position: relative;
  cursor: grab;
  outline: none !important;
@@ -63,6 +63,15 @@
    border-radius: 4px;
    pointer-events: none;
  }
+
+  &.node-imageComponent,
+  &.node-image {
+    --horizontal-offset: 0px;
+
+    &::after {
+      background-color: rgba(var(--color-background-100), 0.2);
+    }
+  }
 }

 /* for targeting the task list items */
@@ -96,7 +105,8 @@ ol > li:nth-child(n + 100).ProseMirror-selectednode:not(.dragging)::after {
  margin-left: -35px;
 }

-.ProseMirror img {
+.ProseMirror node-image,
+.ProseMirror node-imageComponent {
  transition: filter 0.1s ease-in-out;
  cursor: pointer;

@@ -122,18 +122,21 @@

 /* Custom image styles */
 .ProseMirror img {
-  transition: filter 0.1s ease-in-out;
-  margin-top: 8px;
+  margin-top: 0 !important;
  margin-bottom: 0;

-  &:hover {
-    cursor: pointer;
-    filter: brightness(90%);
-  }
+  &:not(.read-only-image) {
+    transition: filter 0.1s ease-in-out;

-  &.ProseMirror-selectednode {
-    outline: 3px solid rgba(var(--color-primary-100));
-    filter: brightness(90%);
+    &:hover {
+      cursor: pointer;
+      filter: brightness(90%);
+    }
+
+    &.ProseMirror-selectednode {
+      outline: 3px solid rgba(var(--color-primary-100));
+      filter: brightness(90%);
+    }
  }
 }

@@ -261,26 +264,6 @@ ul[data-type="taskList"] li[data-checked="true"] > div > p {
  transition: opacity 0.2s ease-out;
 }

-.img-placeholder {
-  position: relative;
-  width: 35%;
-  margin-top: 0 !important;
-  margin-bottom: 0 !important;
-
-  &::before {
-    content: "";
-    box-sizing: border-box;
-    position: absolute;
-    top: 50%;
-    left: 45%;
-    width: 20px;
-    height: 20px;
-    border-radius: 50%;
-    border: 3px solid rgba(var(--color-text-200));
-    border-top-color: rgba(var(--color-text-800));
-    animation: spinning 0.6s linear infinite;
-  }
-}

@keyframes spinning {
  to {
@@ -4,7 +4,7 @@ export default defineConfig((options: Options) => ({
  entry: ["src/index.ts", "src/lib.ts"],
  format: ["cjs", "esm"],
  dts: true,
-  clean: true,
+  clean: false,
  external: ["react"],
  injectStyle: true,
  ...options,
@@ -8,7 +8,7 @@ module.exports = {
  plugins: ["react", "@typescript-eslint", "import"],
  settings: {
    next: {
-      rootDir: ["web/", "space/", "admin/", "packages/*/"],
+      rootDir: ["."],
    },
  },
  globals: {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
NarayanBavisetti	0864354d69	feat: created new cycle analytics	2024-09-17 14:41:07 +05:30
sriram veeraghanta	69b4f155fc	fix: yjs dependencies revert	2024-09-16 21:06:40 +05:30
sriram veeraghanta	8f492e4c6c	fix: disable turbo telemetry on live service	2024-09-16 20:58:35 +05:30
M. Palanikannan GitHub Aaryan Khandelwal	8533eba07d	[WEB-2450] dev: custom image extension (#5585 ) * fix: svg not supported in image uploads * fix: svg image file error message fixed * feat: add custom image node for uploads * fix: combine two extensions * fix: added new image extension to backend * fix: type errors * style: image drop node * style: image resize handler * fix: removed unused stuff * fix: types of updateAttributes * fix: image insertion at pos and loading effect added * fix: resize image real time sync * fix: drag drop menu * feat: custom image component editor * fix: reverted back styles * fix: reverted back document info changes * fix: css image css * style: image selected and hover states * refactor: custom image extension folder structure * style: read-only image * chore: remove file handler * fix: fixed multi time file opener * fix: editor readonly content set properly * fix: old images not rendered as new ones * fix: drop upload fixed * chore: remove console logs * fix: src of image node as dependency * fix: helper library build fix * fix: improved reflow/layout and fixed resizing --------- Co-authored-by: Aaryan Khandelwal <aaryankhandu123@gmail.com>	2024-09-16 19:36:20 +05:30
Anmol Singh BhatiaandGitHub	edf0ab8175	fix: build error (#5617 )	2024-09-16 19:22:47 +05:30
Anmol Singh Bhatia GitHub NarayanBavisetti	45da70cf6a	[WEB-2460] fix: role permission validation (#5615 ) * fix: workspace menu quick action * fix: guest role upgrade flow validation * fix: create issue validation * fix: create issue validation * fix: cmd k permission validation * fix: subscription validation * fix: create label permission validation * fix: build error * chore: guest can comment in their created issues * chore: changed the queryset * chore: code refactor * chore: code refactor --------- Co-authored-by: NarayanBavisetti <narayan3119@gmail.com>	2024-09-16 18:56:28 +05:30
Prateek Shourya GitHub sriram veeraghanta	2e816656e5	[WEB-2112 \| WEB-2113] dev: billing and change-log improvements. (#5614 ) * chore: minor improvements in billing and changelogs. * fix: lint errors. --------- Co-authored-by: sriram veeraghanta <veeraghanta.sriram@gmail.com>	2024-09-16 18:36:17 +05:30
Aaryan KhandelwalandGitHub	6826ce0465	[WEB-1116] chore: remove yjs packages from the editor (#5603 ) * chore: remove yjs packages from the editor * chore: updated yarn lock file	2024-09-16 18:28:09 +05:30
sriram veeraghanta	c4b5c737f3	fix: adding types in package	2024-09-16 17:54:23 +05:30
sriram veeraghanta	89a1c0b534	fix: build errors	2024-09-16 17:48:10 +05:30
Akshita Goyal GitHub NarayanBavisetti	74507559b8	[WEB-2456] Chore: workspace member list additional info (#5604 ) * chore: added last login medium * chore: added email and authentication columns in member settings * fix: revoked lock file changes --------- Co-authored-by: NarayanBavisetti <narayan3119@gmail.com>	2024-09-16 14:28:41 +05:30
Bavisetti NarayanandGitHub	3ce84f78f1	chore: roles demotion (#5612 )	2024-09-16 14:25:27 +05:30
Anmol Singh BhatiaandGitHub	5ba1eeaf4c	[WEB-2443] fix: join project flicker (#5602 ) * fix: join project flicker * fix: leave project project mutation and code refactor	2024-09-16 14:16:23 +05:30
Anmol Singh BhatiaandGitHub	c14d20c2e0	fix: workspace settings access validation updated (#5606 )	2024-09-16 14:03:06 +05:30
sriram veeraghanta	f155a13929	fix: adding new session cookie name	2024-09-13 16:59:47 +05:30
Anmol Singh BhatiaandGitHub	485caaf2ec	[WEB-2443] fix: project member validation (#5601 ) * fix: project member validation * fix: project member validation	2024-09-13 16:28:03 +05:30
Ketan SharmaandGitHub	b44dd28ac0	[WEB-2445] fix: date picker and member picker dropdown z-index for list, kanban and spreadsheet views (#5597 ) * changes for list and kanban * passing values for list and kanban * spreadsheet changes * fix use different props for different stylings * fix z index	2024-09-13 12:03:00 +05:30
sriram veeraghanta	1b0e31027e	fix: lint fixes and typescript version fixes	2024-09-12 20:39:31 +05:30
Anmol Singh BhatiaandGitHub	1efb067274	fix: build error (#5598 )	2024-09-12 20:22:50 +05:30
Prateek ShouryaandGitHub	b2533b94ce	[WEB-2444] improvement: performance improvement for `useOutsideClickDetector` and `usePeekOverviewOutsideClickDetector`. (#5595 ) * [WEB-2444] improvement: performace improvement for `useOutsideClickDetector` and `usePeekOverviewOutsideClickDetector`. * Move outside click detector to plane helpers package. * chore: remove plane helpers yarn.lock	2024-09-12 20:10:04 +05:30
Anmol Singh BhatiaandGitHub	441385fc95	[WEB-2443] fix: role validation and code refactor (#5596 ) * chore: delete cycle toast message updated * fix: view page empty state * fix: project settings automation * fix: intake delete action * fix: project label validation * fix: project label validation * fix: project state permission updated * chore: code refactor	2024-09-12 20:08:13 +05:30
sriram veeraghantaandGitHub	5f1939cdeb	fix: workflow sync fixes (#5594 )	2024-09-12 17:22:41 +05:30
Anmol Singh BhatiaandGitHub	9d694ab006	fix: not authorized flicker (#5593 )	2024-09-12 16:26:57 +05:30
Anmol Singh BhatiaandGitHub	48e97477ed	fix: issue properties dropdown (#5592 )	2024-09-12 16:02:56 +05:30
Anmol Singh Bhatia GitHub NarayanBavisetti	33dd5fe8cc	[WEB-2443] fix: project intake edit permission (#5588 ) * fix: project intake edit permission * chore: inbox issue validation changes * fix: intake edit permission updated * fix: project invite modal --------- Co-authored-by: NarayanBavisetti <narayan3119@gmail.com>	2024-09-12 14:44:21 +05:30
Anmol Singh BhatiaandGitHub	aed2f2dd47	fix: page permission validation (#5589 )	2024-09-12 14:39:38 +05:30
Ketan SharmaandGitHub	eb84f165f4	[WEB-2282] fix: date picker and member picker dropdown z-index for list, kanban and spreadsheet views (#5555 ) * changes for list and kanban * passing values for list and kanban * spreadsheet changes	2024-09-12 14:35:45 +05:30
MihirandGitHub	572644f7f9	Updated alignment inside kanban header (#5559 )	2024-09-12 14:34:24 +05:30
Aaryan KhandelwalandGitHub	ddbd9dfdc8	chore: add toast alerts post access change of a page (#5569 )	2024-09-12 14:32:54 +05:30
MihirandGitHub	09578c9a7d	Updates theme options to include custom theme option (#5574 )	2024-09-12 14:32:14 +05:30
MihirandGitHub	e5ddfd322d	[WEB-2393] chore: removal of .svg from supported image formats (#5582 ) * Updated supported image formats * Updated image accepting functions	2024-09-12 14:25:06 +05:30
Anmol Singh BhatiaandGitHub	87d6544b72	fix: project favorite permission validation (#5587 )	2024-09-12 14:09:19 +05:30
Bavisetti Narayan GitHub gurusainath Anmol Singh Bhatia	fdcd9a376c	[WEB-2357] fix: update and redefine user roles across the platform (#5466 ) * chore: removed viewer role * chore: indentation * chore: remove viewer role * chore: handled user permissions in store * chore: updated the migration file * chore: updated user permissions store * chore: removed the owner key * chore: code refactor * chore: code refactor * chore: code refactor * chore: code refactor * chore: code refactor * fix: build error * chore: updated user permissions store and handled the permissions fetch in workspace and project wrappers * chore: package user enum updated * chore: user permission updated * chore: user permission updated * chore: resolved build errors * chore: resolved build error * chore: resolved build errors * chore: computedFn deep map issue resolved * chore: added back migration * chore: added new field in project table * chore: removed member store in users * chore: private project for admins * chore: workspace notification access validation updated * fix: workspace member edit option * fix: project intake permission validation updated * chore: workspace export settings permission updated * chore: guest_view_all_issues added * chore: guest_view_all_issues added * chore: key changed for guest access * chore: added validation for individual issues * chore: changed the dashboard issues count * chore: added new yarn file * chore: modified yarn file * chore: project page permission updated * chore: project page permission updated * chore: member setting ux updated * chore: build error * fix: yarn lock * fix: build error --------- Co-authored-by: gurusainath <gurusainath007@gmail.com> Co-authored-by: Anmol Singh Bhatia <anmolsinghbhatia@plane.so>	2024-09-11 17:10:15 +05:30
Bavisetti NarayanandGitHub	7013a36629	[WEB-2430] fix: issue exports for project (#5579 ) * fix: issue exports for project * chore: code cleanup	2024-09-11 13:18:59 +05:30
Anmol Singh BhatiaandGitHub	bb49d27a84	fix: join project permission mutation (#5580 )	2024-09-11 12:37:31 +05:30
Prateek ShouryaandGitHub	00b76300f5	[WEB-2421] chore: issue display properties and issue identifier improvements. (#5577 ) * [WEB-2421] chore: issue display properties and issue identifier improvements. * chore: remove yarn.lock changes.	2024-09-10 21:49:57 +05:30
sriram veeraghanta	71f3c5c12a	fix: typescript upgrade build errors	2024-09-10 21:31:32 +05:30
sriram veeraghanta	99ab274216	fix: upgrading the python runtime version	2024-09-10 20:44:38 +05:30