use common getIssues from issue service instead of multiple different services for modules and cycles

admin/app/general/form.tsx

@@ -9,9 +9,8 @@ import { IInstance, IInstanceAdmin } from "@plane/types";
 import { Button, Input, TOAST_TYPE, ToggleSwitch, setToast } from "@plane/ui";
 // components
 import { ControllerInput } from "@/components/common";
-import { useInstance } from "@/hooks/store";
-import { IntercomConfig } from "./intercom";
 // hooks
+import { useInstance } from "@/hooks/store";
 
 export interface IGeneralConfigurationForm {
   instance: IInstance;
@@ -21,13 +20,11 @@ export interface IGeneralConfigurationForm {
 export const GeneralConfigurationForm: FC<IGeneralConfigurationForm> = observer((props) => {
   const { instance, instanceAdmins } = props;
   // hooks
-  const { instanceConfigurations, updateInstanceInfo, updateInstanceConfigurations } = useInstance();
-
+  const { updateInstanceInfo } = useInstance();
   // form data
   const {
     handleSubmit,
     control,
-    watch,
     formState: { errors, isSubmitting },
   } = useForm<Partial<IInstance>>({
     defaultValues: {
@@ -39,16 +36,7 @@ export const GeneralConfigurationForm: FC<IGeneralConfigurationForm> = observer(
   const onSubmit = async (formData: Partial<IInstance>) => {
     const payload: Partial<IInstance> = { ...formData };
 
-    // update the intercom configuration
-    const isIntercomEnabled =
-      instanceConfigurations?.find((config) => config.key === "IS_INTERCOM_ENABLED")?.value === "1";
-    if (!payload.is_telemetry_enabled && isIntercomEnabled) {
-      try {
-        await updateInstanceConfigurations({ IS_INTERCOM_ENABLED: "0" });
-      } catch (error) {
-        console.error(error);
-      }
-    }
+    console.log("payload", payload);
 
     await updateInstanceInfo(payload)
       .then(() =>
@@ -105,8 +93,7 @@ export const GeneralConfigurationForm: FC<IGeneralConfigurationForm> = observer(
       </div>
 
       <div className="space-y-3">
-        <div className="text-lg font-medium">Chat + telemetry</div>
-        <IntercomConfig isTelemetryEnabled={watch("is_telemetry_enabled") ?? false} />
+        <div className="text-lg font-medium">Telemetry</div>
         <div className="flex items-center gap-14 px-4 py-3 border border-custom-border-200 rounded">
           <div className="grow flex items-center gap-4">
             <div className="shrink-0">

admin/app/general/intercom.tsx

@@ -1,82 +0,0 @@
-"use client";
-
-import { FC, useState } from "react";
-import { observer } from "mobx-react";
-import useSWR from "swr";
-import { MessageSquare } from "lucide-react";
-import { IFormattedInstanceConfiguration } from "@plane/types";
-import { ToggleSwitch } from "@plane/ui";
-// hooks
-import { useInstance } from "@/hooks/store";
-
-type TIntercomConfig = {
-  isTelemetryEnabled: boolean;
-};
-
-export const IntercomConfig: FC<TIntercomConfig> = observer((props) => {
-  const { isTelemetryEnabled } = props;
-  // hooks
-  const { instanceConfigurations, updateInstanceConfigurations, fetchInstanceConfigurations } = useInstance();
-  // states
-  const [isSubmitting, setIsSubmitting] = useState<boolean>(false);
-
-  // derived values
-  const isIntercomEnabled = isTelemetryEnabled
-    ? instanceConfigurations
-      ? instanceConfigurations?.find((config) => config.key === "IS_INTERCOM_ENABLED")?.value === "1"
-        ? true
-        : false
-      : undefined
-    : false;
-
-  const { isLoading } = useSWR(isTelemetryEnabled ? "INSTANCE_CONFIGURATIONS" : null, () =>
-    isTelemetryEnabled ? fetchInstanceConfigurations() : null
-  );
-
-  const initialLoader = isLoading && isIntercomEnabled === undefined;
-
-  const submitInstanceConfigurations = async (payload: Partial<IFormattedInstanceConfiguration>) => {
-    try {
-      await updateInstanceConfigurations(payload);
-    } catch (error) {
-      console.error(error);
-    } finally {
-      setIsSubmitting(false);
-    }
-  };
-
-  const enableIntercomConfig = () => {
-    submitInstanceConfigurations({ IS_INTERCOM_ENABLED: isIntercomEnabled ? "0" : "1" });
-  };
-
-  return (
-    <>
-      <div className="flex items-center gap-14 px-4 py-3 border border-custom-border-200 rounded">
-        <div className="grow flex items-center gap-4">
-          <div className="shrink-0">
-            <div className="flex items-center justify-center w-10 h-10 bg-custom-background-80 rounded-full">
-              <MessageSquare className="w-6 h-6 text-custom-text-300/80 p-0.5" />
-            </div>
-          </div>
-
-          <div className="grow">
-            <div className="text-sm font-medium text-custom-text-100 leading-5">Talk to Plane</div>
-            <div className="text-xs font-normal text-custom-text-300 leading-5">
-              Let your members chat with us via Intercom or another service. Toggling Telemetry off turns this off
-              automatically.
-            </div>
-          </div>
-
-          <div className="ml-auto">
-            <ToggleSwitch
-              value={isIntercomEnabled ? true : false}
-              onChange={enableIntercomConfig}
-              size="sm"
-              disabled={!isTelemetryEnabled || isSubmitting || initialLoader}
-            />
-          </div>
-        </div>
-      </div>
-    </>
-  );
-});

admin/app/general/page.tsx

@@ -7,7 +7,7 @@ import { GeneralConfigurationForm } from "./form";
 
 function GeneralPage() {
   const { instance, instanceAdmins } = useInstance();
-
+  console.log("instance", instance);
   return (
     <>
       <div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col">

admin/core/components/login/sign-in-form.tsx

@@ -57,6 +57,8 @@ export const InstanceSignInForm: FC = (props) => {
   const handleFormChange = (key: keyof TFormData, value: string | boolean) =>
     setFormData((prev) => ({ ...prev, [key]: value }));
 
+  console.log("csrfToken", csrfToken);
+
   useEffect(() => {
     if (csrfToken === undefined)
       authService.requestCSRFToken().then((data) => data?.csrf_token && setCsrfToken(data.csrf_token));

apiserver/.env.example

@@ -50,6 +50,3 @@ GUNICORN_WORKERS=2
 ADMIN_BASE_URL=
 SPACE_BASE_URL=
 APP_BASE_URL=
-
-# Hard delete files after days
-HARD_DELETE_AFTER_DAYS=

apiserver/plane/api/serializers/cycle.py

@@ -40,7 +40,6 @@ class CycleSerializer(BaseSerializer):
             "workspace",
             "project",
             "owned_by",
-            "deleted_at",
         ]
 
 

apiserver/plane/api/serializers/issue.py

@@ -53,6 +53,7 @@ class IssueSerializer(BaseSerializer):
             "id",
             "workspace",
             "project",
+            "created_by",
             "updated_by",
             "updated_at",
         ]
@@ -337,7 +338,9 @@ class IssueAttachmentSerializer(BaseSerializer):
             "workspace",
             "project",
             "issue",
+            "created_by",
             "updated_by",
+            "created_at",
             "updated_at",
         ]
 
@@ -430,4 +433,3 @@ class IssueExpandSerializer(BaseSerializer):
             "created_at",
             "updated_at",
         ]
-

apiserver/plane/api/serializers/module.py

@@ -39,7 +39,6 @@ class ModuleSerializer(BaseSerializer):
             "updated_by",
             "created_at",
             "updated_at",
-            "deleted_at",
         ]
 
     def to_representation(self, instance):

apiserver/plane/api/serializers/project.py

@@ -31,7 +31,6 @@ class ProjectSerializer(BaseSerializer):
             "updated_at",
             "created_by",
             "updated_by",
-            "deleted_at",
         ]
 
     def validate(self, data):

apiserver/plane/api/urls/member.py

@@ -1,13 +1,13 @@
 from django.urls import path
 
 from plane.api.views import (
-    ProjectMemberAPIEndpoint,
+    WorkspaceMemberAPIEndpoint,
 )
 
 urlpatterns = [
     path(
-        "workspaces/<str:slug>/projects/<str:project_id>/members/",
-        ProjectMemberAPIEndpoint.as_view(),
+        "workspaces/<str:slug>/members/",
+        WorkspaceMemberAPIEndpoint.as_view(),
         name="users",
     ),
 ]

apiserver/plane/api/views/__init__.py

@@ -25,7 +25,6 @@ from .module import (
     ModuleArchiveUnarchiveAPIEndpoint,
 )
 
-from .member import ProjectMemberAPIEndpoint
+from .member import WorkspaceMemberAPIEndpoint
 
 from .inbox import InboxIssueAPIEndpoint
-

apiserver/plane/api/views/cycle.py

@@ -35,7 +35,6 @@ from plane.db.models import (
     IssueAttachment,
     IssueLink,
     ProjectMember,
-    UserFavorite,
 )
 from plane.utils.analytics_plot import burndown_plot
 
@@ -405,16 +404,6 @@ class CycleAPIEndpoint(BaseAPIView):
         )
         # Delete the cycle
         cycle.delete()
-        # Delete the cycle issues
-        CycleIssue.objects.filter(
-            cycle_id=self.kwargs.get("pk"),
-        ).delete()
-        # Delete the user favorite cycle
-        UserFavorite.objects.filter(
-            entity_type="cycle",
-            entity_identifier=pk,
-            project_id=project_id,
-        ).delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
@@ -672,74 +661,61 @@ class CycleIssueAPIEndpoint(BaseAPIView):
             workspace__slug=slug, project_id=project_id, pk=cycle_id
         )
 
-        if (
-            cycle.end_date is not None
-            and cycle.end_date < timezone.now().date()
-        ):
-            return Response(
-                {
-                    "error": "The Cycle has already been completed so no new issues can be added"
-                },
-                status=status.HTTP_400_BAD_REQUEST,
-            )
+        issues = Issue.objects.filter(
+            pk__in=issues, workspace__slug=slug, project_id=project_id
+        ).values_list("id", flat=True)
 
         # Get all CycleIssues already created
-        cycle_issues = list(
-            CycleIssue.objects.filter(
-                ~Q(cycle_id=cycle_id), issue_id__in=issues
-            )
-        )
-
-        existing_issues = [
-            str(cycle_issue.issue_id)
-            for cycle_issue in cycle_issues
-            if str(cycle_issue.issue_id) in issues
-        ]
-        new_issues = list(set(issues) - set(existing_issues))
-
-        # New issues to create
-        created_records = CycleIssue.objects.bulk_create(
-            [
-                CycleIssue(
-                    project_id=project_id,
-                    workspace_id=cycle.workspace_id,
-                    cycle_id=cycle_id,
-                    issue_id=issue,
-                )
-                for issue in new_issues
-            ],
-            ignore_conflicts=True,
-            batch_size=10,
-        )
-
-        # Updated Issues
-        updated_records = []
+        cycle_issues = list(CycleIssue.objects.filter(issue_id__in=issues))
         update_cycle_issue_activity = []
-        # Iterate over each cycle_issue in cycle_issues
-        for cycle_issue in cycle_issues:
-            old_cycle_id = cycle_issue.cycle_id
-            # Update the cycle_issue's cycle_id
-            cycle_issue.cycle_id = cycle_id
-            # Add the modified cycle_issue to the records_to_update list
-            updated_records.append(cycle_issue)
-            # Record the update activity
-            update_cycle_issue_activity.append(
-                {
-                    "old_cycle_id": str(old_cycle_id),
-                    "new_cycle_id": str(cycle_id),
-                    "issue_id": str(cycle_issue.issue_id),
-                }
-            )
+        record_to_create = []
+        records_to_update = []
 
-        # Update the cycle issues
+        for issue in issues:
+            cycle_issue = [
+                cycle_issue
+                for cycle_issue in cycle_issues
+                if str(cycle_issue.issue_id) in issues
+            ]
+            # Update only when cycle changes
+            if len(cycle_issue):
+                if cycle_issue[0].cycle_id != cycle_id:
+                    update_cycle_issue_activity.append(
+                        {
+                            "old_cycle_id": str(cycle_issue[0].cycle_id),
+                            "new_cycle_id": str(cycle_id),
+                            "issue_id": str(cycle_issue[0].issue_id),
+                        }
+                    )
+                    cycle_issue[0].cycle_id = cycle_id
+                    records_to_update.append(cycle_issue[0])
+            else:
+                record_to_create.append(
+                    CycleIssue(
+                        project_id=project_id,
+                        workspace=cycle.workspace,
+                        created_by=request.user,
+                        updated_by=request.user,
+                        cycle=cycle,
+                        issue_id=issue,
+                    )
+                )
+
+        CycleIssue.objects.bulk_create(
+            record_to_create,
+            batch_size=10,
+            ignore_conflicts=True,
+        )
         CycleIssue.objects.bulk_update(
-            updated_records, ["cycle_id"], batch_size=100
+            records_to_update,
+            ["cycle"],
+            batch_size=10,
         )
 
         # Capture Issue Activity
         issue_activity.delay(
             type="cycle.activity.created",
-            requested_data=json.dumps({"cycles_list": issues}),
+            requested_data=json.dumps({"cycles_list": str(issues)}),
             actor_id=str(self.request.user.id),
             issue_id=None,
             project_id=str(self.kwargs.get("project_id", None)),
@@ -747,14 +723,13 @@ class CycleIssueAPIEndpoint(BaseAPIView):
                 {
                     "updated_cycle_issues": update_cycle_issue_activity,
                     "created_cycle_issues": serializers.serialize(
-                        "json", created_records
+                        "json", record_to_create
                     ),
                 }
             ),
             epoch=int(timezone.now().timestamp()),
-            notification=True,
-            origin=request.META.get("HTTP_ORIGIN"),
         )
+
         # Return all Cycle Issues
         return Response(
             CycleIssueSerializer(self.get_queryset(), many=True).data,

apiserver/plane/api/views/issue.py

@@ -151,25 +151,6 @@ class IssueAPIEndpoint(BaseAPIView):
         ).distinct()
 
     def get(self, request, slug, project_id, pk=None):
-        external_id = request.GET.get("external_id")
-        external_source = request.GET.get("external_source")
-
-        if external_id and external_source:
-            issue = Issue.objects.get(
-                external_id=external_id,
-                external_source=external_source,
-                workspace__slug=slug,
-                project_id=project_id,
-            )
-            return Response(
-                IssueSerializer(
-                    issue,
-                    fields=self.fields,
-                    expand=self.expand,
-                ).data,
-                status=status.HTTP_200_OK,
-            )
-
         if pk:
             issue = Issue.issue_objects.annotate(
                 sub_issues_count=Issue.issue_objects.filter(
@@ -334,11 +315,8 @@ class IssueAPIEndpoint(BaseAPIView):
                 project_id=project_id,
                 pk=serializer.data["id"],
             ).first()
-            issue.created_at = request.data.get("created_at", timezone.now())
-            issue.created_by_id = request.data.get(
-                "created_by", request.user.id
-            )
-            issue.save(update_fields=["created_at", "created_by"])
+            issue.created_at = request.data.get("created_at")
+            issue.save(update_fields=["created_at"])
 
             # Track the issue
             issue_activity.delay(
@@ -632,20 +610,14 @@ class IssueLinkAPIEndpoint(BaseAPIView):
                 project_id=project_id,
                 issue_id=issue_id,
             )
-
-            link = IssueLink.objects.get(pk=serializer.data["id"])
-            link.created_by_id = request.data.get(
-                "created_by", request.user.id
-            )
-            link.save(update_fields=["created_by"])
             issue_activity.delay(
                 type="link.activity.created",
                 requested_data=json.dumps(
                     serializer.data, cls=DjangoJSONEncoder
                 ),
+                actor_id=str(self.request.user.id),
                 issue_id=str(self.kwargs.get("issue_id")),
                 project_id=str(self.kwargs.get("project_id")),
-                actor_id=str(link.created_by_id),
                 current_instance=None,
                 epoch=int(timezone.now().timestamp()),
             )
@@ -799,24 +771,12 @@ class IssueCommentAPIEndpoint(BaseAPIView):
                 issue_id=issue_id,
                 actor=request.user,
             )
-            issue_comment = IssueComment.objects.get(
-                pk=serializer.data.get("id")
-            )
-            # Update the created_at and the created_by and save the comment
-            issue_comment.created_at = request.data.get(
-                "created_at", timezone.now()
-            )
-            issue_comment.created_by_id = request.data.get(
-                "created_by", request.user.id
-            )
-            issue_comment.save(update_fields=["created_at", "created_by"])
-
             issue_activity.delay(
                 type="comment.activity.created",
                 requested_data=json.dumps(
                     serializer.data, cls=DjangoJSONEncoder
                 ),
-                actor_id=str(issue_comment.created_by_id),
+                actor_id=str(self.request.user.id),
                 issue_id=str(self.kwargs.get("issue_id")),
                 project_id=str(self.kwargs.get("project_id")),
                 current_instance=None,

apiserver/plane/api/views/member.py

@@ -21,19 +21,11 @@ from plane.db.models import (
     ProjectMember,
 )
 
-from plane.app.permissions import (
-    ProjectMemberPermission,
-)
-
 
 # API endpoint to get and insert users inside the workspace
-class ProjectMemberAPIEndpoint(BaseAPIView):
-    permission_classes = [
-        ProjectMemberPermission,
-    ]
-
+class WorkspaceMemberAPIEndpoint(BaseAPIView):
     # Get all the users that are present inside the workspace
-    def get(self, request, slug, project_id):
+    def get(self, request, slug):
         # Check if the workspace exists
         if not Workspace.objects.filter(slug=slug).exists():
             return Response(
@@ -42,14 +34,14 @@ class ProjectMemberAPIEndpoint(BaseAPIView):
             )
 
         # Get the workspace members that are present inside the workspace
-        project_members = ProjectMember.objects.filter(
-            project_id=project_id, workspace__slug=slug
-        ).values_list("member_id", flat=True)
+        workspace_members = WorkspaceMember.objects.filter(
+            workspace__slug=slug
+        )
 
         # Get all the users that are present inside the workspace
         users = UserLiteSerializer(
             User.objects.filter(
-                id__in=project_members,
+                id__in=workspace_members.values_list("member_id", flat=True)
             ),
             many=True,
         ).data
@@ -57,13 +49,14 @@ class ProjectMemberAPIEndpoint(BaseAPIView):
         return Response(users, status=status.HTTP_200_OK)
 
     # Insert a new user inside the workspace, and assign the user to the project
-    def post(self, request, slug, project_id):
+    def post(self, request, slug):
         # Check if user with email already exists, and send bad request if it's
         # not present, check for workspace and valid project mandat
         # ------------------- Validation -------------------
         if (
             request.data.get("email") is None
             or request.data.get("display_name") is None
+            or request.data.get("project_id") is None
         ):
             return Response(
                 {
@@ -83,7 +76,9 @@ class ProjectMemberAPIEndpoint(BaseAPIView):
             )
 
         workspace = Workspace.objects.filter(slug=slug).first()
-        project = Project.objects.filter(pk=project_id).first()
+        project = Project.objects.filter(
+            pk=request.data.get("project_id")
+        ).first()
 
         if not all([workspace, project]):
             return Response(
@@ -150,4 +145,3 @@ class ProjectMemberAPIEndpoint(BaseAPIView):
         user_data = UserLiteSerializer(user).data
 
         return Response(user_data, status=status.HTTP_201_CREATED)
-

apiserver/plane/api/views/module.py

@@ -28,7 +28,6 @@ from plane.db.models import (
     ModuleLink,
     Project,
     ProjectMember,
-    UserFavorite,
 )
 
 from .base import BaseAPIView
@@ -302,17 +301,6 @@ class ModuleAPIEndpoint(BaseAPIView):
             epoch=int(timezone.now().timestamp()),
         )
         module.delete()
-        # Delete the module issues
-        ModuleIssue.objects.filter(
-            module=pk,
-            project_id=project_id,
-        ).delete()
-        # Delete the user favorite module
-        UserFavorite.objects.filter(
-            entity_type="module",
-            entity_identifier=pk,
-            project_id=project_id,
-        ).delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 

apiserver/plane/api/views/project.py

@@ -26,7 +26,6 @@ from plane.db.models import (
     ProjectMember,
     State,
     Workspace,
-    UserFavorite,
 )
 from plane.bgtasks.webhook_task import model_activity
 from .base import BaseAPIView
@@ -357,12 +356,6 @@ class ProjectAPIEndpoint(BaseAPIView):
 
     def delete(self, request, slug, pk):
         project = Project.objects.get(pk=pk, workspace__slug=slug)
-        # Delete the user favorite cycle
-        UserFavorite.objects.filter(
-            entity_type="project",
-            entity_identifier=pk,
-            project_id=pk,
-        ).delete()
         project.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 

apiserver/plane/app/serializers/__init__.py

@@ -121,5 +121,3 @@ from .exporter import ExporterHistorySerializer
 from .webhook import WebhookSerializer, WebhookLogSerializer
 
 from .dashboard import DashboardSerializer, WidgetSerializer
-
-from .favorite import UserFavoriteSerializer

apiserver/plane/app/serializers/favorite.py

@@ -1,101 +0,0 @@
-from rest_framework import serializers
-
-from plane.db.models import (
-    UserFavorite,
-    Cycle,
-    Module,
-    Issue,
-    IssueView,
-    Page,
-    Project,
-)
-
-
-class ProjectFavoriteLiteSerializer(serializers.ModelSerializer):
-
-    class Meta:
-        model = Project
-        fields = ["id", "name", "logo_props"]
-
-
-class PageFavoriteLiteSerializer(serializers.ModelSerializer):
-    project_id = serializers.SerializerMethodField()
-
-    class Meta:
-        model = Page
-        fields = ["id", "name", "logo_props", "project_id"]
-
-    def get_project_id(self, obj):
-        project = (
-            obj.projects.first()
-        )  # This gets the first project related to the Page
-        return project.id if project else None
-
-
-class CycleFavoriteLiteSerializer(serializers.ModelSerializer):
-
-    class Meta:
-        model = Cycle
-        fields = ["id", "name", "logo_props", "project_id"]
-
-
-class ModuleFavoriteLiteSerializer(serializers.ModelSerializer):
-
-    class Meta:
-        model = Module
-        fields = ["id", "name", "logo_props", "project_id"]
-
-
-class ViewFavoriteSerializer(serializers.ModelSerializer):
-
-    class Meta:
-        model = IssueView
-        fields = ["id", "name", "logo_props", "project_id"]
-
-
-def get_entity_model_and_serializer(entity_type):
-    entity_map = {
-        "cycle": (Cycle, CycleFavoriteLiteSerializer),
-        "issue": (Issue, None),
-        "module": (Module, ModuleFavoriteLiteSerializer),
-        "view": (IssueView, ViewFavoriteSerializer),
-        "page": (Page, PageFavoriteLiteSerializer),
-        "project": (Project, ProjectFavoriteLiteSerializer),
-        "folder": (None, None),
-    }
-    return entity_map.get(entity_type, (None, None))
-
-
-class UserFavoriteSerializer(serializers.ModelSerializer):
-    entity_data = serializers.SerializerMethodField()
-
-    class Meta:
-        model = UserFavorite
-        fields = [
-            "id",
-            "entity_type",
-            "entity_identifier",
-            "entity_data",
-            "name",
-            "is_folder",
-            "sequence",
-            "parent",
-            "workspace_id",
-            "project_id",
-        ]
-        read_only_fields = ["workspace", "created_by", "updated_by"]
-
-    def get_entity_data(self, obj):
-        entity_type = obj.entity_type
-        entity_identifier = obj.entity_identifier
-
-        entity_model, entity_serializer = get_entity_model_and_serializer(
-            entity_type
-        )
-        if entity_model and entity_serializer:
-            try:
-                entity = entity_model.objects.get(pk=entity_identifier)
-                return entity_serializer(entity).data
-            except entity_model.DoesNotExist:
-                return None
-        return None

apiserver/plane/app/serializers/issue.py

@@ -533,7 +533,6 @@ class IssueReactionSerializer(BaseSerializer):
             "project",
             "issue",
             "actor",
-            "deleted_at"
         ]
 
 
@@ -552,7 +551,7 @@ class CommentReactionSerializer(BaseSerializer):
     class Meta:
         model = CommentReaction
         fields = "__all__"
-        read_only_fields = ["workspace", "project", "comment", "actor", "deleted_at"]
+        read_only_fields = ["workspace", "project", "comment", "actor"]
 
 
 class IssueVoteSerializer(BaseSerializer):

apiserver/plane/app/serializers/module.py

@@ -39,7 +39,6 @@ class ModuleWriteSerializer(BaseSerializer):
             "created_at",
             "updated_at",
             "archived_at",
-            "deleted_at",
         ]
 
     def to_representation(self, instance):

apiserver/plane/app/serializers/project.py

@@ -28,7 +28,6 @@ class ProjectSerializer(BaseSerializer):
         fields = "__all__"
         read_only_fields = [
             "workspace",
-            "deleted_at",
         ]
 
     def create(self, validated_data):

apiserver/plane/app/urls/issue.py

@@ -21,7 +21,6 @@ from plane.app.views import (
     LabelViewSet,
     BulkIssueOperationsEndpoint,
     BulkArchiveIssuesEndpoint,
-    DeletedIssuesListViewSet,
 )
 
 urlpatterns = [
@@ -311,9 +310,4 @@ urlpatterns = [
         BulkIssueOperationsEndpoint.as_view(),
         name="bulk-operations-issues",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/deleted-issues/",
-        DeletedIssuesListViewSet.as_view(),
-        name="deleted-issues",
-    ),
 ]

apiserver/plane/app/urls/workspace.py

@@ -25,8 +25,6 @@ from plane.app.views import (
     ExportWorkspaceUserActivityEndpoint,
     WorkspaceModulesEndpoint,
     WorkspaceCyclesEndpoint,
-    WorkspaceFavoriteEndpoint,
-    WorkspaceFavoriteGroupEndpoint,
 )
 
 
@@ -239,19 +237,4 @@ urlpatterns = [
         WorkspaceCyclesEndpoint.as_view(),
         name="workspace-cycles",
     ),
-    path(
-        "workspaces/<str:slug>/user-favorites/",
-        WorkspaceFavoriteEndpoint.as_view(),
-        name="workspace-user-favorites",
-    ),
-    path(
-        "workspaces/<str:slug>/user-favorites/<uuid:favorite_id>/",
-        WorkspaceFavoriteEndpoint.as_view(),
-        name="workspace-user-favorites",
-    ),
-    path(
-        "workspaces/<str:slug>/user-favorites/<uuid:favorite_id>/group/",
-        WorkspaceFavoriteGroupEndpoint.as_view(),
-        name="workspace-user-favorites-groups",
-    ),
 ]

apiserver/plane/app/views/__init__.py

@@ -40,11 +40,6 @@ from .workspace.base import (
     ExportWorkspaceUserActivityEndpoint,
 )
 
-from .workspace.favorite import (
-    WorkspaceFavoriteEndpoint,
-    WorkspaceFavoriteGroupEndpoint,
-)
-
 from .workspace.member import (
     WorkSpaceMemberViewSet,
     TeamMemberViewSet,
@@ -112,7 +107,6 @@ from .issue.base import (
     IssueViewSet,
     IssueUserDisplayPropertyEndpoint,
     BulkDeleteIssuesEndpoint,
-    DeletedIssuesListViewSet,
 )
 
 from .issue.activity import (

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

@@ -14,18 +14,21 @@ from django.db.models import (
     UUIDField,
     Value,
     When,
-    Subquery,
-    Sum,
-    FloatField,
 )
-from django.db.models.functions import Coalesce, Cast
+from django.db.models.functions import Coalesce
 from django.utils import timezone
 
 # Third party imports
 from rest_framework import status
 from rest_framework.response import Response
 from plane.app.permissions import ProjectEntityPermission
-from plane.db.models import Cycle, UserFavorite, Issue, Label, User, Project
+from plane.db.models import (
+    Cycle,
+    UserFavorite,
+    Issue,
+    Label,
+    User,
+)
 from plane.utils.analytics_plot import burndown_plot
 
 # Module imports
@@ -46,89 +49,6 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
             project_id=self.kwargs.get("project_id"),
             workspace__slug=self.kwargs.get("slug"),
         )
-        backlog_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="backlog",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                backlog_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("backlog_estimate_point")[:1]
-        )
-        unstarted_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="unstarted",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                unstarted_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("unstarted_estimate_point")[:1]
-        )
-        started_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="started",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                started_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("started_estimate_point")[:1]
-        )
-        cancelled_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="cancelled",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                cancelled_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("cancelled_estimate_point")[:1]
-        )
-        completed_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="completed",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                completed_estimate_points=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("completed_estimate_points")[:1]
-        )
-        total_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                total_estimate_points=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("total_estimate_points")[:1]
-        )
         return (
             Cycle.objects.filter(workspace__slug=self.kwargs.get("slug"))
             .filter(project_id=self.kwargs.get("project_id"))
@@ -252,42 +172,6 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                     Value([], output_field=ArrayField(UUIDField())),
                 )
             )
-            .annotate(
-                backlog_estimate_points=Coalesce(
-                    Subquery(backlog_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                unstarted_estimate_points=Coalesce(
-                    Subquery(unstarted_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                started_estimate_points=Coalesce(
-                    Subquery(started_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                cancelled_estimate_points=Coalesce(
-                    Subquery(cancelled_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                completed_estimate_points=Coalesce(
-                    Subquery(completed_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                total_estimate_points=Coalesce(
-                    Subquery(total_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
             .order_by("-is_favorite", "name")
             .distinct()
         )
@@ -295,7 +179,17 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
     def get(self, request, slug, project_id, pk=None):
         if pk is None:
             queryset = (
-                self.get_queryset().values(
+                self.get_queryset()
+                .annotate(
+                    total_issues=Count(
+                        "issue_cycle",
+                        filter=Q(
+                            issue_cycle__issue__archived_at__isnull=True,
+                            issue_cycle__issue__is_draft=False,
+                        ),
+                    )
+                )
+                .values(
                     # necessary fields
                     "id",
                     "workspace_id",
@@ -361,10 +255,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                     "external_id",
                     "progress_snapshot",
                     "sub_issues",
-                    "logo_props",
                     # meta fields
-                    "completed_estimate_points",
-                    "total_estimate_points",
                     "is_favorite",
                     "total_issues",
                     "cancelled_issues",
@@ -374,114 +265,17 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                     "backlog_issues",
                     "assignee_ids",
                     "status",
-                    "created_by",
-                    "archived_at",
                 )
                 .first()
             )
             queryset = queryset.first()
 
-            estimate_type = Project.objects.filter(
-                workspace__slug=slug,
-                pk=project_id,
-                estimate__isnull=False,
-                estimate__type="points",
-            ).exists()
-
-            data["estimate_distribution"] = {}
-            if estimate_type:
-                assignee_distribution = (
-                    Issue.issue_objects.filter(
-                        issue_cycle__cycle_id=pk,
-                        workspace__slug=slug,
-                        project_id=project_id,
-                    )
-                    .annotate(display_name=F("assignees__display_name"))
-                    .annotate(assignee_id=F("assignees__id"))
-                    .annotate(avatar=F("assignees__avatar"))
-                    .values("display_name", "assignee_id", "avatar")
-                    .annotate(
-                        total_estimates=Sum(
-                            Cast("estimate_point__value", FloatField())
-                        )
-                    )
-                    .annotate(
-                        completed_estimates=Sum(
-                            Cast("estimate_point__value", FloatField()),
-                            filter=Q(
-                                completed_at__isnull=False,
-                                archived_at__isnull=True,
-                                is_draft=False,
-                            ),
-                        )
-                    )
-                    .annotate(
-                        pending_estimates=Sum(
-                            Cast("estimate_point__value", FloatField()),
-                            filter=Q(
-                                completed_at__isnull=True,
-                                archived_at__isnull=True,
-                                is_draft=False,
-                            ),
-                        )
-                    )
-                    .order_by("display_name")
+            if data is None:
+                return Response(
+                    {"error": "Cycle does not exist"},
+                    status=status.HTTP_400_BAD_REQUEST,
                 )
 
-                label_distribution = (
-                    Issue.issue_objects.filter(
-                        issue_cycle__cycle_id=pk,
-                        workspace__slug=slug,
-                        project_id=project_id,
-                    )
-                    .annotate(label_name=F("labels__name"))
-                    .annotate(color=F("labels__color"))
-                    .annotate(label_id=F("labels__id"))
-                    .values("label_name", "color", "label_id")
-                    .annotate(
-                        total_estimates=Sum(
-                            Cast("estimate_point__value", FloatField())
-                        )
-                    )
-                    .annotate(
-                        completed_estimates=Sum(
-                            Cast("estimate_point__value", FloatField()),
-                            filter=Q(
-                                completed_at__isnull=False,
-                                archived_at__isnull=True,
-                                is_draft=False,
-                            ),
-                        )
-                    )
-                    .annotate(
-                        pending_estimates=Sum(
-                            Cast("estimate_point__value", FloatField()),
-                            filter=Q(
-                                completed_at__isnull=True,
-                                archived_at__isnull=True,
-                                is_draft=False,
-                            ),
-                        )
-                    )
-                    .order_by("label_name")
-                )
-                data["estimate_distribution"] = {
-                    "assignees": assignee_distribution,
-                    "labels": label_distribution,
-                    "completion_chart": {},
-                }
-
-                if data["start_date"] and data["end_date"]:
-                    data["estimate_distribution"]["completion_chart"] = (
-                        burndown_plot(
-                            queryset=queryset,
-                            slug=slug,
-                            project_id=project_id,
-                            plot_type="points",
-                            cycle_id=pk,
-                        )
-                    )
-
             # Assignee Distribution
             assignee_distribution = (
                 Issue.issue_objects.filter(
@@ -504,10 +298,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                 .annotate(
                     total_issues=Count(
                         "id",
-                        filter=Q(
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
+                        filter=Q(archived_at__isnull=True, is_draft=False),
                     ),
                 )
                 .annotate(
@@ -547,10 +338,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                 .annotate(
                     total_issues=Count(
                         "id",
-                        filter=Q(
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
+                        filter=Q(archived_at__isnull=True, is_draft=False),
                     ),
                 )
                 .annotate(

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

@@ -385,7 +385,7 @@ class CycleViewSet(BaseViewSet):
                 data[0]["estimate_distribution"] = {}
                 if estimate_type:
                     assignee_distribution = (
-                        Issue.issue_objects.filter(
+                        Issue.objects.filter(
                             issue_cycle__cycle_id=data[0]["id"],
                             workspace__slug=slug,
                             project_id=project_id,
@@ -423,7 +423,7 @@ class CycleViewSet(BaseViewSet):
                     )
 
                     label_distribution = (
-                        Issue.issue_objects.filter(
+                        Issue.objects.filter(
                             issue_cycle__cycle_id=data[0]["id"],
                             workspace__slug=slug,
                             project_id=project_id,
@@ -477,7 +477,7 @@ class CycleViewSet(BaseViewSet):
                         )
 
                 assignee_distribution = (
-                    Issue.issue_objects.filter(
+                    Issue.objects.filter(
                         issue_cycle__cycle_id=data[0]["id"],
                         workspace__slug=slug,
                         project_id=project_id,
@@ -519,7 +519,7 @@ class CycleViewSet(BaseViewSet):
                 )
 
                 label_distribution = (
-                    Issue.issue_objects.filter(
+                    Issue.objects.filter(
                         issue_cycle__cycle_id=data[0]["id"],
                         workspace__slug=slug,
                         project_id=project_id,
@@ -834,7 +834,7 @@ class CycleViewSet(BaseViewSet):
         data["estimate_distribution"] = {}
         if estimate_type:
             assignee_distribution = (
-                Issue.issue_objects.filter(
+                Issue.objects.filter(
                     issue_cycle__cycle_id=pk,
                     workspace__slug=slug,
                     project_id=project_id,
@@ -872,7 +872,7 @@ class CycleViewSet(BaseViewSet):
             )
 
             label_distribution = (
-                Issue.issue_objects.filter(
+                Issue.objects.filter(
                     issue_cycle__cycle_id=pk,
                     workspace__slug=slug,
                     project_id=project_id,
@@ -927,7 +927,7 @@ class CycleViewSet(BaseViewSet):
 
         # Assignee Distribution
         assignee_distribution = (
-            Issue.issue_objects.filter(
+            Issue.objects.filter(
                 issue_cycle__cycle_id=pk,
                 workspace__slug=slug,
                 project_id=project_id,
@@ -978,7 +978,7 @@ class CycleViewSet(BaseViewSet):
 
         # Label Distribution
         label_distribution = (
-            Issue.issue_objects.filter(
+            Issue.objects.filter(
                 issue_cycle__cycle_id=pk,
                 workspace__slug=slug,
                 project_id=project_id,
@@ -1082,17 +1082,6 @@ class CycleViewSet(BaseViewSet):
         )
         # Delete the cycle
         cycle.delete()
-        # Delete the cycle issues
-        CycleIssue.objects.filter(
-            cycle_id=self.kwargs.get("pk"),
-        ).delete()
-        # Delete the user favorite cycle
-        UserFavorite.objects.filter(
-            user=request.user,
-            entity_type="cycle",
-            entity_identifier=pk,
-            project_id=project_id,
-        ).delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
@@ -1161,7 +1150,7 @@ class CycleFavoriteViewSet(BaseViewSet):
             workspace__slug=slug,
             entity_identifier=cycle_id,
         )
-        cycle_favorite.delete(soft=False)
+        cycle_favorite.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 

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

@@ -20,7 +20,6 @@ from rest_framework.response import Response
 from plane.app.permissions import (
     ProjectEntityPermission,
 )
-
 # Module imports
 from .. import BaseViewSet
 from plane.app.serializers import (
@@ -46,6 +45,7 @@ from plane.utils.paginator import (
     SubGroupedOffsetPaginator,
 )
 
+# Module imports
 
 class CycleIssueViewSet(BaseViewSet):
     serializer_class = CycleIssueSerializer
@@ -334,7 +334,7 @@ class CycleIssueViewSet(BaseViewSet):
         return Response({"message": "success"}, status=status.HTTP_201_CREATED)
 
     def destroy(self, request, slug, project_id, cycle_id, issue_id):
-        cycle_issue = CycleIssue.objects.filter(
+        cycle_issue = CycleIssue.objects.get(
             issue_id=issue_id,
             workspace__slug=slug,
             project_id=project_id,

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

@@ -66,7 +66,6 @@ class IssueArchiveViewSet(BaseViewSet):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .filter(deleted_at__isnull=True)
             .filter(archived_at__isnull=False)
             .filter(project_id=self.kwargs.get("project_id"))
             .filter(workspace__slug=self.kwargs.get("slug"))

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

@@ -14,7 +14,7 @@ from rest_framework.parsers import MultiPartParser, FormParser
 from .. import BaseAPIView
 from plane.app.serializers import IssueAttachmentSerializer
 from plane.app.permissions import ProjectEntityPermission
-from plane.db.models import IssueAttachment, ProjectMember
+from plane.db.models import IssueAttachment
 from plane.bgtasks.issue_activites_task import issue_activity
 
 
@@ -49,19 +49,6 @@ class IssueAttachmentEndpoint(BaseAPIView):
 
     def delete(self, request, slug, project_id, issue_id, pk):
         issue_attachment = IssueAttachment.objects.get(pk=pk)
-        if issue_attachment.created_by_id != request.user.id and (
-            not ProjectMember.objects.filter(
-                workspace__slug=slug,
-                member=request.user,
-                role=20,
-                project_id=project_id,
-                is_active=True,
-            ).exists()
-        ):
-            return Response(
-                {"error": "Only admin or creator can delete the attachment"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
         issue_attachment.asset.delete(save=False)
         issue_attachment.delete()
         issue_activity.delay(

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

@@ -234,15 +234,10 @@ class IssueViewSet(BaseViewSet):
 
     @method_decorator(gzip_page)
     def list(self, request, slug, project_id):
-        extra_filters = {}
-        if request.GET.get("updated_at__gt", None) is not None:
-            extra_filters = {
-                "updated_at__gt": request.GET.get("updated_at__gt")
-            }
         filters = issue_filters(request.query_params, "GET")
         order_by_param = request.GET.get("order_by", "-created_at")
 
-        issue_queryset = self.get_queryset().filter(**filters, **extra_filters)
+        issue_queryset = self.get_queryset().filter(**filters)
         # Custom ordering for priority and state
 
         # Issue queryset
@@ -627,7 +622,7 @@ class BulkDeleteIssuesEndpoint(BaseAPIView):
         if ProjectMember.objects.filter(
             workspace__slug=slug,
             member=request.user,
-            role__in=[15, 10, 5],
+            role=20,
             project_id=project_id,
             is_active=True,
         ).exists():
@@ -657,18 +652,3 @@ class BulkDeleteIssuesEndpoint(BaseAPIView):
             {"message": f"{total_issues} issues were deleted"},
             status=status.HTTP_200_OK,
         )
-
-
-class DeletedIssuesListViewSet(BaseAPIView):
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-
-    def get(self, request, slug, project_id):
-        deleted_issues = Issue.all_objects.filter(
-            workspace__slug=slug,
-            project_id=project_id,
-            deleted_at__isnull=False,
-        ).values_list("id", flat=True)
-
-        return Response(deleted_issues, status=status.HTTP_200_OK)

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

@@ -68,7 +68,6 @@ class IssueDraftViewSet(BaseViewSet):
             Issue.objects.filter(project_id=self.kwargs.get("project_id"))
             .filter(workspace__slug=self.kwargs.get("slug"))
             .filter(is_draft=True)
-            .filter(deleted_at__isnull=True)
             .select_related("workspace", "project", "state", "parent")
             .prefetch_related("assignees", "labels", "issue_module__module")
             .annotate(cycle_id=F("issue_cycle__cycle_id"))

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

@@ -12,8 +12,7 @@ from django.db.models import (
     Subquery,
     UUIDField,
     Value,
-    Sum,
-    FloatField,
+    Sum
 )
 from django.db.models.functions import Coalesce, Cast
 from django.utils import timezone
@@ -45,8 +44,8 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
     def get_queryset(self):
         favorite_subquery = UserFavorite.objects.filter(
             user=self.request.user,
-            entity_type="module",
             entity_identifier=OuterRef("pk"),
+            entity_type="module",
             project_id=self.kwargs.get("project_id"),
             workspace__slug=self.kwargs.get("slug"),
         )
@@ -103,93 +102,8 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
             .annotate(cnt=Count("pk"))
             .values("cnt")
         )
-        completed_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="completed",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(
-                completed_estimate_points=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("completed_estimate_points")[:1]
-        )
-
-        total_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(
-                total_estimate_points=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("total_estimate_points")[:1]
-        )
-        backlog_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="backlog",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(
-                backlog_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("backlog_estimate_point")[:1]
-        )
-        unstarted_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="unstarted",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(
-                unstarted_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("unstarted_estimate_point")[:1]
-        )
-        started_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="started",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(
-                started_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("started_estimate_point")[:1]
-        )
-        cancelled_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="cancelled",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(
-                cancelled_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("cancelled_estimate_point")[:1]
-        )
         return (
             Module.objects.filter(workspace__slug=self.kwargs.get("slug"))
-            .filter(project_id=self.kwargs.get("project_id"))
             .filter(archived_at__isnull=False)
             .annotate(is_favorite=Exists(favorite_subquery))
             .select_related("workspace", "project", "lead")
@@ -238,42 +152,6 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                     Value(0, output_field=IntegerField()),
                 )
             )
-            .annotate(
-                backlog_estimate_points=Coalesce(
-                    Subquery(backlog_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                unstarted_estimate_points=Coalesce(
-                    Subquery(unstarted_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                started_estimate_points=Coalesce(
-                    Subquery(started_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                cancelled_estimate_points=Coalesce(
-                    Subquery(cancelled_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                completed_estimate_points=Coalesce(
-                    Subquery(completed_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                total_estimate_points=Coalesce(
-                    Subquery(total_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
             .annotate(
                 member_ids=Coalesce(
                     ArrayAgg(
@@ -354,7 +232,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
             data["estimate_distribution"] = {}
 
             if estimate_type:
-                assignee_distribution = (
+                label_distribution = (
                     Issue.issue_objects.filter(
                         issue_module__module_id=pk,
                         workspace__slug=slug,
@@ -374,12 +252,12 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                     )
                     .annotate(
                         total_estimates=Sum(
-                            Cast("estimate_point__value", FloatField())
+                            Cast("estimate_point__value", IntegerField())
                         ),
                     )
                     .annotate(
                         completed_estimates=Sum(
-                            Cast("estimate_point__value", FloatField()),
+                            Cast("estimate_point__value", IntegerField()),
                             filter=Q(
                                 completed_at__isnull=False,
                                 archived_at__isnull=True,
@@ -389,7 +267,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                     )
                     .annotate(
                         pending_estimates=Sum(
-                            Cast("estimate_point__value", FloatField()),
+                            Cast("estimate_point__value", IntegerField()),
                             filter=Q(
                                 completed_at__isnull=True,
                                 archived_at__isnull=True,
@@ -400,7 +278,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                     .order_by("first_name", "last_name")
                 )
 
-                label_distribution = (
+                assignee_distribution = (
                     Issue.issue_objects.filter(
                         issue_module__module_id=pk,
                         workspace__slug=slug,
@@ -412,12 +290,12 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                     .values("label_name", "color", "label_id")
                     .annotate(
                         total_estimates=Sum(
-                            Cast("estimate_point__value", FloatField())
+                            Cast("estimate_point__value", IntegerField())
                         ),
                     )
                     .annotate(
                         completed_estimates=Sum(
-                            Cast("estimate_point__value", FloatField()),
+                            Cast("estimate_point__value", IntegerField()),
                             filter=Q(
                                 completed_at__isnull=False,
                                 archived_at__isnull=True,
@@ -427,7 +305,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                     )
                     .annotate(
                         pending_estimates=Sum(
-                            Cast("estimate_point__value", FloatField()),
+                            Cast("estimate_point__value", IntegerField()),
                             filter=Q(
                                 completed_at__isnull=True,
                                 archived_at__isnull=True,
@@ -437,8 +315,8 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                     )
                     .order_by("label_name")
                 )
-                data["estimate_distribution"]["assignees"] = assignee_distribution
-                data["estimate_distribution"]["labels"] = label_distribution
+                data["estimate_distribution"]["assignee"] = assignee_distribution
+                data["estimate_distribution"]["label"] = label_distribution
 
                 if modules and modules.start_date and modules.target_date:
                     data["estimate_distribution"]["completion_chart"] = (
@@ -450,7 +328,6 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                             module_id=pk,
                         )
                     )
-
             assignee_distribution = (
                 Issue.issue_objects.filter(
                     issue_module__module_id=pk,
@@ -476,7 +353,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                             archived_at__isnull=True,
                             is_draft=False,
                         ),
-                    ),
+                    )
                 )
                 .annotate(
                     completed_issues=Count(
@@ -548,6 +425,8 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                 "labels": label_distribution,
                 "completion_chart": {},
             }
+
+            # Fetch the modules
             if modules and modules.start_date and modules.target_date:
                 data["distribution"]["completion_chart"] = burndown_plot(
                     queryset=modules,

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

@@ -444,12 +444,6 @@ class ModuleViewSet(BaseViewSet):
             )
         )
 
-        if not queryset.exists():
-            return Response(
-                {"error": "Module not found"},
-                status=status.HTTP_404_NOT_FOUND,
-            )
-
         estimate_type = Project.objects.filter(
             workspace__slug=slug,
             pk=project_id,
@@ -561,7 +555,7 @@ class ModuleViewSet(BaseViewSet):
                 )
 
         assignee_distribution = (
-            Issue.issue_objects.filter(
+            Issue.objects.filter(
                 issue_module__module_id=pk,
                 workspace__slug=slug,
                 project_id=project_id,
@@ -611,7 +605,7 @@ class ModuleViewSet(BaseViewSet):
         )
 
         label_distribution = (
-            Issue.issue_objects.filter(
+            Issue.objects.filter(
                 issue_module__module_id=pk,
                 workspace__slug=slug,
                 project_id=project_id,
@@ -779,18 +773,6 @@ class ModuleViewSet(BaseViewSet):
             for issue in module_issues
         ]
         module.delete()
-        # Delete the module issues
-        ModuleIssue.objects.filter(
-            module=pk,
-            project_id=project_id,
-        ).delete()
-        # Delete the user favorite module
-        UserFavorite.objects.filter(
-            user=request.user,
-            entity_type="module",
-            entity_identifier=pk,
-            project_id=project_id,
-        ).delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
@@ -854,7 +836,7 @@ class ModuleFavoriteViewSet(BaseViewSet):
             entity_type="module",
             entity_identifier=module_id,
         )
-        module_favorite.delete(soft=False)
+        module_favorite.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 

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

@@ -250,6 +250,7 @@ class ModuleIssueViewSet(BaseViewSet):
         removed_modules = request.data.get("removed_modules", [])
         project = Project.objects.get(pk=project_id)
 
+
         if modules:
             _ = ModuleIssue.objects.bulk_create(
                 [
@@ -283,7 +284,7 @@ class ModuleIssueViewSet(BaseViewSet):
             ]
 
         for module_id in removed_modules:
-            module_issue = ModuleIssue.objects.filter(
+            module_issue = ModuleIssue.objects.get(
                 workspace__slug=slug,
                 project_id=project_id,
                 module_id=module_id,
@@ -296,7 +297,7 @@ class ModuleIssueViewSet(BaseViewSet):
                 issue_id=str(issue_id),
                 project_id=str(project_id),
                 current_instance=json.dumps(
-                    {"module_name": module_issue.first().module.name}
+                    {"module_name": module_issue.module.name}
                 ),
                 epoch=int(timezone.now().timestamp()),
                 notification=True,
@@ -307,7 +308,7 @@ class ModuleIssueViewSet(BaseViewSet):
         return Response({"message": "success"}, status=status.HTTP_201_CREATED)
 
     def destroy(self, request, slug, project_id, module_id, issue_id):
-        module_issue = ModuleIssue.objects.filter(
+        module_issue = ModuleIssue.objects.get(
             workspace__slug=slug,
             project_id=project_id,
             module_id=module_id,
@@ -320,7 +321,7 @@ class ModuleIssueViewSet(BaseViewSet):
             issue_id=str(issue_id),
             project_id=str(project_id),
             current_instance=json.dumps(
-                {"module_name": module_issue.first().module.name}
+                {"module_name": module_issue.module.name}
             ),
             epoch=int(timezone.now().timestamp()),
             notification=True,

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

@@ -333,14 +333,8 @@ class PageViewSet(BaseViewSet):
             pk=pk, workspace__slug=slug, projects__id=project_id
         )
 
-        if page.archived_at is None:
-            return Response(
-                {"error": "The page should be archived before deleting"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        if page.owned_by_id != request.user.id and (
-            not ProjectMember.objects.filter(
+        if not page.owned_by_id != request.user.id and not (
+            ProjectMember.objects.filter(
                 workspace__slug=slug,
                 member=request.user,
                 role=20,
@@ -353,19 +347,33 @@ class PageViewSet(BaseViewSet):
                 status=status.HTTP_403_FORBIDDEN,
             )
 
+        # only the owner and admin can delete the page
+        if (
+            ProjectMember.objects.filter(
+                project_id=project_id,
+                member=request.user,
+                is_active=True,
+                role__gt=20,
+            ).exists()
+            or request.user.id != page.owned_by_id
+        ):
+            return Response(
+                {"error": "Only the owner and admin can delete the page"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        if page.archived_at is None:
+            return Response(
+                {"error": "The page should be archived before deleting"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
         # remove parent from all the children
         _ = Page.objects.filter(
             parent_id=pk, projects__id=project_id, workspace__slug=slug
         ).update(parent=None)
 
         page.delete()
-        # Delete the user favorite page
-        UserFavorite.objects.filter(
-            project=project_id,
-            workspace__slug=slug,
-            entity_identifier=pk,
-            entity_type="page",
-        ).delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
@@ -393,7 +401,7 @@ class PageFavoriteViewSet(BaseViewSet):
             entity_identifier=pk,
             entity_type="page",
         )
-        page_favorite.delete(soft=False)
+        page_favorite.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 

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

@@ -599,7 +599,7 @@ class ProjectFavoritesViewSet(BaseViewSet):
             user=request.user,
             workspace__slug=slug,
         )
-        project_favorite.delete(soft=False)
+        project_favorite.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 

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

@@ -52,14 +52,8 @@ class IssueSearchEndpoint(BaseAPIView):
             issue = Issue.issue_objects.get(pk=issue_id)
             issues = issues.filter(
                 ~Q(pk=issue_id),
-                ~Q(
-                    issue_related__issue=issue,
-                    issue_related__deleted_at__isnull=True,
-                ),
-                ~Q(
-                    issue_relation__related_issue=issue,
-                    issue_related__deleted_at__isnull=True,
-                ),
+                ~Q(issue_related__issue=issue),
+                ~Q(issue_relation__related_issue=issue),
             )
         if sub_issue == "true" and issue_id:
             issue = Issue.issue_objects.get(pk=issue_id)

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

@@ -141,13 +141,6 @@ class WorkspaceViewViewSet(BaseViewSet):
             or workspace_view.owned_by == request.user
         ):
             workspace_view.delete()
-            # Delete the user favorite view
-            UserFavorite.objects.filter(
-                workspace__slug=slug,
-                entity_identifier=pk,
-                project__isnull=True,
-                entity_type="view",
-            ).delete()
         else:
             return Response(
                 {"error": "Only admin or owner can delete the view"},
@@ -444,13 +437,6 @@ class IssueViewViewSet(BaseViewSet):
             or project_view.owned_by_id == request.user.id
         ):
             project_view.delete()
-            # Delete the user favorite view
-            UserFavorite.objects.filter(
-                project_id=project_id,
-                workspace__slug=slug,
-                entity_identifier=pk,
-                entity_type="view",
-            ).delete()
         else:
             return Response(
                 {"error": "Only admin or owner can delete the view"},
@@ -488,5 +474,5 @@ class IssueViewFavoriteViewSet(BaseViewSet):
             entity_type="view",
             entity_identifier=view_id,
         )
-        view_favorite.delete(soft=False)
+        view_favorite.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)

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

@@ -1,88 +0,0 @@
-# Third party modules
-from rest_framework import status
-from rest_framework.response import Response
-
-# Django modules
-from django.db.models import Q
-
-# Module imports
-from plane.app.views.base import BaseAPIView
-from plane.db.models import UserFavorite, Workspace
-from plane.app.serializers import UserFavoriteSerializer
-from plane.app.permissions import WorkspaceEntityPermission
-
-
-class WorkspaceFavoriteEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkspaceEntityPermission,
-    ]
-
-    def get(self, request, slug):
-        # the second filter is to check if the user is a member of the project
-        favorites = UserFavorite.objects.filter(
-            user=request.user,
-            workspace__slug=slug,
-            parent__isnull=True,
-        ).filter(
-            Q(project__isnull=True)
-            | (
-                Q(project__isnull=False)
-                & Q(project__project_projectmember__member=request.user)
-                & Q(project__project_projectmember__is_active=True)
-            )
-        )
-        serializer = UserFavoriteSerializer(favorites, many=True)
-        return Response(serializer.data, status=status.HTTP_200_OK)
-
-    def post(self, request, slug):
-        workspace = Workspace.objects.get(slug=slug)
-        serializer = UserFavoriteSerializer(data=request.data)
-        if serializer.is_valid():
-            serializer.save(
-                user_id=request.user.id,
-                workspace=workspace,
-                project_id=request.data.get("project_id", None),
-            )
-            return Response(serializer.data, status=status.HTTP_200_OK)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-    def patch(self, request, slug, favorite_id):
-        favorite = UserFavorite.objects.get(
-            user=request.user, workspace__slug=slug, pk=favorite_id
-        )
-        serializer = UserFavoriteSerializer(
-            favorite, data=request.data, partial=True
-        )
-        if serializer.is_valid():
-            serializer.save()
-            return Response(serializer.data, status=status.HTTP_200_OK)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-    def delete(self, request, slug, favorite_id):
-        favorite = UserFavorite.objects.get(
-            user=request.user, workspace__slug=slug, pk=favorite_id
-        )
-        favorite.delete(soft=False)
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-
-class WorkspaceFavoriteGroupEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkspaceEntityPermission,
-    ]
-
-    def get(self, request, slug, favorite_id):
-        favorites = UserFavorite.objects.filter(
-            user=request.user,
-            workspace__slug=slug,
-            parent_id=favorite_id,
-        ).filter(
-            Q(project__isnull=True)
-            | (
-                Q(project__isnull=False)
-                & Q(project__project_projectmember__member=request.user)
-                & Q(project__project_projectmember__is_active=True)
-            )
-        )
-        serializer = UserFavoriteSerializer(favorites, many=True)
-        return Response(serializer.data, status=status.HTTP_200_OK)

apiserver/plane/bgtasks/deletion_task.py

@@ -1,7 +1,6 @@
 # Django imports
 from django.utils import timezone
 from django.apps import apps
-from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 
 # Third party imports
@@ -16,9 +15,9 @@ def soft_delete_related_objects(
     instance = model_class.all_objects.get(pk=instance_pk)
     related_fields = instance._meta.get_fields()
     for field in related_fields:
-        if field.one_to_many or field.one_to_one:
+        if field.one_to_many or field.one_to_one or field.many_to_many:
             try:
-                if field.one_to_many:
+                if field.one_to_many or field.many_to_many:
                     related_objects = getattr(instance, field.name).all()
                 elif field.one_to_one:
                     related_object = getattr(instance, field.name)
@@ -59,89 +58,88 @@ def hard_delete():
         ModuleIssue,
         CycleIssue,
         Estimate,
-        EstimatePoint,
+        EstimatePoint
     )
 
-    days = settings.HARD_DELETE_AFTER_DAYS
     # check delete workspace
     _ = Workspace.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
+        deleted_at__lt=timezone.now() - timezone.timedelta(days=30)
     ).delete()
 
     # check delete project
     _ = Project.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
+        deleted_at__lt=timezone.now() - timezone.timedelta(days=30)
     ).delete()
 
     # check delete cycle
     _ = Cycle.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
+        deleted_at__lt=timezone.now() - timezone.timedelta(days=30)
     ).delete()
 
     # check delete module
     _ = Module.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
+        deleted_at__lt=timezone.now() - timezone.timedelta(days=30)
     ).delete()
 
     # check delete issue
     _ = Issue.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
+        deleted_at__lt=timezone.now() - timezone.timedelta(days=30)
     ).delete()
 
     # check delete page
     _ = Page.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
+        deleted_at__lt=timezone.now() - timezone.timedelta(days=30)
     ).delete()
 
     # check delete view
     _ = IssueView.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
+        deleted_at__lt=timezone.now() - timezone.timedelta(days=30)
     ).delete()
 
     # check delete label
     _ = Label.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
+        deleted_at__lt=timezone.now() - timezone.timedelta(days=30)
     ).delete()
 
     # check delete state
     _ = State.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
+        deleted_at__lt=timezone.now() - timezone.timedelta(days=30)
     ).delete()
 
     _ = IssueActivity.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
+        deleted_at__lt=timezone.now() - timezone.timedelta(days=30)
     ).delete()
 
     _ = IssueComment.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
+        deleted_at__lt=timezone.now() - timezone.timedelta(days=30)
     ).delete()
 
     _ = IssueLink.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
+        deleted_at__lt=timezone.now() - timezone.timedelta(days=30)
     ).delete()
 
     _ = IssueReaction.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
+        deleted_at__lt=timezone.now() - timezone.timedelta(days=30)
     ).delete()
 
     _ = UserFavorite.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
+        deleted_at__lt=timezone.now() - timezone.timedelta(days=30)
     ).delete()
 
     _ = ModuleIssue.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
+        deleted_at__lt=timezone.now() - timezone.timedelta(days=30)
     ).delete()
 
     _ = CycleIssue.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
+        deleted_at__lt=timezone.now() - timezone.timedelta(days=30)
     ).delete()
 
     _ = Estimate.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
+        deleted_at__lt=timezone.now() - timezone.timedelta(days=30)
     ).delete()
 
     _ = EstimatePoint.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
+        deleted_at__lt=timezone.now() - timezone.timedelta(days=30)
     ).delete()
 
     # at last, check for every thing which ever is left and delete it
@@ -154,8 +152,7 @@ def hard_delete():
         if hasattr(model, "deleted_at"):
             # Get all instances where 'deleted_at' is greater than 30 days ago
             _ = model.all_objects.filter(
-                deleted_at__lt=timezone.now()
-                - timezone.timedelta(days=days)
+                deleted_at__lt=timezone.now() - timezone.timedelta(days=30)
             ).delete()
 
     return

apiserver/plane/bgtasks/issue_activites_task.py

@@ -593,8 +593,7 @@ def create_issue_activity(
         epoch=epoch,
     )
     issue_activity.created_at = issue.created_at
-    issue_activity.actor_id = issue.created_by_id
-    issue_activity.save(update_fields=["created_at", "actor_id"])
+    issue_activity.save(update_fields=["created_at"])
     requested_data = (
         json.loads(requested_data) if requested_data is not None else None
     )
@@ -672,7 +671,6 @@ def delete_issue_activity(
         IssueActivity(
             project_id=project_id,
             workspace_id=workspace_id,
-            issue_id=issue_id,
             comment="deleted the issue",
             verb="deleted",
             actor_id=actor_id,
@@ -880,6 +878,7 @@ def delete_cycle_issue_activity(
     cycle_name = requested_data.get("cycle_name", "")
     cycle = Cycle.objects.filter(pk=cycle_id).first()
     issues = requested_data.get("issues")
+
     for issue in issues:
         current_issue = Issue.objects.filter(pk=issue).first()
         if issue:

apiserver/plane/db/migrations/0073_analyticview_deleted_at_apiactivitylog_deleted_at_and_more.py

@@ -0,0 +1,423 @@
+# Generated by Django 4.2.11 on 2024-07-26 11:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0072_issueattachment_external_id_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='analyticview',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='apiactivitylog',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='apitoken',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='commentreaction',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='cycle',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='cyclefavorite',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='cycleissue',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='cycleuserproperties',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='dashboard',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='dashboardwidget',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='deployboard',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='emailnotificationlog',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='estimate',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='estimatepoint',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='exporterhistory',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='fileasset',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='githubcommentsync',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='githubissuesync',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='githubrepository',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='githubrepositorysync',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='globalview',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='importer',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='inbox',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='inboxissue',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='integration',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='issue',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='issueactivity',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='issueassignee',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='issueattachment',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='issueblocker',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='issuecomment',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='issuelabel',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='issuelink',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='issuemention',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='issuereaction',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='issuerelation',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='issuesequence',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='issuesubscriber',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='issuetype',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='issueuserproperty',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='issueview',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='issueviewfavorite',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='issuevote',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='label',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='module',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='modulefavorite',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='moduleissue',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='modulelink',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='modulemember',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='moduleuserproperties',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='notification',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='page',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='pageblock',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='pagefavorite',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='pagelabel',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='pagelog',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='pageversion',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='projectdeployboard',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='projectfavorite',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='projectidentifier',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='projectmember',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='projectmemberinvite',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='projectpage',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='projectpublicmember',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='slackprojectsync',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='socialloginconnection',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='state',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='team',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='teammember',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='teampage',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='userfavorite',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='usernotificationpreference',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='userrecentvisit',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='webhook',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='webhooklog',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='workspace',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='workspaceintegration',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='workspacemember',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='workspacememberinvite',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='workspacetheme',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+        migrations.AddField(
+            model_name='workspaceuserproperties',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
+        ),
+    ]

apiserver/plane/db/models/cycle.py

@@ -161,14 +161,7 @@ class CycleUserProperties(ProjectBaseModel):
     )
 
     class Meta:
-        unique_together = ["cycle", "user", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["cycle", "user"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="cycle_user_properties_unique_cycle_user_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["cycle", "user"]
         verbose_name = "Cycle User Property"
         verbose_name_plural = "Cycle User Properties"
         db_table = "cycle_user_properties"

apiserver/plane/db/models/dashboard.py

@@ -88,14 +88,7 @@ class DashboardWidget(BaseModel):
         return f"{self.dashboard.name} {self.widget.key}"
 
     class Meta:
-        unique_together = ("widget", "dashboard", "deleted_at")
-        constraints = [
-            models.UniqueConstraint(
-                fields=["widget", "dashboard"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="dashboard_widget_unique_widget_dashboard_when_deleted_at_null",
-            )
-        ]
+        unique_together = ("widget", "dashboard")
         verbose_name = "Dashboard Widget"
         verbose_name_plural = "Dashboard Widgets"
         db_table = "dashboard_widgets"

apiserver/plane/db/models/deploy_board.py

@@ -46,14 +46,7 @@ class DeployBoard(WorkspaceBaseModel):
         return f"{self.entity_identifier} <{self.entity_name}>"
 
     class Meta:
-        unique_together = ["entity_name", "entity_identifier", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["entity_name", "entity_identifier"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="deploy_board_unique_entity_name_entity_identifier_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["entity_name", "entity_identifier"]
         verbose_name = "Deploy Board"
         verbose_name_plural = "Deploy Boards"
         db_table = "deploy_boards"

apiserver/plane/db/models/estimate.py

@@ -1,7 +1,6 @@
 # Django imports
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
-from django.db.models import Q
 
 # Module imports
 from .project import ProjectBaseModel
@@ -20,14 +19,7 @@ class Estimate(ProjectBaseModel):
         return f"{self.name} <{self.project.name}>"
 
     class Meta:
-        unique_together = ["name", "project", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "project"],
-                condition=Q(deleted_at__isnull=True),
-                name="estimate_unique_name_project_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["name", "project"]
         verbose_name = "Estimate"
         verbose_name_plural = "Estimates"
         db_table = "estimates"

apiserver/plane/db/models/favorite.py

@@ -31,14 +31,7 @@ class UserFavorite(WorkspaceBaseModel):
     )
 
     class Meta:
-        unique_together = ["entity_type", "user", "entity_identifier", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["entity_type", "entity_identifier", "user"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="user_favorite_unique_entity_type_entity_identifier_user_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["entity_type", "user", "entity_identifier"]
         verbose_name = "User Favorite"
         verbose_name_plural = "User Favorites"
         db_table = "user_favorites"
@@ -46,14 +39,9 @@ class UserFavorite(WorkspaceBaseModel):
 
     def save(self, *args, **kwargs):
         if self._state.adding:
-            if self.project:
-                largest_sequence = UserFavorite.objects.filter(
-                    workspace=self.project.workspace
-                ).aggregate(largest=models.Max("sequence"))["largest"]
-            else:
-                largest_sequence = UserFavorite.objects.filter(
-                    workspace=self.workspace,
-                ).aggregate(largest=models.Max("sequence"))["largest"]
+            largest_sequence = UserFavorite.objects.filter(
+                workspace=self.project.workspace
+            ).aggregate(largest=models.Max("sequence"))["largest"]
             if largest_sequence is not None:
                 self.sequence = largest_sequence + 10000
 

apiserver/plane/db/models/inbox.py

@@ -19,14 +19,7 @@ class Inbox(ProjectBaseModel):
         return f"{self.name} <{self.project.name}>"
 
     class Meta:
-        unique_together = ["name", "project", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "project"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="inbox_unique_name_project_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["name", "project"]
         verbose_name = "Inbox"
         verbose_name_plural = "Inboxes"
         db_table = "inboxes"

apiserver/plane/db/models/issue.py

@@ -8,7 +8,6 @@ from django.core.exceptions import ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models, transaction
 from django.utils import timezone
-from django.db.models import Q
 
 # Module imports
 from plane.utils.html_processor import strip_tags
@@ -295,14 +294,7 @@ class IssueRelation(ProjectBaseModel):
     )
 
     class Meta:
-        unique_together = ["issue", "related_issue", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["issue", "related_issue"],
-                condition=Q(deleted_at__isnull=True),
-                name="issue_relation_unique_issue_related_issue_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["issue", "related_issue"]
         verbose_name = "Issue Relation"
         verbose_name_plural = "Issue Relations"
         db_table = "issue_relations"
@@ -323,14 +315,7 @@ class IssueMention(ProjectBaseModel):
     )
 
     class Meta:
-        unique_together = ["issue", "mention", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["issue", "mention"],
-                condition=Q(deleted_at__isnull=True),
-                name="issue_mention_unique_issue_mention_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["issue", "mention"]
         verbose_name = "Issue Mention"
         verbose_name_plural = "Issue Mentions"
         db_table = "issue_mentions"
@@ -351,14 +336,7 @@ class IssueAssignee(ProjectBaseModel):
     )
 
     class Meta:
-        unique_together = ["issue", "assignee", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["issue", "assignee"],
-                condition=Q(deleted_at__isnull=True),
-                name="issue_assignee_unique_issue_assignee_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["issue", "assignee"]
         verbose_name = "Issue Assignee"
         verbose_name_plural = "Issue Assignees"
         db_table = "issue_assignees"
@@ -533,14 +511,7 @@ class IssueUserProperty(ProjectBaseModel):
         verbose_name_plural = "Issue User Properties"
         db_table = "issue_user_properties"
         ordering = ("-created_at",)
-        unique_together = ["user", "project", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["user", "project"],
-                condition=Q(deleted_at__isnull=True),
-                name="issue_user_property_unique_user_project_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["user", "project"]
 
     def __str__(self):
         """Return properties status of the issue"""
@@ -563,14 +534,7 @@ class Label(ProjectBaseModel):
     external_id = models.CharField(max_length=255, blank=True, null=True)
 
     class Meta:
-        unique_together = ["name", "project", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "project"],
-                condition=Q(deleted_at__isnull=True),
-                name="label_unique_name_project_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["name", "project"]
         verbose_name = "Label"
         verbose_name_plural = "Labels"
         db_table = "labels"
@@ -638,14 +602,7 @@ class IssueSubscriber(ProjectBaseModel):
     )
 
     class Meta:
-        unique_together = ["issue", "subscriber", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["issue", "subscriber"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="issue_subscriber_unique_issue_subscriber_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["issue", "subscriber"]
         verbose_name = "Issue Subscriber"
         verbose_name_plural = "Issue Subscribers"
         db_table = "issue_subscribers"
@@ -667,14 +624,7 @@ class IssueReaction(ProjectBaseModel):
     reaction = models.CharField(max_length=20)
 
     class Meta:
-        unique_together = ["issue", "actor", "reaction", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["issue", "actor", "reaction"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="issue_reaction_unique_issue_actor_reaction_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["issue", "actor", "reaction"]
         verbose_name = "Issue Reaction"
         verbose_name_plural = "Issue Reactions"
         db_table = "issue_reactions"
@@ -698,14 +648,7 @@ class CommentReaction(ProjectBaseModel):
     reaction = models.CharField(max_length=20)
 
     class Meta:
-        unique_together = ["comment", "actor", "reaction", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["comment", "actor", "reaction"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="comment_reaction_unique_comment_actor_reaction_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["comment", "actor", "reaction"]
         verbose_name = "Comment Reaction"
         verbose_name_plural = "Comment Reactions"
         db_table = "comment_reactions"
@@ -736,14 +679,6 @@ class IssueVote(ProjectBaseModel):
         unique_together = [
             "issue",
             "actor",
-            "deleted_at",
-        ]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["issue", "actor"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="issue_vote_unique_issue_actor_when_deleted_at_null",
-            )
         ]
         verbose_name = "Issue Vote"
         verbose_name_plural = "Issue Votes"

apiserver/plane/db/models/issue_type.py

@@ -1,6 +1,5 @@
 # Django imports
 from django.db import models
-from django.db.models import Q
 
 # Module imports
 from .workspace import WorkspaceBaseModel
@@ -16,14 +15,7 @@ class IssueType(WorkspaceBaseModel):
     is_active = models.BooleanField(default=True)
 
     class Meta:
-        unique_together = ["project", "name", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "project"],
-                condition=Q(deleted_at__isnull=True),
-                name="issue_type_unique_name_project_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["project", "name"]
         verbose_name = "Issue Type"
         verbose_name_plural = "Issue Types"
         db_table = "issue_types"

apiserver/plane/db/models/module.py

@@ -1,7 +1,6 @@
 # Django imports
 from django.conf import settings
 from django.db import models
-from django.db.models import Q
 
 # Module imports
 from .project import ProjectBaseModel
@@ -97,14 +96,7 @@ class Module(ProjectBaseModel):
     logo_props = models.JSONField(default=dict)
 
     class Meta:
-        unique_together = ["name", "project", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=['name', 'project'],
-                condition=Q(deleted_at__isnull=True),
-                name='module_unique_name_project_when_deleted_at_null'
-            )
-        ]
+        unique_together = ["name", "project"]
         verbose_name = "Module"
         verbose_name_plural = "Modules"
         db_table = "modules"
@@ -130,14 +122,7 @@ class ModuleMember(ProjectBaseModel):
     member = models.ForeignKey("db.User", on_delete=models.CASCADE)
 
     class Meta:
-        unique_together = ["module", "member", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["module", "member"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="module_member_unique_module_member_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["module", "member"]
         verbose_name = "Module Member"
         verbose_name_plural = "Module Members"
         db_table = "module_members"
@@ -156,14 +141,7 @@ class ModuleIssue(ProjectBaseModel):
     )
 
     class Meta:
-        unique_together = ["issue", "module", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["issue", "module"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="module_issue_unique_issue_module_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["issue", "module"]
         verbose_name = "Module Issue"
         verbose_name_plural = "Module Issues"
         db_table = "module_issues"
@@ -236,14 +214,7 @@ class ModuleUserProperties(ProjectBaseModel):
     )
 
     class Meta:
-        unique_together = ["module", "user", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["module", "user"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="module_user_properties_unique_module_user_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["module", "user"]
         verbose_name = "Module User Property"
         verbose_name_plural = "Module User Property"
         db_table = "module_user_properties"

apiserver/plane/db/models/page.py

@@ -234,14 +234,7 @@ class ProjectPage(BaseModel):
     )
 
     class Meta:
-        unique_together = ["project", "page", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["project", "page"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="project_page_unique_project_page_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["project", "page"]
         verbose_name = "Project Page"
         verbose_name_plural = "Project Pages"
         db_table = "project_pages"
@@ -263,14 +256,7 @@ class TeamPage(BaseModel):
     )
 
     class Meta:
-        unique_together = ["team", "page", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["team", "page"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="team_page_unique_team_page_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["team", "page"]
         verbose_name = "Team Page"
         verbose_name_plural = "Team Pages"
         db_table = "team_pages"

apiserver/plane/db/models/project.py

@@ -5,7 +5,6 @@ from uuid import uuid4
 from django.conf import settings
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
-from django.db.models import Q
 
 # Modeule imports
 from plane.db.mixins import AuditModel
@@ -125,22 +124,7 @@ class Project(BaseModel):
         return f"{self.name} <{self.workspace.name}>"
 
     class Meta:
-        unique_together = [
-            ["identifier", "workspace", "deleted_at"],
-            ["name", "workspace", "deleted_at"],
-        ]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["identifier", "workspace"],
-                condition=Q(deleted_at__isnull=True),
-                name="project_unique_identifier_workspace_when_deleted_at_null",
-            ),
-            models.UniqueConstraint(
-                fields=["name", "workspace"],
-                condition=Q(deleted_at__isnull=True),
-                name="project_unique_name_workspace_when_deleted_at_null",
-            ),
-        ]
+        unique_together = [["identifier", "workspace"], ["name", "workspace"]]
         verbose_name = "Project"
         verbose_name_plural = "Projects"
         db_table = "projects"
@@ -214,14 +198,7 @@ class ProjectMember(ProjectBaseModel):
         super(ProjectMember, self).save(*args, **kwargs)
 
     class Meta:
-        unique_together = ["project", "member", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["project", "member"],
-                condition=Q(deleted_at__isnull=True),
-                name="project_member_unique_project_member_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["project", "member"]
         verbose_name = "Project Member"
         verbose_name_plural = "Project Members"
         db_table = "project_members"
@@ -246,14 +223,7 @@ class ProjectIdentifier(AuditModel):
     name = models.CharField(max_length=12, db_index=True)
 
     class Meta:
-        unique_together = ["name", "workspace", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "workspace"],
-                condition=Q(deleted_at__isnull=True),
-                name="unique_name_workspace_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["name", "workspace"]
         verbose_name = "Project Identifier"
         verbose_name_plural = "Project Identifiers"
         db_table = "project_identifiers"
@@ -331,14 +301,7 @@ class ProjectPublicMember(ProjectBaseModel):
     )
 
     class Meta:
-        unique_together = ["project", "member", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["project", "member"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="project_public_member_unique_project_member_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["project", "member"]
         verbose_name = "Project Public Member"
         verbose_name_plural = "Project Public Members"
         db_table = "project_public_members"

apiserver/plane/db/models/state.py

@@ -1,7 +1,6 @@
 # Django imports
 from django.db import models
 from django.template.defaultfilters import slugify
-from django.db.models import Q
 
 # Module imports
 from .project import ProjectBaseModel
@@ -37,14 +36,7 @@ class State(ProjectBaseModel):
         return f"{self.name} <{self.project.name}>"
 
     class Meta:
-        unique_together = ["name", "project", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "project"],
-                condition=Q(deleted_at__isnull=True),
-                name="state_unique_name_project_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["name", "project"]
         verbose_name = "State"
         verbose_name_plural = "States"
         db_table = "states"

apiserver/plane/db/models/workspace.py

@@ -185,14 +185,7 @@ class WorkspaceMember(BaseModel):
     is_active = models.BooleanField(default=True)
 
     class Meta:
-        unique_together = ["workspace", "member", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["workspace", "member"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="workspace_member_unique_workspace_member_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["workspace", "member"]
         verbose_name = "Workspace Member"
         verbose_name_plural = "Workspace Members"
         db_table = "workspace_members"
@@ -217,14 +210,7 @@ class WorkspaceMemberInvite(BaseModel):
     role = models.PositiveSmallIntegerField(choices=ROLE_CHOICES, default=10)
 
     class Meta:
-        unique_together = ["email", "workspace", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["email", "workspace"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="workspace_member_invite_unique_email_workspace_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["email", "workspace"]
         verbose_name = "Workspace Member Invite"
         verbose_name_plural = "Workspace Member Invites"
         db_table = "workspace_member_invites"
@@ -254,14 +240,7 @@ class Team(BaseModel):
         return f"{self.name} <{self.workspace.name}>"
 
     class Meta:
-        unique_together = ["name", "workspace", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "workspace"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="team_unique_name_workspace_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["name", "workspace"]
         verbose_name = "Team"
         verbose_name_plural = "Teams"
         db_table = "teams"
@@ -285,14 +264,7 @@ class TeamMember(BaseModel):
         return self.team.name
 
     class Meta:
-        unique_together = ["team", "member", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["team", "member"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="team_member_unique_team_member_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["team", "member"]
         verbose_name = "Team Member"
         verbose_name_plural = "Team Members"
         db_table = "team_members"
@@ -315,14 +287,7 @@ class WorkspaceTheme(BaseModel):
         return str(self.name) + str(self.actor.email)
 
     class Meta:
-        unique_together = ["workspace", "name", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["workspace", "name"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="workspace_theme_unique_workspace_name_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["workspace", "name"]
         verbose_name = "Workspace Theme"
         verbose_name_plural = "Workspace Themes"
         db_table = "workspace_themes"
@@ -347,14 +312,7 @@ class WorkspaceUserProperties(BaseModel):
     )
 
     class Meta:
-        unique_together = ["workspace", "user", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["workspace", "user"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="workspace_user_properties_unique_workspace_user_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["workspace", "user"]
         verbose_name = "Workspace User Property"
         verbose_name_plural = "Workspace User Property"
         db_table = "workspace_user_properties"

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

@@ -66,8 +66,6 @@ class InstanceEndpoint(BaseAPIView):
             POSTHOG_HOST,
             UNSPLASH_ACCESS_KEY,
             OPENAI_API_KEY,
-            IS_INTERCOM_ENABLED,
-            INTERCOM_APP_ID,
         ) = get_configuration_value(
             [
                 {
@@ -118,15 +116,6 @@ class InstanceEndpoint(BaseAPIView):
                     "key": "OPENAI_API_KEY",
                     "default": os.environ.get("OPENAI_API_KEY", ""),
                 },
-                # Intercom settings
-                {
-                    "key": "IS_INTERCOM_ENABLED",
-                    "default": os.environ.get("IS_INTERCOM_ENABLED", "1"),
-                },
-                {
-                    "key": "INTERCOM_APP_ID",
-                    "default": os.environ.get("INTERCOM_APP_ID", ""),
-                },
             ]
         )
 
@@ -162,10 +151,6 @@ class InstanceEndpoint(BaseAPIView):
         # is smtp configured
         data["is_smtp_configured"] = bool(EMAIL_HOST)
 
-        # Intercom settings
-        data["is_intercom_enabled"] = IS_INTERCOM_ENABLED == "1"
-        data["intercom_app_id"] = INTERCOM_APP_ID
-
         # Base URL
         data["admin_base_url"] = settings.ADMIN_BASE_URL
         data["space_base_url"] = settings.SPACE_BASE_URL

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

@@ -143,19 +143,6 @@ class Command(BaseCommand):
                 "category": "UNSPLASH",
                 "is_encrypted": True,
             },
-            # intercom settings
-            {
-                "key": "IS_INTERCOM_ENABLED",
-                "value": os.environ.get("IS_INTERCOM_ENABLED", "1"),
-                "category": "INTERCOM",
-                "is_encrypted": False,
-            },
-            {
-                "key": "INTERCOM_APP_ID",
-                "value": os.environ.get("INTERCOM_APP_ID", ""),
-                "category": "INTERCOM",
-                "is_encrypted": False,
-            },
         ]
 
         for item in config_keys:
@@ -278,11 +265,7 @@ class Command(BaseCommand):
                             ]
                         )
                     )
-                    if (
-                        bool(GITLAB_HOST)
-                        and bool(GITLAB_CLIENT_ID)
-                        and bool(GITLAB_CLIENT_SECRET)
-                    ):
+                    if bool(GITLAB_HOST) and bool(GITLAB_CLIENT_ID) and bool(GITLAB_CLIENT_SECRET):
                         value = "1"
                     else:
                         value = "0"

apiserver/plane/settings/common.py

@@ -355,5 +355,3 @@ CSRF_FAILURE_VIEW = "plane.authentication.views.common.csrf_failure"
 ADMIN_BASE_URL = os.environ.get("ADMIN_BASE_URL", None)
 SPACE_BASE_URL = os.environ.get("SPACE_BASE_URL", None)
 APP_BASE_URL = os.environ.get("APP_BASE_URL")
-
-HARD_DELETE_AFTER_DAYS = int(os.environ.get("HARD_DELETE_AFTER_DAYS", 60))

apiserver/plane/space/views/project.py

@@ -69,7 +69,7 @@ class WorkspaceProjectAnchorEndpoint(BaseAPIView):
 
     def get(self, request, slug, project_id):
         project_deploy_board = DeployBoard.objects.get(
-            workspace__slug=slug, project_id=project_id, entity_name="project"
+            workspace__slug=slug, project_id=project_id
         )
         serializer = DeployBoardSerializer(project_deploy_board)
         return Response(serializer.data, status=status.HTTP_200_OK)

apiserver/plane/utils/constants.py

@@ -27,9 +27,4 @@ RESTRICTED_WORKSPACE_SLUGS = [
     "channels",
     "upgrade",
     "billing",
-    "sign-in",
-    "sign-up",
-    "signin",
-    "signup",
-    "config",
 ]

package.json

@@ -34,7 +34,7 @@
     "prettier": "latest",
     "prettier-plugin-tailwindcss": "^0.5.4",
     "tailwindcss": "^3.3.3",
-    "turbo": "^2.0.11"
+    "turbo": "^2.0.9"
   },
   "resolutions": {
     "@types/react": "18.2.48"

packages/editor/src/core/components/editors/document/editor.tsx

@@ -78,11 +78,10 @@ const DocumentEditor = (props: IDocumentEditor) => {
 
   return (
     <PageRenderer
+      tabIndex={tabIndex}
       editor={editor}
       editorContainerClassName={editorContainerClassNames}
       hideDragHandle={hideDragHandleOnMouseLeave}
-      id={id}
-      tabIndex={tabIndex}
     />
   );
 };

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

@@ -21,12 +21,11 @@ type IPageRenderer = {
   editor: Editor;
   editorContainerClassName: string;
   hideDragHandle?: () => void;
-  id: string;
   tabIndex?: number;
 };
 
 export const PageRenderer = (props: IPageRenderer) => {
-  const { editor, editorContainerClassName, hideDragHandle, id, tabIndex } = props;
+  const { tabIndex, editor, hideDragHandle, editorContainerClassName } = props;
   // states
   const [linkViewProps, setLinkViewProps] = useState<LinkViewProps>();
   const [isOpen, setIsOpen] = useState(false);
@@ -131,11 +130,10 @@ export const PageRenderer = (props: IPageRenderer) => {
       <div className="frame-renderer flex-grow w-full -mx-5" onMouseOver={handleLinkHover}>
         <EditorContainer
           editor={editor}
-          editorContainerClassName={editorContainerClassName}
           hideDragHandle={hideDragHandle}
-          id={id}
+          editorContainerClassName={editorContainerClassName}
         >
-          <EditorContentWrapper editor={editor} id={id} tabIndex={tabIndex} />
+          <EditorContentWrapper tabIndex={tabIndex} editor={editor} />
           {editor && editor.isEditable && <BlockMenu editor={editor} />}
         </EditorContainer>
       </div>

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

@@ -13,7 +13,6 @@ import { TEmbedConfig } from "@/plane-editor/types";
 import { EditorReadOnlyRefApi, IMentionHighlight } from "@/types";
 
 interface IDocumentReadOnlyEditor {
-  id: string;
   initialValue: string;
   containerClassName: string;
   editorClassName?: string;
@@ -31,7 +30,6 @@ const DocumentReadOnlyEditor = (props: IDocumentReadOnlyEditor) => {
     containerClassName,
     editorClassName = "",
     embedHandler,
-    id,
     initialValue,
     forwardedRef,
     tabIndex,
@@ -60,9 +58,7 @@ const DocumentReadOnlyEditor = (props: IDocumentReadOnlyEditor) => {
     containerClassName,
   });
 
-  return (
-    <PageRenderer editor={editor} editorContainerClassName={editorContainerClassName} id={id} tabIndex={tabIndex} />
-  );
+  return <PageRenderer tabIndex={tabIndex} editor={editor} editorContainerClassName={editorContainerClassName} />;
 };
 
 const DocumentReadOnlyEditorWithRef = forwardRef<EditorReadOnlyRefApi, IDocumentReadOnlyEditor>((props, ref) => (

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

@@ -4,15 +4,14 @@ import { Editor } from "@tiptap/react";
 import { cn } from "@/helpers/common";
 
 interface EditorContainerProps {
-  children: ReactNode;
   editor: Editor | null;
   editorContainerClassName: string;
+  children: ReactNode;
   hideDragHandle?: () => void;
-  id: string;
 }
 
 export const EditorContainer: FC<EditorContainerProps> = (props) => {
-  const { children, editor, editorContainerClassName, hideDragHandle, id } = props;
+  const { editor, editorContainerClassName, hideDragHandle, children } = props;
 
   const handleContainerClick = () => {
     if (!editor) return;
@@ -55,7 +54,7 @@ export const EditorContainer: FC<EditorContainerProps> = (props) => {
 
   return (
     <div
-      id={`editor-container-${id}`}
+      id="editor-container"
       onClick={handleContainerClick}
       onMouseLeave={hideDragHandle}
       className={cn(

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

@@ -4,19 +4,18 @@ import { Editor, EditorContent } from "@tiptap/react";
 import { ImageResizer } from "@/extensions/image";
 
 interface EditorContentProps {
-  children?: ReactNode;
   editor: Editor | null;
-  id: string;
+  children?: ReactNode;
   tabIndex?: number;
 }
 
 export const EditorContentWrapper: FC<EditorContentProps> = (props) => {
-  const { editor, children, id, tabIndex } = props;
+  const { editor, tabIndex, children } = 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} />}
+      {editor?.isActive("image") && editor?.isEditable && <ImageResizer editor={editor} />}
       {children}
     </div>
   );

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

@@ -21,7 +21,7 @@ export const EditorWrapper: React.FC<Props> = (props) => {
     editorClassName = "",
     extensions,
     hideDragHandleOnMouseLeave,
-    id,
+    id = "",
     initialValue,
     fileHandler,
     forwardedRef,
@@ -57,14 +57,13 @@ export const EditorWrapper: React.FC<Props> = (props) => {
 
   return (
     <EditorContainer
+      hideDragHandle={hideDragHandleOnMouseLeave}
       editor={editor}
       editorContainerClassName={editorContainerClassName}
-      id={id}
-      hideDragHandle={hideDragHandleOnMouseLeave}
     >
       {children?.(editor)}
       <div className="flex flex-col">
-        <EditorContentWrapper editor={editor} id={id} tabIndex={tabIndex} />
+        <EditorContentWrapper tabIndex={tabIndex} editor={editor} />
       </div>
     </EditorContainer>
   );

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

@@ -8,7 +8,7 @@ import { useReadOnlyEditor } from "@/hooks/use-read-only-editor";
 import { IReadOnlyEditorProps } from "@/types";
 
 export const ReadOnlyEditorWrapper = (props: IReadOnlyEditorProps) => {
-  const { containerClassName, editorClassName = "", id, initialValue, forwardedRef, mentionHandler } = props;
+  const { containerClassName, editorClassName = "", initialValue, forwardedRef, mentionHandler } = props;
 
   const editor = useReadOnlyEditor({
     initialValue,
@@ -24,9 +24,9 @@ export const ReadOnlyEditorWrapper = (props: IReadOnlyEditorProps) => {
   if (!editor) return null;
 
   return (
-    <EditorContainer editor={editor} editorContainerClassName={editorContainerClassName} id={id}>
+    <EditorContainer editor={editor} editorContainerClassName={editorContainerClassName}>
       <div className="flex flex-col">
-        <EditorContentWrapper editor={editor} id={id} />
+        <EditorContentWrapper editor={editor} />
       </div>
     </EditorContainer>
   );

packages/editor/src/core/extensions/drag-drop.tsx

@@ -28,18 +28,17 @@ export const DragAndDrop = (setHideDragHandle?: (hideDragHandlerFromDragDrop: ()
     },
   });
 
-const createDragHandleElement = (): HTMLElement => {
-  const dragHandleElement = document.createElement("button");
-  dragHandleElement.type = "button";
+function createDragHandleElement(): HTMLElement {
+  const dragHandleElement = document.createElement("div");
   dragHandleElement.draggable = true;
   dragHandleElement.dataset.dragHandle = "";
   dragHandleElement.classList.add("drag-handle");
 
-  const dragHandleContainer = document.createElement("span");
+  const dragHandleContainer = document.createElement("div");
   dragHandleContainer.classList.add("drag-handle-container");
   dragHandleElement.appendChild(dragHandleContainer);
 
-  const dotsContainer = document.createElement("span");
+  const dotsContainer = document.createElement("div");
   dotsContainer.classList.add("drag-handle-dots");
 
   for (let i = 0; i < 6; i++) {
@@ -51,9 +50,9 @@ const createDragHandleElement = (): HTMLElement => {
   dragHandleContainer.appendChild(dotsContainer);
 
   return dragHandleElement;
-};
+}
 
-const absoluteRect = (node: Element) => {
+function absoluteRect(node: Element) {
   const data = node.getBoundingClientRect();
 
   return {
@@ -61,9 +60,9 @@ const absoluteRect = (node: Element) => {
     left: data.left,
     width: data.width,
   };
-};
+}
 
-const nodeDOMAtCoords = (coords: { x: number; y: number }) => {
+function nodeDOMAtCoords(coords: { x: number; y: number }) {
   const elements = document.elementsFromPoint(coords.x, coords.y);
   const generalSelectors = [
     "li",
@@ -74,7 +73,6 @@ const nodeDOMAtCoords = (coords: { x: number; y: number }) => {
     "h1, h2, h3, h4, h5, h6",
     "[data-type=horizontalRule]",
     ".table-wrapper",
-    ".issue-embed",
   ].join(", ");
 
   for (const elem of elements) {
@@ -96,27 +94,27 @@ const nodeDOMAtCoords = (coords: { x: number; y: number }) => {
     }
   }
   return null;
-};
+}
 
-const nodePosAtDOM = (node: Element, view: EditorView, options: DragHandleOptions) => {
+function nodePosAtDOM(node: Element, view: EditorView, options: DragHandleOptions) {
   const boundingRect = node.getBoundingClientRect();
 
   return view.posAtCoords({
     left: boundingRect.left + 50 + options.dragHandleWidth,
     top: boundingRect.top + 1,
   })?.inside;
-};
+}
 
-const nodePosAtDOMForBlockQuotes = (node: Element, view: EditorView) => {
+function nodePosAtDOMForBlockquotes(node: Element, view: EditorView) {
   const boundingRect = node.getBoundingClientRect();
 
   return view.posAtCoords({
     left: boundingRect.left + 1,
     top: boundingRect.top + 1,
   })?.inside;
-};
+}
 
-const calcNodePos = (pos: number, view: EditorView, node: Element) => {
+function calcNodePos(pos: number, view: EditorView, node: Element) {
   const maxPos = view.state.doc.content.size;
   const safePos = Math.max(0, Math.min(pos, maxPos));
   const $pos = view.state.doc.resolve(safePos);
@@ -130,11 +128,11 @@ const calcNodePos = (pos: number, view: EditorView, node: Element) => {
   }
 
   return safePos;
-};
+}
 
-const DragHandle = (options: DragHandleOptions) => {
+function DragHandle(options: DragHandleOptions) {
   let listType = "";
-  const handleDragStart = (event: DragEvent, view: EditorView) => {
+  function handleDragStart(event: DragEvent, view: EditorView) {
     view.focus();
 
     if (!event.dataTransfer) return;
@@ -161,7 +159,6 @@ const DragHandle = (options: DragHandleOptions) => {
     // Check if nodePos points to the top level node
     if (nodePos.node().type.name === "doc") differentNodeSelected = true;
     else {
-      // TODO FIX ERROR
       const nodeSelection = NodeSelection.create(view.state.doc, nodePos.before());
       // Check if the node where the drag event started is part of the current selection
       differentNodeSelected = !(
@@ -174,7 +171,6 @@ const DragHandle = (options: DragHandleOptions) => {
       const multiNodeSelection = TextSelection.create(view.state.doc, draggedNodePos, endSelection.$to.pos);
       view.dispatch(view.state.tr.setSelection(multiNodeSelection));
     } else {
-      // TODO FIX ERROR
       const nodeSelection = NodeSelection.create(view.state.doc, draggedNodePos);
       view.dispatch(view.state.tr.setSelection(nodeSelection));
     }
@@ -185,15 +181,14 @@ const DragHandle = (options: DragHandleOptions) => {
     }
 
     if (node.matches("blockquote")) {
-      let nodePosForBlockQuotes = nodePosAtDOMForBlockQuotes(node, view);
-      if (nodePosForBlockQuotes === null || nodePosForBlockQuotes === undefined) return;
+      let nodePosForBlockquotes = nodePosAtDOMForBlockquotes(node, view);
+      if (nodePosForBlockquotes === null || nodePosForBlockquotes === undefined) return;
 
       const docSize = view.state.doc.content.size;
-      nodePosForBlockQuotes = Math.max(0, Math.min(nodePosForBlockQuotes, docSize));
+      nodePosForBlockquotes = Math.max(0, Math.min(nodePosForBlockquotes, docSize));
 
-      if (nodePosForBlockQuotes >= 0 && nodePosForBlockQuotes <= docSize) {
-        // TODO FIX ERROR
-        const nodeSelection = NodeSelection.create(view.state.doc, nodePosForBlockQuotes);
+      if (nodePosForBlockquotes >= 0 && nodePosForBlockquotes <= docSize) {
+        const nodeSelection = NodeSelection.create(view.state.doc, nodePosForBlockquotes);
         view.dispatch(view.state.tr.setSelection(nodeSelection));
       }
     }
@@ -209,9 +204,9 @@ const DragHandle = (options: DragHandleOptions) => {
     event.dataTransfer.setDragImage(node, 0, 0);
 
     view.dragging = { slice, move: event.ctrlKey };
-  };
+  }
 
-  const handleClick = (event: MouseEvent, view: EditorView) => {
+  function handleClick(event: MouseEvent, view: EditorView) {
     view.focus();
 
     const node = nodeDOMAtCoords({
@@ -222,14 +217,13 @@ const DragHandle = (options: DragHandleOptions) => {
     if (!(node instanceof Element)) return;
 
     if (node.matches("blockquote")) {
-      let nodePosForBlockquotes = nodePosAtDOMForBlockQuotes(node, view);
+      let nodePosForBlockquotes = nodePosAtDOMForBlockquotes(node, view);
       if (nodePosForBlockquotes === null || nodePosForBlockquotes === undefined) return;
 
       const docSize = view.state.doc.content.size;
       nodePosForBlockquotes = Math.max(0, Math.min(nodePosForBlockquotes, docSize));
 
       if (nodePosForBlockquotes >= 0 && nodePosForBlockquotes <= docSize) {
-        // TODO FIX ERROR
         const nodeSelection = NodeSelection.create(view.state.doc, nodePosForBlockquotes);
         view.dispatch(view.state.tr.setSelection(nodeSelection));
       }
@@ -243,18 +237,26 @@ const DragHandle = (options: DragHandleOptions) => {
     // Adjust the nodePos to point to the start of the node, ensuring NodeSelection can be applied
     nodePos = calcNodePos(nodePos, view, node);
 
-    // TODO FIX ERROR
     // Use NodeSelection to select the node at the calculated position
     const nodeSelection = NodeSelection.create(view.state.doc, nodePos);
 
     // Dispatch the transaction to update the selection
     view.dispatch(view.state.tr.setSelection(nodeSelection));
-  };
+  }
 
   let dragHandleElement: HTMLElement | null = null;
-  // drag handle view actions
-  const hideDragHandle = () => dragHandleElement?.classList.add("drag-handle-hidden");
-  const showDragHandle = () => dragHandleElement?.classList.remove("drag-handle-hidden");
+
+  function hideDragHandle() {
+    if (dragHandleElement) {
+      dragHandleElement.classList.add("hidden");
+    }
+  }
+
+  function showDragHandle() {
+    if (dragHandleElement) {
+      dragHandleElement.classList.remove("hidden");
+    }
+  }
 
   options.setHideDragHandle?.(hideDragHandle);
 
@@ -262,18 +264,24 @@ const DragHandle = (options: DragHandleOptions) => {
     key: new PluginKey("dragHandle"),
     view: (view) => {
       dragHandleElement = createDragHandleElement();
-      dragHandleElement.addEventListener("dragstart", (e) => handleDragStart(e, view));
-      dragHandleElement.addEventListener("click", (e) => handleClick(e, view));
-      dragHandleElement.addEventListener("contextmenu", (e) => handleClick(e, view));
+      dragHandleElement.addEventListener("dragstart", (e) => {
+        handleDragStart(e, view);
+      });
+      dragHandleElement.addEventListener("click", (e) => {
+        handleClick(e, view);
+      });
+      dragHandleElement.addEventListener("contextmenu", (e) => {
+        handleClick(e, view);
+      });
 
       dragHandleElement.addEventListener("drag", (e) => {
         hideDragHandle();
-        const frameRenderer = document.querySelector(".frame-renderer");
-        if (!frameRenderer) return;
+        const a = document.querySelector(".frame-renderer");
+        if (!a) return;
         if (e.clientY < options.scrollThreshold.up) {
-          frameRenderer.scrollBy({ top: -70, behavior: "smooth" });
+          a.scrollBy({ top: -70, behavior: "smooth" });
         } else if (window.innerHeight - e.clientY < options.scrollThreshold.down) {
-          frameRenderer.scrollBy({ top: 70, behavior: "smooth" });
+          a.scrollBy({ top: 70, behavior: "smooth" });
         }
       });
 
@@ -291,7 +299,9 @@ const DragHandle = (options: DragHandleOptions) => {
     props: {
       handleDOMEvents: {
         mousemove: (view, event) => {
-          if (!view.editable) return;
+          if (!view.editable) {
+            return;
+          }
 
           const node = nodeDOMAtCoords({
             x: event.clientX + 50 + options.dragHandleWidth,
@@ -401,4 +411,4 @@ const DragHandle = (options: DragHandleOptions) => {
       },
     },
   });
-};
+}

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

@@ -73,7 +73,8 @@ export const CoreEditorExtensions = ({
     horizontalRule: false,
     blockquote: false,
     dropcursor: {
-      class: "text-custom-text-300",
+      color: "rgba(var(--color-text-100))",
+      width: 1,
     },
     ...(enableHistory ? {} : { history: false }),
   }),

packages/editor/src/core/extensions/image/image-resize.tsx

@@ -2,84 +2,75 @@ 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);
-
+export const ImageResizer = ({ editor }: { editor: Editor }) => {
   const updateMediaSize = () => {
-    const imageElement = getImageElement(id);
+    const imageInfo = document.querySelector(".ProseMirror-selectednode") as HTMLImageElement;
+    if (imageInfo) {
+      const selection = editor.state.selection;
 
-    if (!imageElement) return;
+      // Use the style width/height if available, otherwise fall back to the element's natural width/height
+      const width = imageInfo.style.width
+        ? Number(imageInfo.style.width.replace("px", ""))
+        : imageInfo.getAttribute("width");
+      const height = imageInfo.style.height
+        ? Number(imageInfo.style.height.replace("px", ""))
+        : imageInfo.getAttribute("height");
 
-    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);
+      editor.commands.setImage({
+        src: imageInfo.src,
+        width: width,
+        height: height,
+      } as any);
+      editor.commands.setNodeSelection(selection.from);
+    }
   };
 
+  const [aspectRatio, setAspectRatio] = useState(1);
+
   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;
+    <>
+      <Moveable
+        target={document.querySelector(".active-editor .ProseMirror-selectednode") as HTMLElement}
+        container={null}
+        origin={false}
+        edge={false}
+        throttleDrag={0}
+        keepRatio
+        resizable
+        throttleResize={0}
+        onResizeStart={() => {
+          const imageInfo = document.querySelector(".active-editor .ProseMirror-selectednode") as HTMLImageElement;
+          if (imageInfo) {
+            const originalWidth = Number(imageInfo.width);
+            const originalHeight = Number(imageInfo.height);
+            setAspectRatio(originalWidth / originalHeight);
           }
-          target.style.width = `${newWidth}px`;
-          target.style.height = `${newHeight}px`;
-        }
-      }}
-      onResizeEnd={() => {
-        updateMediaSize();
-      }}
-      scalable
-      renderDirections={["se"]}
-      onScale={({ target, transform }) => {
-        target.style.transform = transform;
-      }}
-    />
+        }}
+        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;
+        }}
+      />
+    </>
   );
 };

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

@@ -91,8 +91,7 @@ export const CustomMention = ({
             // @ts-expect-error - Tippy types are incorrect
             popup = tippy("body", {
               getReferenceClientRect: props.clientRect,
-              appendTo: () =>
-                document.querySelector(".active-editor") ?? document.querySelector('[id^="editor-container"]'),
+              appendTo: () => document.querySelector(".active-editor") ?? document.querySelector("#editor-container"),
               content: component.element,
               showOnCreate: true,
               interactive: true,

packages/editor/src/core/extensions/slash-commands.tsx

@@ -374,8 +374,7 @@ const renderItems = () => {
         editor: props.editor,
       });
 
-      const tippyContainer =
-        document.querySelector(".active-editor") ?? document.querySelector('[id^="editor-container"]');
+      const tippyContainer = document.querySelector(".active-editor") ?? document.querySelector("#editor-container");
 
       // @ts-expect-error Tippy overloads are messed up
       popup = tippy("body", {

packages/editor/src/core/types/editor.ts

@@ -29,7 +29,7 @@ export interface IEditorProps {
   editorClassName?: string;
   fileHandler: TFileHandler;
   forwardedRef?: React.MutableRefObject<EditorRefApi | null>;
-  id: string;
+  id?: string;
   initialValue: string;
   mentionHandler: {
     highlights: () => Promise<IMentionHighlight[]>;
@@ -52,7 +52,6 @@ export interface IReadOnlyEditorProps {
   containerClassName?: string;
   editorClassName?: string;
   forwardedRef?: React.MutableRefObject<EditorReadOnlyRefApi | null>;
-  id: string;
   initialValue: string;
   mentionHandler: {
     highlights: () => Promise<IMentionHighlight[]>;

packages/editor/src/styles/drag-drop.css

@@ -2,20 +2,15 @@
 .drag-handle {
   position: fixed;
   opacity: 1;
+  transition: opacity ease-in 0.2s;
   height: 20px;
-  width: 20px;
-  aspect-ratio: 1 / 1;
+  width: 15px;
   display: grid;
   place-items: center;
   z-index: 5;
   cursor: grab;
   border-radius: 2px;
-  outline: none !important;
-  transition:
-    opacity 0.2s ease 0.2s,
-    background-color 0.2s ease,
-    top 0.2s ease,
-    left 0.2s ease;
+  transition: background-color 0.2s;
 
   &:hover {
     background-color: rgba(var(--color-background-80));
@@ -26,7 +21,7 @@
     cursor: grabbing;
   }
 
-  &.drag-handle-hidden {
+  &.hidden {
     opacity: 0;
     pointer-events: none;
   }
@@ -67,33 +62,25 @@
   cursor: grab;
   outline: none !important;
   box-shadow: none;
-
-  --horizontal-offset: 5px;
-
-  &:has(.issue-embed),
-  &.table-wrapper {
-    --horizontal-offset: 0px;
-  }
-
-  &::after {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: calc(-1 * var(--horizontal-offset));
-    height: 100%;
-    width: calc(100% + (var(--horizontal-offset) * 2));
-    background-color: rgba(var(--color-primary-100), 0.2);
-    border-radius: 4px;
-    pointer-events: none;
-  }
 }
 
-/* for targeting the task list items */
+.ProseMirror:not(.dragging) .ProseMirror-selectednode::after {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: -5px;
+  height: 100%;
+  width: 100%;
+  background-color: rgba(var(--color-primary-100), 0.2);
+  border-radius: 4px;
+}
+
+/* for targetting the taks list items */
 li.ProseMirror-selectednode:not(.dragging)[data-checked]::after {
   margin-left: -5px;
 }
 
-/* for targeting the unordered list items */
+/* for targetting the unordered list items */
 ul > li.ProseMirror-selectednode:not(.dragging)::after {
   margin-left: -10px; /* Adjust as needed */
 }
@@ -103,18 +90,18 @@ ol {
   counter-reset: item;
 }
 
-/* for targeting the ordered list items */
+/* for targetting the ordered list items */
 ol > li.ProseMirror-selectednode:not(.dragging)::after {
   counter-increment: item;
   margin-left: -18px;
 }
 
-/* for targeting the ordered list items after the 9th item */
+/* for targetting the ordered list items after the 9th item */
 ol > li:nth-child(n + 10).ProseMirror-selectednode:not(.dragging)::after {
   margin-left: -25px;
 }
 
-/* for targeting the ordered list items after the 99th item */
+/* for targetting the ordered list items after the 99th item */
 ol > li:nth-child(n + 100).ProseMirror-selectednode:not(.dragging)::after {
   margin-left: -35px;
 }
@@ -131,3 +118,9 @@ ol > li:nth-child(n + 100).ProseMirror-selectednode:not(.dragging)::after {
     filter: brightness(90%);
   }
 }
+
+:not(.dragging) .ProseMirror-selectednode.table-wrapper {
+  padding: 4px 2px;
+  background-color: rgba(var(--color-primary-300), 0.1) !important;
+  box-shadow: rgba(var(--color-primary-100)) 0px 0px 0px 2px inset !important;
+}

packages/types/src/favorite/favorite.d.ts

@@ -1,15 +0,0 @@
-export type IFavorite = {
-  id: string;
-  name: string;
-  entity_type: string;
-  entity_data: {
-    name: string;
-  };
-  is_folder: boolean;
-  sort_order: number;
-  parent: string | null;
-  entity_identifier?: string | null;
-  children: IFavorite[];
-  project_id: string | null;
-  sequence: number;
-};

packages/types/src/favorite/index.d.ts

@@ -1 +0,0 @@
-export * from "./favorite";

packages/types/src/index.d.ts

@@ -28,4 +28,3 @@ export * from "./common";
 export * from "./pragmatic";
 export * from "./publish";
 export * from "./workspace-notifications";
-export * from "./favorite";

packages/types/src/instance/base.d.ts

@@ -52,9 +52,6 @@ export interface IInstanceConfig {
   app_base_url: string | undefined;
   space_base_url: string | undefined;
   admin_base_url: string | undefined;
-  // intercom
-  is_intercom_enabled: boolean;
-  intercom_app_id: string | undefined;
 }
 
 export interface IInstanceAdmin {
@@ -69,16 +66,11 @@ export interface IInstanceAdmin {
   user_detail: IUserLite;
 }
 
-export type TInstanceIntercomConfigurationKeys =
-  | "IS_INTERCOM_ENABLED"
-  | "INTERCOM_APP_ID";
-
 export type TInstanceConfigurationKeys =
   | TInstanceAIConfigurationKeys
   | TInstanceEmailConfigurationKeys
   | TInstanceImageConfigurationKeys
-  | TInstanceAuthenticationKeys
-  | TInstanceIntercomConfigurationKeys;
+  | TInstanceAuthenticationKeys;
 
 export interface IInstanceConfiguration {
   id: string;

packages/ui/src/icons/favorite-folder-icon.tsx

@@ -1,32 +0,0 @@
-import * as React from "react";
-
-import { ISvgIcons } from "./type";
-
-export const FavoriteFolderIcon: React.FC<ISvgIcons> = ({ className = "text-current", color = "#a3a3a3", ...rest }) => (
-  <svg
-    width="16"
-    height="16"
-    viewBox="0 0 16 16"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    stroke={color}
-    className={`${className} stroke-2`}
-    {...rest}
-  >
-    <path
-      d="M7.33325 13.3334H2.66659C2.31296 13.3334 1.97382 13.1929 1.72378 12.9429C1.47373 12.6928 1.33325 12.3537 1.33325 12.0001V3.3334C1.33325 2.97978 1.47373 2.64064 1.72378 2.39059C1.97382 2.14054 2.31296 2.00006 2.66659 2.00006H5.26659C5.48958 1.99788 5.70955 2.05166 5.90638 2.15648C6.10322 2.2613 6.27061 2.41381 6.39325 2.60006L6.93325 3.40006C7.05466 3.58442 7.21994 3.73574 7.41425 3.84047C7.60857 3.94519 7.82585 4.00003 8.04658 4.00006H13.3333C13.6869 4.00006 14.026 4.14054 14.2761 4.39059C14.5261 4.64064 14.6666 4.97978 14.6666 5.3334V6.3334"
-      // stroke="#60646C"
-      stroke-width="1.25"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-    />
-    <path
-      d="M12.1373 8L13.0038 9.75535L14.9414 10.0386L13.5394 11.4041L13.8702 13.3333L12.1373 12.422L10.4044 13.3333L10.7353 11.4041L9.33325 10.0386L11.2709 9.75535L12.1373 8Z"
-      stroke-width="1.25"
-      // stroke="#60646C"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-      fill="none"
-    />
-  </svg>
-);

packages/ui/src/icons/index.ts

@@ -24,4 +24,3 @@ export * from "./info-icon";
 export * from "./dropdown-icon";
 export * from "./intake";
 export * from "./user-activity-icon";
-export * from "./favorite-folder-icon";

space/core/components/issues/issue-layouts/kanban/block-reactions.tsx

@@ -1,45 +0,0 @@
-import { observer } from "mobx-react";
-import { useParams } from "next/navigation";
-//plane
-import { cn } from "@plane/editor";
-// components
-import { IssueEmojiReactions, IssueVotes } from "@/components/issues/reactions";
-// hooks
-import { usePublish } from "@/hooks/store";
-
-type Props = {
-  issueId: string;
-};
-export const BlockReactions = observer((props: Props) => {
-  const { issueId } = props;
-  const { anchor } = useParams();
-  const { canVote, canReact } = usePublish(anchor.toString());
-
-  // if the user cannot vote or react then return empty
-  if (!canVote && !canReact) return <></>;
-
-  return (
-    <div
-      className={cn(
-        "flex flex-wrap border-t-[1px] outline-transparent w-full border-t-custom-border-200 bg-custom-background-90 rounded-b"
-      )}
-    >
-      <div className="py-2 px-3 flex flex-wrap items-center gap-2">
-        {canVote && (
-          <div
-            className={cn(`flex items-center gap-2 pr-1`, {
-              "after:h-6 after:ml-1 after:w-[1px] after:bg-custom-border-200": canReact,
-            })}
-          >
-            <IssueVotes anchor={anchor.toString()} issueIdFromProps={issueId} size="sm" />
-          </div>
-        )}
-        {canReact && (
-          <div className="flex flex-wrap items-center gap-2">
-            <IssueEmojiReactions anchor={anchor.toString()} issueIdFromProps={issueId} size="sm" />
-          </div>
-        )}
-      </div>
-    </div>
-  );
-});

space/core/components/issues/issue-layouts/kanban/block.tsx

@@ -14,11 +14,10 @@ import { WithDisplayPropertiesHOC } from "@/components/issues/issue-layouts/with
 import { queryParamGenerator } from "@/helpers/query-param-generator";
 // hooks
 import { useIssueDetails, usePublish } from "@/hooks/store";
-//
+
 import { IIssue } from "@/types/issue";
 import { IssueProperties } from "../properties/all-properties";
 import { getIssueBlockId } from "../utils";
-import { BlockReactions } from "./block-reactions";
 
 interface IssueBlockProps {
   issueId: string;
@@ -84,22 +83,17 @@ export const KanbanIssueBlock: React.FC<IssueBlockProps> = observer((props) => {
 
   return (
     <div className={cn("group/kanban-block relative p-1.5")}>
-      <div
+      <Link
+        id={getIssueBlockId(issueId, groupId, subGroupId)}
         className={cn(
-          "relative block rounded border-[1px] outline-[0.5px] outline-transparent w-full border-custom-border-200 bg-custom-background-100 text-sm transition-all hover:border-custom-border-400",
+          "block rounded border-[1px] outline-[0.5px] outline-transparent w-full border-custom-border-200 bg-custom-background-100 text-sm transition-all hover:border-custom-border-400",
           { "border border-custom-primary-70 hover:border-custom-primary-70": getIsIssuePeeked(issue.id) }
         )}
+        href={`?${queryParam}`}
+        onClick={handleIssuePeekOverview}
       >
-        <Link
-          id={getIssueBlockId(issueId, groupId, subGroupId)}
-          className="w-full"
-          href={`?${queryParam}`}
-          onClick={handleIssuePeekOverview}
-        >
-          <KanbanIssueDetailsBlock issue={issue} displayProperties={displayProperties} />
-        </Link>
-        <BlockReactions issueId={issueId} />
-      </div>
+        <KanbanIssueDetailsBlock issue={issue} displayProperties={displayProperties} />
+      </Link>
     </div>
   );
 });

space/core/components/issues/issue-layouts/kanban/default.tsx

@@ -64,15 +64,22 @@ export const KanBan: React.FC<IKanBan> = observer((props) => {
   if (!groupList) return null;
 
   const visibilityGroupBy = (_list: IGroupByColumn): { showGroup: boolean; showIssues: boolean } => {
-    const groupVisibility = {
-      showGroup: true,
-      showIssues: true,
-    };
-
-    if (!showEmptyGroup) {
-      groupVisibility.showGroup = (getGroupIssueCount(_list.id, undefined, false) ?? 0) > 0;
+    if (subGroupBy) {
+      const groupVisibility = {
+        showGroup: true,
+        showIssues: true,
+      };
+      if (!showEmptyGroup) {
+        groupVisibility.showGroup = (getGroupIssueCount(_list.id, undefined, false) ?? 0) > 0;
+      }
+      return groupVisibility;
+    } else {
+      const groupVisibility = {
+        showGroup: true,
+        showIssues: true,
+      };
+      return groupVisibility;
     }
-    return groupVisibility;
   };
 
   return (

space/core/components/issues/peek-overview/comment/add-comment.tsx

@@ -72,7 +72,6 @@ export const AddComment: React.FC<Props> = observer((props) => {
               workspaceId={workspaceID?.toString() ?? ""}
               workspaceSlug={workspaceSlug?.toString() ?? ""}
               ref={editorRef}
-              id="peek-overview-add-comment"
               initialValue={
                 !value || value === "" || (typeof value === "object" && Object.keys(value).length === 0)
                   ? watch("comment_html")

space/core/components/issues/peek-overview/comment/comment-detail-card.tsx

@@ -105,7 +105,6 @@ export const CommentCard: React.FC<Props> = observer((props) => {
                     workspaceSlug={workspaceSlug?.toString() ?? ""}
                     onEnterKeyPress={() => handleSubmit(handleCommentUpdate)()}
                     ref={editorRef}
-                    id={comment.id}
                     initialValue={value}
                     value={null}
                     onChange={(comment_json, comment_html) => onChange(comment_html)}
@@ -133,7 +132,7 @@ export const CommentCard: React.FC<Props> = observer((props) => {
             </div>
           </form>
           <div className={`${isEditing ? "hidden" : ""}`}>
-            <LiteTextReadOnlyEditor ref={showEditorRef} id={comment.id} initialValue={comment.comment_html} />
+            <LiteTextReadOnlyEditor ref={showEditorRef} initialValue={comment.comment_html} />
             <CommentReactions anchor={anchor} commentId={comment.id} />
           </div>
         </div>

space/core/components/issues/peek-overview/index.ts

@@ -7,3 +7,5 @@ export * from "./issue-properties";
 export * from "./layout";
 export * from "./side-peek-view";
 export * from "./issue-reaction";
+export * from "./issue-vote-reactions";
+export * from "./issue-emoji-reactions";

space/core/components/issues/peek-overview/issue-details.tsx

@@ -26,7 +26,6 @@ export const PeekOverviewIssueDetails: React.FC<Props> = observer((props) => {
       <h4 className="break-words text-2xl font-medium">{issueDetails.name}</h4>
       {description !== "" && description !== "<p></p>" && (
         <RichTextReadOnlyEditor
-          id={issueDetails.id}
           initialValue={
             !description ||
             description === "" ||

space/core/components/issues/peek-overview/issue-emoji-reactions.tsx

@@ -13,12 +13,10 @@ import { useIssueDetails, useUser } from "@/hooks/store";
 
 type IssueEmojiReactionsProps = {
   anchor: string;
-  issueIdFromProps?: string;
-  size?: "md" | "sm";
 };
 
 export const IssueEmojiReactions: React.FC<IssueEmojiReactionsProps> = observer((props) => {
-  const { anchor, issueIdFromProps, size = "md" } = props;
+  const { anchor } = props;
   // router
   const router = useRouter();
   const pathName = usePathname();
@@ -33,7 +31,7 @@ export const IssueEmojiReactions: React.FC<IssueEmojiReactionsProps> = observer(
   const issueDetailsStore = useIssueDetails();
   const { data: user } = useUser();
 
-  const issueId = issueIdFromProps ?? issueDetailsStore.peekId;
+  const issueId = issueDetailsStore.peekId;
   const reactions = issueDetailsStore.details[issueId ?? ""]?.reaction_items ?? [];
   const groupedReactions = groupReactions(reactions, "reaction");
 
@@ -57,7 +55,6 @@ export const IssueEmojiReactions: React.FC<IssueEmojiReactionsProps> = observer(
 
   // derived values
   const { queryParam } = queryParamGenerator({ peekId, board, state, priority, labels });
-  const reactionDimensions = size === "sm" ? "h-6 px-2 py-1" : "h-full px-2 py-1";
 
   return (
     <>
@@ -67,52 +64,54 @@ export const IssueEmojiReactions: React.FC<IssueEmojiReactionsProps> = observer(
           else router.push(`/?next_path=${pathName}?${queryParam}`);
         }}
         selected={userReactions?.map((r) => r.reaction)}
-        size={size}
+        size="md"
       />
-      {Object.keys(groupedReactions || {}).map((reaction) => {
-        const reactions = groupedReactions?.[reaction] ?? [];
-        const REACTIONS_LIMIT = 1000;
+      <div className="flex flex-wrap items-center gap-2">
+        {Object.keys(groupedReactions || {}).map((reaction) => {
+          const reactions = groupedReactions?.[reaction] ?? [];
+          const REACTIONS_LIMIT = 1000;
 
-        if (reactions.length > 0)
-          return (
-            <Tooltip
-              key={reaction}
-              tooltipContent={
-                <div>
-                  {reactions
-                    ?.map((r) => r?.actor_details?.display_name)
-                    ?.splice(0, REACTIONS_LIMIT)
-                    ?.join(", ")}
-                  {reactions.length > REACTIONS_LIMIT && " and " + (reactions.length - REACTIONS_LIMIT) + " more"}
-                </div>
-              }
-            >
-              <button
-                type="button"
-                onClick={() => {
-                  if (user) handleReactionClick(reaction);
-                  else router.push(`/?next_path=${pathName}?${queryParam}`);
-                }}
-                className={`flex items-center gap-1 rounded-md text-sm text-custom-text-100 ${
-                  reactions.some((r) => r?.actor_details?.id === user?.id && r.reaction === reaction)
-                    ? "bg-custom-primary-100/10"
-                    : "bg-custom-background-80"
-                } ${reactionDimensions}`}
+          if (reactions.length > 0)
+            return (
+              <Tooltip
+                key={reaction}
+                tooltipContent={
+                  <div>
+                    {reactions
+                      ?.map((r) => r?.actor_details?.display_name)
+                      ?.splice(0, REACTIONS_LIMIT)
+                      ?.join(", ")}
+                    {reactions.length > REACTIONS_LIMIT && " and " + (reactions.length - REACTIONS_LIMIT) + " more"}
+                  </div>
+                }
               >
-                <span>{renderEmoji(reaction)}</span>
-                <span
-                  className={
+                <button
+                  type="button"
+                  onClick={() => {
+                    if (user) handleReactionClick(reaction);
+                    else router.push(`/?next_path=${pathName}?${queryParam}`);
+                  }}
+                  className={`flex h-full items-center gap-1 rounded-md px-2 py-1 text-sm text-custom-text-100 ${
                     reactions.some((r) => r?.actor_details?.id === user?.id && r.reaction === reaction)
-                      ? "text-custom-primary-100"
-                      : ""
-                  }
+                      ? "bg-custom-primary-100/10"
+                      : "bg-custom-background-80"
+                  }`}
                 >
-                  {groupedReactions?.[reaction].length}{" "}
-                </span>
-              </button>
-            </Tooltip>
-          );
-      })}
+                  <span>{renderEmoji(reaction)}</span>
+                  <span
+                    className={
+                      reactions.some((r) => r?.actor_details?.id === user?.id && r.reaction === reaction)
+                        ? "text-custom-primary-100"
+                        : ""
+                    }
+                  >
+                    {groupedReactions?.[reaction].length}{" "}
+                  </span>
+                </button>
+              </Tooltip>
+            );
+        })}
+      </div>
     </>
   );
 });

space/core/components/issues/peek-overview/issue-reaction.tsx

@@ -1,5 +1,5 @@
 import { observer } from "mobx-react";
-import { IssueEmojiReactions, IssueVotes } from "@/components/issues/reactions";
+import { IssueEmojiReactions, IssueVotes } from "@/components/issues/peek-overview";
 // hooks
 import { usePublish } from "@/hooks/store";
 import useIsInIframe from "@/hooks/use-is-in-iframe";

space/core/components/issues/peek-overview/issue-vote-reactions.tsx

@@ -13,12 +13,10 @@ import useIsInIframe from "@/hooks/use-is-in-iframe";
 
 type TIssueVotes = {
   anchor: string;
-  issueIdFromProps?: string;
-  size?: "md" | "sm";
 };
 
 export const IssueVotes: React.FC<TIssueVotes> = observer((props) => {
-  const { anchor, issueIdFromProps, size = "md" } = props;
+  const { anchor } = props;
   // states
   const [isSubmitting, setIsSubmitting] = useState(false);
   // router
@@ -37,7 +35,7 @@ export const IssueVotes: React.FC<TIssueVotes> = observer((props) => {
 
   const isInIframe = useIsInIframe();
 
-  const issueId = issueIdFromProps ?? issueDetailsStore.peekId;
+  const issueId = issueDetailsStore.peekId;
 
   const votes = issueDetailsStore.details[issueId ?? ""]?.vote_items ?? [];
 
@@ -68,7 +66,6 @@ export const IssueVotes: React.FC<TIssueVotes> = observer((props) => {
 
   // derived values
   const { queryParam } = queryParamGenerator({ peekId, board, state, priority, labels });
-  const votingDimensions = size === "sm" ? "px-1 h-6 min-w-9" : "px-2 h-7";
 
   return (
     <div className="flex items-center gap-2">
@@ -99,8 +96,7 @@ export const IssueVotes: React.FC<TIssueVotes> = observer((props) => {
             else router.push(`/?next_path=${pathName}?${queryParam}`);
           }}
           className={cn(
-            "flex items-center justify-center gap-x-1 overflow-hidden rounded border focus:outline-none bg-custom-background-100",
-            votingDimensions,
+            "flex items-center justify-center gap-x-1 overflow-hidden rounded border px-2 h-7 focus:outline-none",
             {
               "border-custom-primary-200 text-custom-primary-200": isUpVotedByUser,
               "border-custom-border-300": !isUpVotedByUser,
@@ -140,8 +136,7 @@ export const IssueVotes: React.FC<TIssueVotes> = observer((props) => {
             else router.push(`/?next_path=${pathName}?${queryParam}`);
           }}
           className={cn(
-            "flex items-center justify-center gap-x-1 overflow-hidden rounded border focus:outline-none bg-custom-background-100",
-            votingDimensions,
+            "flex items-center justify-center gap-x-1 h-7 overflow-hidden rounded border px-2 focus:outline-none",
             {
               "border-red-600 text-red-600": isDownVotedByUser,
               "border-custom-border-300": !isDownVotedByUser,

space/core/components/issues/reactions/index.ts

@@ -1,2 +0,0 @@
-export * from "./issue-emoji-reactions";
-export * from "./issue-vote-reactions";

space/core/services/cycle.service.ts

@@ -8,7 +8,7 @@ export class CycleService extends APIService {
   }
 
   async getCycles(anchor: string): Promise<TPublicCycle[]> {
-    return this.get(`/api/public/anchor/${anchor}/cycles/`)
+    return this.get(`api/public/anchor/${anchor}/cycles/`)
       .then((response) => response?.data)
       .catch((error) => {
         throw error?.response?.data;

space/core/services/label.service.ts

@@ -8,7 +8,7 @@ export class LabelService extends APIService {
   }
 
   async getLabels(anchor: string): Promise<IIssueLabel[]> {
-    return this.get(`/api/public/anchor/${anchor}/labels/`)
+    return this.get(`api/public/anchor/${anchor}/labels/`)
       .then((response) => response?.data)
       .catch((error) => {
         throw error?.response?.data;

space/core/services/member.service.ts

@@ -8,7 +8,7 @@ export class MemberService extends APIService {
   }
 
   async getAnchorMembers(anchor: string): Promise<TPublicMember[]> {
-    return this.get(`/api/public/anchor/${anchor}/members/`)
+    return this.get(`api/public/anchor/${anchor}/members/`)
       .then((response) => response?.data)
       .catch((error) => {
         throw error?.response?.data;

space/core/services/module.service.ts

@@ -8,7 +8,7 @@ export class ModuleService extends APIService {
   }
 
   async getModules(anchor: string): Promise<TPublicModule[]> {
-    return this.get(`/api/public/anchor/${anchor}/modules/`)
+    return this.get(`api/public/anchor/${anchor}/modules/`)
       .then((response) => response?.data)
       .catch((error) => {
         throw error?.response?.data;

space/core/services/state.service.ts

@@ -8,7 +8,7 @@ export class StateService extends APIService {
   }
 
   async getStates(anchor: string): Promise<IState[]> {
-    return this.get(`/api/public/anchor/${anchor}/states/`)
+    return this.get(`api/public/anchor/${anchor}/states/`)
       .then((response) => response?.data)
       .catch((error) => {
         throw error?.response?.data;

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/header.tsx

@@ -295,7 +295,7 @@ export const CycleIssuesHeader: React.FC = observer(() => {
                     }}
                     size="sm"
                   >
-                    Add issue
+                    Add Issue
                   </Button>
                 )}
               </>

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/inbox/header.tsx

@@ -69,7 +69,7 @@ export const ProjectInboxHeader: FC = observer(() => {
           />
 
           <Button variant="primary" size="sm" onClick={() => setCreateIssueModal(true)}>
-            Add issue
+            Add Issue
           </Button>
         </div>
       )}