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(() =>
@@ -86,7 +74,6 @@ export const GeneralConfigurationForm: FC<IGeneralConfigurationForm> = observer(
               value={instanceAdmins[0]?.user_detail?.email ?? ""}
               placeholder="Admin email"
               className="w-full cursor-not-allowed !text-custom-text-400"
-              autoComplete="on"
               disabled
             />
           </div>
@@ -106,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/admin-sidebar/help-section.tsx

@@ -96,7 +96,7 @@ export const HelpSection: FC = observer(() => {
           leaveTo="transform opacity-0 scale-95"
         >
           <div
-            className={`absolute bottom-2 min-w-[10rem] z-[15] ${
+            className={`absolute bottom-2 min-w-[10rem] ${
               isSidebarCollapsed ? "left-full" : "-left-[75px]"
             } divide-y divide-custom-border-200 whitespace-nowrap rounded bg-custom-background-100 p-1 shadow-custom-shadow-xs`}
             ref={helpOptionsRef}

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

@@ -174,7 +174,6 @@ export const InstanceSetupForm: FC = (props) => {
                 placeholder="Wilber"
                 value={formData.first_name}
                 onChange={(e) => handleFormChange("first_name", e.target.value)}
-                autoComplete="on"
                 autoFocus
               />
             </div>
@@ -191,7 +190,6 @@ export const InstanceSetupForm: FC = (props) => {
                 placeholder="Wright"
                 value={formData.last_name}
                 onChange={(e) => handleFormChange("last_name", e.target.value)}
-                autoComplete="on"
               />
             </div>
           </div>
@@ -210,7 +208,6 @@ export const InstanceSetupForm: FC = (props) => {
               value={formData.email}
               onChange={(e) => handleFormChange("email", e.target.value)}
               hasError={errorData.type && errorData.type === EErrorCodes.INVALID_EMAIL ? true : false}
-              autoComplete="on"
             />
             {errorData.type && errorData.type === EErrorCodes.INVALID_EMAIL && errorData.message && (
               <p className="px-1 text-xs text-red-500">{errorData.message}</p>
@@ -250,7 +247,6 @@ export const InstanceSetupForm: FC = (props) => {
                 hasError={errorData.type && errorData.type === EErrorCodes.INVALID_PASSWORD ? true : false}
                 onFocus={() => setIsPasswordInputFocused(true)}
                 onBlur={() => setIsPasswordInputFocused(false)}
-                autoComplete="on"
               />
               {showPassword.password ? (
                 <button

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));
@@ -127,7 +129,6 @@ export const InstanceSignInForm: FC = (props) => {
               placeholder="name@company.com"
               value={formData.email}
               onChange={(e) => handleFormChange("email", e.target.value)}
-              autoComplete="on"
               autoFocus
             />
           </div>
@@ -146,7 +147,6 @@ export const InstanceSignInForm: FC = (props) => {
                 placeholder="Enter your password"
                 value={formData.password}
                 onChange={(e) => handleFormChange("password", e.target.value)}
-                autoComplete="on"
               />
               {showPassword ? (
                 <button

admin/package.json

@@ -18,7 +18,7 @@
     "@tailwindcss/typography": "^0.5.9",
     "@types/lodash": "^4.17.0",
     "autoprefixer": "10.4.14",
-    "axios": "^1.7.4",
+    "axios": "^1.6.7",
     "js-cookie": "^3.0.5",
     "lodash": "^4.17.21",
     "lucide-react": "^0.356.0",

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

@@ -40,44 +40,3 @@ class ApiKeyRateThrottle(SimpleRateThrottle):
             request.META["X-RateLimit-Reset"] = reset_time
 
         return allowed
-
-
-class ServiceTokenRateThrottle(SimpleRateThrottle):
-    scope = "service_token"
-    rate = "300/minute"
-
-    def get_cache_key(self, request, view):
-        # Retrieve the API key from the request header
-        api_key = request.headers.get("X-Api-Key")
-        if not api_key:
-            return None  # Allow the request if there's no API key
-
-        # Use the API key as part of the cache key
-        return f"{self.scope}:{api_key}"
-
-    def allow_request(self, request, view):
-        allowed = super().allow_request(request, view)
-
-        if allowed:
-            now = self.timer()
-            # Calculate the remaining limit and reset time
-            history = self.cache.get(self.key, [])
-
-            # Remove old histories
-            while history and history[-1] <= now - self.duration:
-                history.pop()
-
-            # Calculate the requests
-            num_requests = len(history)
-
-            # Check available requests
-            available = self.num_requests - num_requests
-
-            # Unix timestamp for when the rate limit will reset
-            reset_time = int(now + self.duration)
-
-            # Add headers
-            request.META["X-RateLimit-Remaining"] = max(0, available)
-            request.META["X-RateLimit-Reset"] = reset_time
-
-        return allowed

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",
         ]
@@ -269,7 +270,6 @@ class LabelSerializer(BaseSerializer):
             "updated_by",
             "created_at",
             "updated_at",
-            "deleted_at",
         ]
 
 
@@ -338,7 +338,9 @@ class IssueAttachmentSerializer(BaseSerializer):
             "workspace",
             "project",
             "issue",
+            "created_by",
             "updated_by",
+            "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/serializers/state.py

@@ -23,7 +23,6 @@ class StateSerializer(BaseSerializer):
             "updated_at",
             "workspace",
             "project",
-            "deleted_at",
         ]
 
 

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

@@ -7,7 +7,6 @@ from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db import IntegrityError
 from django.urls import resolve
 from django.utils import timezone
-from plane.db.models.api import APIToken
 from rest_framework import status
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
@@ -17,7 +16,7 @@ from rest_framework.views import APIView
 
 # Module imports
 from plane.api.middleware.api_authentication import APIKeyAuthentication
-from plane.api.rate_limit import ApiKeyRateThrottle, ServiceTokenRateThrottle
+from plane.api.rate_limit import ApiKeyRateThrottle
 from plane.utils.exception_logger import log_exception
 from plane.utils.paginator import BasePaginator
 
@@ -45,29 +44,15 @@ class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
         IsAuthenticated,
     ]
 
+    throttle_classes = [
+        ApiKeyRateThrottle,
+    ]
+
     def filter_queryset(self, queryset):
         for backend in list(self.filter_backends):
             queryset = backend().filter_queryset(self.request, queryset, self)
         return queryset
 
-    def get_throttles(self):
-        throttle_classes = []
-        api_key = self.request.headers.get("X-Api-Key")
-
-        if api_key:
-            service_token = APIToken.objects.filter(
-                token=api_key,
-                is_service=True,
-            ).first()
-
-            if service_token:
-                throttle_classes.append(ServiceTokenRateThrottle())
-                return throttle_classes
-
-        throttle_classes.append(ApiKeyRateThrottle())
-
-        return throttle_classes
-
     def handle_exception(self, exc):
         """
         Handle any exception that occurs, by returning an appropriate response,
@@ -167,4 +152,4 @@ class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
             for expand in self.request.GET.get("expand", "").split(",")
             if expand
         ]
-        return expand if expand else None
+        return expand if expand else None

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,63 +661,61 @@ class CycleIssueAPIEndpoint(BaseAPIView):
             workspace__slug=slug, project_id=project_id, pk=cycle_id
         )
 
+        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)),
@@ -736,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

@@ -38,7 +38,7 @@ from plane.app.permissions import (
     ProjectLitePermission,
     ProjectMemberPermission,
 )
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import (
     Issue,
     IssueActivity,
@@ -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(
@@ -355,124 +333,6 @@ class IssueAPIEndpoint(BaseAPIView):
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-    def put(self, request, slug, project_id):
-        # Get the entities required for putting the issue, external_id and
-        # external_source are must to identify the issue here
-        project = Project.objects.get(pk=project_id)
-        external_id = request.data.get("external_id")
-        external_source = request.data.get("external_source")
-
-        # If the external_id and source are present, we need to find the exact
-        # issue that needs to be updated with the provided external_id and
-        # external_source
-        if external_id and external_source:
-            try:
-                issue = Issue.objects.get(
-                    project_id=project_id,
-                    workspace__slug=slug,
-                    external_id=external_id,
-                    external_source=external_source,
-                )
-
-                # Get the current instance of the issue in order to track
-                # changes and dispatch the issue activity
-                current_instance = json.dumps(
-                    IssueSerializer(issue).data, cls=DjangoJSONEncoder
-                )
-
-                # Get the requested data, encode it as django object and pass it
-                # to serializer to validation
-                requested_data = json.dumps(
-                    self.request.data, cls=DjangoJSONEncoder
-                )
-                serializer = IssueSerializer(
-                    issue,
-                    data=request.data,
-                    context={
-                        "project_id": project_id,
-                        "workspace_id": project.workspace_id,
-                    },
-                    partial=True,
-                )
-                if serializer.is_valid():
-                    # If the serializer is valid, save the issue and dispatch
-                    # the update issue activity worker event.
-                    serializer.save()
-                    issue_activity.delay(
-                        type="issue.activity.updated",
-                        requested_data=requested_data,
-                        actor_id=str(request.user.id),
-                        issue_id=str(issue.id),
-                        project_id=str(project_id),
-                        current_instance=current_instance,
-                        epoch=int(timezone.now().timestamp()),
-                    )
-                    return Response(serializer.data, status=status.HTTP_200_OK)
-                return Response(
-                    # If the serializer is not valid, respond with 400 bad
-                    # request
-                    serializer.errors,
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-            except Issue.DoesNotExist:
-                # If the issue does not exist, a new record needs to be created
-                # for the requested data.
-                # Serialize the data with the context of the project and
-                # workspace
-                serializer = IssueSerializer(
-                    data=request.data,
-                    context={
-                        "project_id": project_id,
-                        "workspace_id": project.workspace_id,
-                        "default_assignee_id": project.default_assignee_id,
-                    },
-                )
-
-                # If the serializer is valid, save the issue and dispatch the
-                # issue activity worker event as created
-                if serializer.is_valid():
-                    serializer.save()
-                    # Refetch the issue
-                    issue = Issue.objects.filter(
-                        workspace__slug=slug,
-                        project_id=project_id,
-                        pk=serializer.data["id"],
-                    ).first()
-
-                    # If any of the created_at or created_by is present, update
-                    # the issue with the provided data, else return with the
-                    # default states given.
-                    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_activity.delay(
-                        type="issue.activity.created",
-                        requested_data=json.dumps(
-                            self.request.data, cls=DjangoJSONEncoder
-                        ),
-                        actor_id=str(request.user.id),
-                        issue_id=str(serializer.data.get("id", None)),
-                        project_id=str(project_id),
-                        current_instance=None,
-                        epoch=int(timezone.now().timestamp()),
-                    )
-                    return Response(
-                        serializer.data, status=status.HTTP_201_CREATED
-                    )
-                return Response(
-                    serializer.errors, status=status.HTTP_400_BAD_REQUEST
-                )
-        else:
-            return Response(
-                {"error": "external_id and external_source are required"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
     def patch(self, request, slug, project_id, pk=None):
         issue = Issue.objects.get(
             workspace__slug=slug, project_id=project_id, pk=pk
@@ -750,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()),
             )
@@ -917,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/__init__.py

@@ -1,4 +1,3 @@
-from .ai import urlpatterns as ai_urls
 from .analytic import urlpatterns as analytic_urls
 from .api import urlpatterns as api_urls
 from .asset import urlpatterns as asset_urls
@@ -20,7 +19,6 @@ from .webhook import urlpatterns as webhook_urls
 from .workspace import urlpatterns as workspace_urls
 
 urlpatterns = [
-    *ai_urls,
     *analytic_urls,
     *asset_urls,
     *cycle_urls,

apiserver/plane/app/urls/ai.py

@@ -1,12 +0,0 @@
-from django.urls import path
-
-
-from plane.app.views import AskAIEndpoint
-
-urlpatterns = [
-    path(
-        "workspaces/<str:slug>/ask-AI/",
-        AskAIEndpoint.as_view(),
-        name="askAI",
-    ),
-]

apiserver/plane/app/urls/api.py

@@ -1,5 +1,5 @@
 from django.urls import path
-from plane.app.views import ApiTokenEndpoint, ServiceApiTokenEndpoint
+from plane.app.views import ApiTokenEndpoint
 
 urlpatterns = [
     # API Tokens
@@ -13,10 +13,5 @@ urlpatterns = [
         ApiTokenEndpoint.as_view(),
         name="api-tokens",
     ),
-    path(
-        "workspaces/<str:slug>/service-api-tokens/",
-        ServiceApiTokenEndpoint.as_view(),
-        name="service-api-tokens",
-    ),
     ## End API Tokens
 ]

apiserver/plane/app/urls/external.py

@@ -2,11 +2,23 @@ from django.urls import path
 
 
 from plane.app.views import UnsplashEndpoint
+from plane.app.views import GPTIntegrationEndpoint, WorkspaceGPTIntegrationEndpoint
+
 
 urlpatterns = [
     path(
         "unsplash/",
         UnsplashEndpoint.as_view(),
         name="unsplash",
-    )
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/ai-assistant/",
+        GPTIntegrationEndpoint.as_view(),
+        name="importer",
+    ),
+   path(
+        "workspaces/<str:slug>/ai-assistant/",
+        WorkspaceGPTIntegrationEndpoint.as_view(),
+        name="importer",
+    ),
 ]

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,
@@ -174,10 +169,8 @@ from .module.archive import (
     ModuleArchiveUnarchiveEndpoint,
 )
 
-from .api import (
-    ApiTokenEndpoint,
-    ServiceApiTokenEndpoint,
-)
+from .api import ApiTokenEndpoint
+
 
 from .page.base import (
     PageViewSet,
@@ -191,10 +184,12 @@ from .page.version import PageVersionEndpoint
 from .search.base import GlobalSearchEndpoint
 from .search.issue import IssueSearchEndpoint
 
-from .external.base import UnsplashEndpoint
-
-from .ai.base import AskAIEndpoint
 
+from .external.base import (
+    GPTIntegrationEndpoint,
+    UnsplashEndpoint,
+    WorkspaceGPTIntegrationEndpoint,
+)
 from .estimate.base import (
     ProjectEstimatePointEndpoint,
     BulkEstimatePointEndpoint,

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

@@ -1,109 +0,0 @@
-# Python imports
-import os
-from enum import Enum
-
-
-# Third party imports
-from openai import OpenAI
-from rest_framework.response import Response
-from rest_framework import status
-
-# Django imports
-
-# Module imports
-from ..base import BaseAPIView
-from plane.app.permissions import (
-    WorkspaceEntityPermission,
-)
-from plane.license.utils.instance_value import get_configuration_value
-
-
-class Task(Enum):
-    ASK_AI = "ASK_AI"
-
-
-class AskAIEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkspaceEntityPermission,
-    ]
-
-    def get_system_prompt(self, task):
-        if task == Task.ASK_AI.value:
-            return (
-                True,
-                """
-                You are an advanced AI assistant designed to provide optimal responses by integrating given context with your broad knowledge base. Your primary objectives are:
-
-                1. Thoroughly analyze and understand the provided context, which may include context, specific questions, code snippets, or any relevant information.
-                2. Treat the given context as a critical input, using it to inform and guide your response.
-                3. Leverage your extensive knowledge to complement and enhance your understanding of the context and to provide comprehensive, accurate answers.
-                4. Seamlessly blend insights from the given context with your general knowledge, ensuring a cohesive and informative response.
-                5. Adapt your response style and depth based on the nature of the context and the question asked.
-                6. When dealing with code or technical context, provide explanations or solutions that are directly relevant and technically sound.
-                7. Maintain clarity and conciseness in your responses while ensuring they are complete and informative.
-                8. Use appropriate HTML tags for formatting only when it enhances readability or structure of the response.
-                9. Respect privacy and avoid sensationalism when addressing sensitive topics.
-
-                Your goal is to deliver the most relevant, accurate, and helpful response possible, considering both the provided content and your broader understanding.
-                """,
-            )
-        else:
-            return False, {
-                "error": "Invalid task. Please provide a correct task name."
-            }
-
-    def post(self, request, slug):
-        task = request.data.get("task", "ASK_AI")
-        context = request.data.get("text_input", "")
-        user_prompt = request.data.get("query", "")
-
-        if not context or not user_prompt:
-            return Response(
-                {"error": "Query and Text input are required"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        OPENAI_API_KEY, GPT_ENGINE = get_configuration_value(
-            [
-                {
-                    "key": "OPENAI_API_KEY",
-                    "default": os.environ.get("OPENAI_API_KEY", None),
-                },
-                {
-                    "key": "GPT_ENGINE",
-                    "default": os.environ.get("GPT_ENGINE", "gpt-3.5-turbo"),
-                },
-            ]
-        )
-
-        if not OPENAI_API_KEY or not GPT_ENGINE:
-            return Response(
-                {"error": "OpenAI API key and engine are required"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        client = OpenAI(api_key=OPENAI_API_KEY)
-
-        processed, system_prompt = self.get_system_prompt(task)
-        if not processed:
-            return Response(system_prompt, status=status.HTTP_400_BAD_REQUEST)
-
-        try:
-            completion = client.chat.completions.create(
-                model=GPT_ENGINE,
-                messages=[
-                    {"role": "system", "content": system_prompt},
-                    {
-                        "role": "user",
-                        "content": f"Context:\n\n{context}\n\nQuestion: {user_prompt}",
-                    },
-                ],
-                temperature=0.1,
-            )
-            response = completion.choices[0].message.content.strip()
-            return Response({"response": response}, status=status.HTTP_200_OK)
-        except Exception as e:
-            return Response(
-                {"error": f"An error occurred: {str(e)}"},
-                status=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            )

apiserver/plane/app/views/api.py

@@ -45,7 +45,7 @@ class ApiTokenEndpoint(BaseAPIView):
     def get(self, request, slug, pk=None):
         if pk is None:
             api_tokens = APIToken.objects.filter(
-                user=request.user, workspace__slug=slug, is_service=False
+                user=request.user, workspace__slug=slug
             )
             serializer = APITokenReadSerializer(api_tokens, many=True)
             return Response(serializer.data, status=status.HTTP_200_OK)
@@ -61,7 +61,6 @@ class ApiTokenEndpoint(BaseAPIView):
             workspace__slug=slug,
             user=request.user,
             pk=pk,
-            is_service=False,
         )
         api_token.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
@@ -79,44 +78,3 @@ class ApiTokenEndpoint(BaseAPIView):
             serializer.save()
             return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-
-class ServiceApiTokenEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkspaceOwnerPermission,
-    ]
-
-    def post(self, request, slug):
-        workspace = Workspace.objects.get(slug=slug)
-
-        api_token = APIToken.objects.filter(
-            workspace=workspace,
-            is_service=True,
-        ).first()
-
-        if api_token:
-            return Response(
-                {
-                    "token": str(api_token.token),
-                },
-                status=status.HTTP_200_OK,
-            )
-        else:
-            # Check the user type
-            user_type = 1 if request.user.is_bot else 0
-
-            api_token = APIToken.objects.create(
-                label=str(uuid4().hex),
-                description="Service Token",
-                user=request.user,
-                workspace=workspace,
-                user_type=user_type,
-                is_service=True,
-            )
-            return Response(
-                {
-                    "token": str(api_token.token),
-                },
-                status=status.HTTP_201_CREATED,
-            )
-

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/external/base.py

@@ -2,8 +2,8 @@
 import requests
 import os
 
-
 # Third party imports
+from openai import OpenAI
 from rest_framework.response import Response
 from rest_framework import status
 
@@ -11,9 +11,136 @@ from rest_framework import status
 
 # Module imports
 from ..base import BaseAPIView
+from plane.app.permissions import ProjectEntityPermission, WorkspaceEntityPermission
+from plane.db.models import Workspace, Project
+from plane.app.serializers import (
+    ProjectLiteSerializer,
+    WorkspaceLiteSerializer,
+)
 from plane.license.utils.instance_value import get_configuration_value
 
 
+class GPTIntegrationEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
+    def post(self, request, slug, project_id):
+        OPENAI_API_KEY, GPT_ENGINE = get_configuration_value(
+            [
+                {
+                    "key": "OPENAI_API_KEY",
+                    "default": os.environ.get("OPENAI_API_KEY", None),
+                },
+                {
+                    "key": "GPT_ENGINE",
+                    "default": os.environ.get("GPT_ENGINE", "gpt-3.5-turbo"),
+                },
+            ]
+        )
+
+        # Get the configuration value
+        # Check the keys
+        if not OPENAI_API_KEY or not GPT_ENGINE:
+            return Response(
+                {"error": "OpenAI API key and engine is required"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        prompt = request.data.get("prompt", False)
+        task = request.data.get("task", False)
+
+        if not task:
+            return Response(
+                {"error": "Task is required"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        final_text = task + "\n" + prompt
+
+        client = OpenAI(
+            api_key=OPENAI_API_KEY,
+        )
+
+        response = client.chat.completions.create(
+            model=GPT_ENGINE,
+            messages=[{"role": "user", "content": final_text}],
+        )
+
+        workspace = Workspace.objects.get(slug=slug)
+        project = Project.objects.get(pk=project_id)
+
+        text = response.choices[0].message.content.strip()
+        text_html = text.replace("\n", "<br/>")
+        return Response(
+            {
+                "response": text,
+                "response_html": text_html,
+                "project_detail": ProjectLiteSerializer(project).data,
+                "workspace_detail": WorkspaceLiteSerializer(workspace).data,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+
+class WorkspaceGPTIntegrationEndpoint(BaseAPIView):
+    permission_classes = [
+        WorkspaceEntityPermission,
+    ]
+
+    def post(self, request, slug):
+        OPENAI_API_KEY, GPT_ENGINE = get_configuration_value(
+            [
+                {
+                    "key": "OPENAI_API_KEY",
+                    "default": os.environ.get("OPENAI_API_KEY", None),
+                },
+                {
+                    "key": "GPT_ENGINE",
+                    "default": os.environ.get("GPT_ENGINE", "gpt-3.5-turbo"),
+                },
+            ]
+        )
+
+        # Get the configuration value
+        # Check the keys
+        if not OPENAI_API_KEY or not GPT_ENGINE:
+            return Response(
+                {"error": "OpenAI API key and engine is required"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        prompt = request.data.get("prompt", False)
+        task = request.data.get("task", False)
+
+        if not task:
+            return Response(
+                {"error": "Task is required"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        final_text = task + "\n" + prompt
+
+        client = OpenAI(
+            api_key=OPENAI_API_KEY,
+        )
+
+        response = client.chat.completions.create(
+            model=GPT_ENGINE,
+            messages=[{"role": "user", "content": final_text}],
+        )
+
+        text = response.choices[0].message.content.strip()
+        text_html = text.replace("\n", "<br/>")
+        return Response(
+            {
+                "response": text,
+                "response_html": text_html,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+
 class UnsplashEndpoint(BaseAPIView):
     def get(self, request):
         (UNSPLASH_ACCESS_KEY,) = get_configuration_value(

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

@@ -160,8 +160,7 @@ class InboxIssueViewSet(BaseViewSet):
                     ArrayAgg(
                         "issue_module__module_id",
                         distinct=True,
-                        filter=~Q(issue_module__module_id__isnull=True)
-                        & Q(issue_module__module__archived_at__isnull=True),
+                        filter=~Q(issue_module__module_id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),

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

@@ -64,6 +64,7 @@ from plane.utils.user_timezone_converter import user_timezone_converter
 
 
 class IssueListEndpoint(BaseAPIView):
+
     permission_classes = [
         ProjectEntityPermission,
     ]
@@ -437,8 +438,7 @@ class IssueViewSet(BaseViewSet):
                     ArrayAgg(
                         "issue_module__module_id",
                         distinct=True,
-                        filter=~Q(issue_module__module_id__isnull=True)
-                        & Q(issue_module__module__archived_at__isnull=True),
+                        filter=~Q(issue_module__module_id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -622,10 +622,11 @@ 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():
+
             return Response(
                 {"error": "Only admin can perform this action"},
                 status=status.HTTP_403_FORBIDDEN,

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"},
@@ -223,8 +216,7 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):
                     ArrayAgg(
                         "issue_module__module_id",
                         distinct=True,
-                        filter=~Q(issue_module__module_id__isnull=True)
-                        & Q(issue_module__module__archived_at__isnull=True),
+                        filter=~Q(issue_module__module_id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -445,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"},
@@ -489,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/authentication/views/app/magic.py

@@ -29,7 +29,6 @@ from plane.authentication.adapter.error import (
     AuthenticationException,
     AUTHENTICATION_ERROR_CODES,
 )
-from plane.authentication.rate_limit import AuthenticationThrottle
 
 
 class MagicGenerateEndpoint(APIView):
@@ -38,10 +37,6 @@ class MagicGenerateEndpoint(APIView):
         AllowAny,
     ]
 
-    throttle_classes = [
-        AuthenticationThrottle,
-    ]
-
     def post(self, request):
         # Check if instance is configured
         instance = Instance.objects.first()

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/management/commands/clear_cache.py

@@ -6,23 +6,8 @@ from django.core.management import BaseCommand
 class Command(BaseCommand):
     help = "Clear Cache before starting the server to remove stale values"
 
-    def add_arguments(self, parser):
-        # Positional argument
-        parser.add_argument(
-            "--key", type=str, nargs="?", help="Key to clear cache"
-        )
-
     def handle(self, *args, **options):
         try:
-            if options["key"]:
-                cache.delete(options["key"])
-                self.stdout.write(
-                    self.style.SUCCESS(
-                        f"Cache Cleared for key: {options['key']}"
-                    )
-                )
-                return
-
             cache.clear()
             self.stdout.write(self.style.SUCCESS("Cache Cleared"))
             return

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/migrations/0074_deploy_board_and_project_issues.py

@@ -1,203 +0,0 @@
-# Generated by Django 4.2.11 on 2024-08-13 16:21
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("db", "0073_alter_commentreaction_unique_together_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="deployboard",
-            name="is_activity_enabled",
-            field=models.BooleanField(default=True),
-        ),
-        migrations.AddField(
-            model_name="fileasset",
-            name="is_archived",
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AlterField(
-            model_name="userfavorite",
-            name="sequence",
-            field=models.FloatField(default=65535),
-        ),
-        migrations.CreateModel(
-            name="ProjectIssueType",
-            fields=[
-                (
-                    "created_at",
-                    models.DateTimeField(
-                        auto_now_add=True, verbose_name="Created At"
-                    ),
-                ),
-                (
-                    "updated_at",
-                    models.DateTimeField(
-                        auto_now=True, verbose_name="Last Modified At"
-                    ),
-                ),
-                (
-                    "deleted_at",
-                    models.DateTimeField(
-                        blank=True, null=True, verbose_name="Deleted At"
-                    ),
-                ),
-                (
-                    "id",
-                    models.UUIDField(
-                        db_index=True,
-                        default=uuid.uuid4,
-                        editable=False,
-                        primary_key=True,
-                        serialize=False,
-                        unique=True,
-                    ),
-                ),
-                ("level", models.PositiveIntegerField(default=0)),
-                ("is_default", models.BooleanField(default=False)),
-            ],
-            options={
-                "verbose_name": "Project Issue Type",
-                "verbose_name_plural": "Project Issue Types",
-                "db_table": "project_issue_types",
-                "ordering": ("project", "issue_type"),
-            },
-        ),
-        migrations.AlterModelOptions(
-            name="issuetype",
-            options={
-                "verbose_name": "Issue Type",
-                "verbose_name_plural": "Issue Types",
-            },
-        ),
-        migrations.RemoveConstraint(
-            model_name="issuetype",
-            name="issue_type_unique_name_project_when_deleted_at_null",
-        ),
-        migrations.AlterUniqueTogether(
-            name="issuetype",
-            unique_together=set(),
-        ),
-        migrations.AlterField(
-            model_name="issuetype",
-            name="workspace",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="issue_types",
-                to="db.workspace",
-            ),
-        ),
-        migrations.AlterUniqueTogether(
-            name="issuetype",
-            unique_together={("workspace", "name", "deleted_at")},
-        ),
-        migrations.AddConstraint(
-            model_name="issuetype",
-            constraint=models.UniqueConstraint(
-                condition=models.Q(("deleted_at__isnull", True)),
-                fields=("name", "workspace"),
-                name="issue_type_unique_name_workspace_when_deleted_at_null",
-            ),
-        ),
-        migrations.AddField(
-            model_name="projectissuetype",
-            name="created_by",
-            field=models.ForeignKey(
-                null=True,
-                on_delete=django.db.models.deletion.SET_NULL,
-                related_name="%(class)s_created_by",
-                to=settings.AUTH_USER_MODEL,
-                verbose_name="Created By",
-            ),
-        ),
-        migrations.AddField(
-            model_name="projectissuetype",
-            name="issue_type",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="project_issue_types",
-                to="db.issuetype",
-            ),
-        ),
-        migrations.AddField(
-            model_name="projectissuetype",
-            name="project",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="project_%(class)s",
-                to="db.project",
-            ),
-        ),
-        migrations.AddField(
-            model_name="projectissuetype",
-            name="updated_by",
-            field=models.ForeignKey(
-                null=True,
-                on_delete=django.db.models.deletion.SET_NULL,
-                related_name="%(class)s_updated_by",
-                to=settings.AUTH_USER_MODEL,
-                verbose_name="Last Modified By",
-            ),
-        ),
-        migrations.AddField(
-            model_name="projectissuetype",
-            name="workspace",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="workspace_%(class)s",
-                to="db.workspace",
-            ),
-        ),
-        migrations.RemoveField(
-            model_name="issuetype",
-            name="is_default",
-        ),
-        migrations.RemoveField(
-            model_name="issuetype",
-            name="project",
-        ),
-        migrations.RemoveField(
-            model_name="issuetype",
-            name="sort_order",
-        ),
-        migrations.RemoveField(
-            model_name="issuetype",
-            name="weight",
-        ),
-        migrations.AddConstraint(
-            model_name="projectissuetype",
-            constraint=models.UniqueConstraint(
-                condition=models.Q(("deleted_at__isnull", True)),
-                fields=("project", "issue_type"),
-                name="project_issue_type_unique_project_issue_type_when_deleted_at_null",
-            ),
-        ),
-        migrations.AlterUniqueTogether(
-            name="projectissuetype",
-            unique_together={("project", "issue_type", "deleted_at")},
-        ),
-        migrations.AddField(
-            model_name="issuetype",
-            name="is_default",
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name="issuetype",
-            name="level",
-            field=models.PositiveIntegerField(default=0),
-        ),
-        migrations.AlterUniqueTogether(
-            name="issuetype",
-            unique_together=set(),
-        ),
-        migrations.RemoveConstraint(
-            model_name="issuetype",
-            name="issue_type_unique_name_workspace_when_deleted_at_null",
-        ),
-    ]

apiserver/plane/db/models/asset.py

@@ -42,7 +42,6 @@ class FileAsset(BaseModel):
         related_name="assets",
     )
     is_deleted = models.BooleanField(default=False)
-    is_archived = models.BooleanField(default=False)
 
     class Meta:
         verbose_name = "File Asset"

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

@@ -40,21 +40,13 @@ class DeployBoard(WorkspaceBaseModel):
     )
     is_votes_enabled = models.BooleanField(default=False)
     view_props = models.JSONField(default=dict)
-    is_activity_enabled = models.BooleanField(default=True)
 
     def __str__(self):
         """Return name of the deploy board"""
         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

@@ -21,7 +21,7 @@ class UserFavorite(WorkspaceBaseModel):
     entity_identifier = models.UUIDField(null=True, blank=True)
     name = models.CharField(max_length=255, blank=True, null=True)
     is_folder = models.BooleanField(default=False)
-    sequence = models.FloatField(default=65535)
+    sequence = models.IntegerField(default=65535)
     parent = models.ForeignKey(
         "self",
         on_delete=models.CASCADE,
@@ -31,19 +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"
@@ -51,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,56 +1,37 @@
 # Django imports
 from django.db import models
-from django.db.models import Q
 
 # Module imports
-from .project import ProjectBaseModel
-from .base import BaseModel
+from .workspace import WorkspaceBaseModel
 
 
-class IssueType(BaseModel):
-    workspace = models.ForeignKey(
-        "db.Workspace",
-        related_name="issue_types",
-        on_delete=models.CASCADE,
-    )
+class IssueType(WorkspaceBaseModel):
     name = models.CharField(max_length=255)
     description = models.TextField(blank=True)
     logo_props = models.JSONField(default=dict)
+    sort_order = models.FloatField(default=65535)
     is_default = models.BooleanField(default=False)
+    weight = models.PositiveIntegerField(default=0)
     is_active = models.BooleanField(default=True)
-    level = models.PositiveIntegerField(default=0)
 
     class Meta:
+        unique_together = ["project", "name"]
         verbose_name = "Issue Type"
         verbose_name_plural = "Issue Types"
         db_table = "issue_types"
+        ordering = ("sort_order",)
 
     def __str__(self):
         return self.name
 
-
-class ProjectIssueType(ProjectBaseModel):
-    issue_type = models.ForeignKey(
-        "db.IssueType",
-        related_name="project_issue_types",
-        on_delete=models.CASCADE,
-    )
-    level = models.PositiveIntegerField(default=0)
-    is_default = models.BooleanField(default=False)
-
-    class Meta:
-        unique_together = ["project", "issue_type", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["project", "issue_type"],
-                condition=Q(deleted_at__isnull=True),
-                name="project_issue_type_unique_project_issue_type_when_deleted_at_null",
-            )
-        ]
-        verbose_name = "Project Issue Type"
-        verbose_name_plural = "Project Issue Types"
-        db_table = "project_issue_types"
-        ordering = ("project", "issue_type")
-
-    def __str__(self):
-        return f"{self.project} - {self.issue_type}"
+    def save(self, *args, **kwargs):
+        # If we are adding a new issue type, we need to set the sort order
+        if self._state.adding:
+            # Get the largest sort order for the project
+            largest_sort_order = IssueType.objects.filter(
+                project=self.project
+            ).aggregate(largest=models.Max("sort_order"))["largest"]
+            # If there are issue types, set the sort order to the largest + 10000
+            if largest_sort_order is not None:
+                self.sort_order = largest_sort_order + 10000
+        super(IssueType, self).save(*args, **kwargs)

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/serializers/instance.py

@@ -13,7 +13,6 @@ class InstanceSerializer(BaseSerializer):
         model = Instance
         exclude = [
             "license_key",
-            "user_count"
         ]
         read_only_fields = [
             "id",

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

@@ -54,7 +54,6 @@ class InstanceEndpoint(BaseAPIView):
         data["is_activated"] = True
         # Get all the configuration
         (
-            ENABLE_SIGNUP,
             IS_GOOGLE_ENABLED,
             IS_GITHUB_ENABLED,
             GITHUB_APP_NAME,
@@ -67,14 +66,8 @@ class InstanceEndpoint(BaseAPIView):
             POSTHOG_HOST,
             UNSPLASH_ACCESS_KEY,
             OPENAI_API_KEY,
-            IS_INTERCOM_ENABLED,
-            INTERCOM_APP_ID,
         ) = get_configuration_value(
             [
-                {
-                    "key": "ENABLE_SIGNUP",
-                    "default": os.environ.get("ENABLE_SIGNUP", "0"),
-                },
                 {
                     "key": "IS_GOOGLE_ENABLED",
                     "default": os.environ.get("IS_GOOGLE_ENABLED", "0"),
@@ -123,21 +116,11 @@ 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", ""),
-                },
             ]
         )
 
         data = {}
         # Authentication
-        data["enable_signup"] = ENABLE_SIGNUP == "1"
         data["is_google_enabled"] = IS_GOOGLE_ENABLED == "1"
         data["is_github_enabled"] = IS_GITHUB_ENABLED == "1"
         data["is_gitlab_enabled"] = IS_GITLAB_ENABLED == "1"
@@ -168,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/space/views/state.py

@@ -27,11 +27,14 @@ class ProjectStatesEndpoint(BaseAPIView):
                 status=status.HTTP_404_NOT_FOUND,
             )
 
-        states = State.objects.filter(
-            ~Q(name="Triage"),
-            workspace__slug=deploy_board.workspace.slug,
-            project_id=deploy_board.project_id,
-        ).values("name", "group", "color", "id", "sequence")
+        states = (
+            State.objects.filter(
+                ~Q(name="Triage"),
+                workspace__slug=deploy_board.workspace.slug,
+                project_id=deploy_board.project_id,
+            )
+            .values("name", "group", "color", "id")
+        )
 
         return Response(
             states,

apiserver/plane/utils/constants.py

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

apiserver/plane/utils/grouper.py

@@ -18,6 +18,7 @@ from plane.db.models import (
 
 
 def issue_queryset_grouper(queryset, group_by, sub_group_by):
+
     FIELD_MAPPER = {
         "label_ids": "labels__id",
         "assignee_ids": "assignees__id",
@@ -29,10 +30,7 @@ def issue_queryset_grouper(queryset, group_by, sub_group_by):
         "label_ids": ("labels__id", ~Q(labels__id__isnull=True)),
         "module_ids": (
             "issue_module__module_id",
-            (
-                ~Q(issue_module__module_id__isnull=True)
-                & Q(issue_module__module__archived_at__isnull=True)
-            ),
+            ~Q(issue_module__module_id__isnull=True),
         ),
     }
     default_annotations = {
@@ -53,6 +51,7 @@ def issue_queryset_grouper(queryset, group_by, sub_group_by):
 
 
 def issue_on_results(issues, group_by, sub_group_by):
+
     FIELD_MAPPER = {
         "labels__id": "label_ids",
         "assignees__id": "assignee_ids",

apiserver/requirements/base.txt

@@ -1,7 +1,7 @@
 # base requirements
 
 # django
-Django==4.2.15
+Django==4.2.14
 # rest framework
 djangorestframework==3.15.2
 # postgres 

deploy/selfhost/install.sh

@@ -9,20 +9,11 @@ export DOCKERHUB_USER=makeplane
 export PULL_POLICY=${PULL_POLICY:-if_not_present}
 
 CPU_ARCH=$(uname -m)
-OS_NAME=$(uname)
-UPPER_CPU_ARCH=$(tr '[:lower:]' '[:upper:]' <<< "$CPU_ARCH")
 
 mkdir -p $PLANE_INSTALL_DIR/archive
 DOCKER_FILE_PATH=$PLANE_INSTALL_DIR/docker-compose.yaml
 DOCKER_ENV_PATH=$PLANE_INSTALL_DIR/plane.env
 
-SED_PREFIX=()
-if [ "$OS_NAME" == "Darwin" ]; then
-  SED_PREFIX=("-i" "")
-else
-  SED_PREFIX=("-i")
-fi
-
 function print_header() {
 clear
 
@@ -60,12 +51,12 @@ function spinner() {
 }
 
 function initialize(){
-    printf "Please wait while we check the availability of Docker images for the selected release ($APP_RELEASE) with ${UPPER_CPU_ARCH} support." >&2
+    printf "Please wait while we check the availability of Docker images for the selected release ($APP_RELEASE) with ${CPU_ARCH^^} support." >&2
 
     if [ "$CUSTOM_BUILD" == "true" ]; then
         echo "" >&2
         echo "" >&2
-        echo "${UPPER_CPU_ARCH} images are not available for selected release ($APP_RELEASE)." >&2
+        echo "${CPU_ARCH^^} images are not available for selected release ($APP_RELEASE)." >&2
         echo "build"
         return 1
     fi
@@ -87,7 +78,7 @@ function initialize(){
     else
         echo "" >&2
         echo "" >&2
-        echo "${UPPER_CPU_ARCH} images are not available for selected release ($APP_RELEASE)." >&2
+        echo "${CPU_ARCH^^} images are not available for selected release ($APP_RELEASE)." >&2
         echo "" >&2
         echo "build"
         return 1
@@ -131,7 +122,7 @@ function updateEnvFile() {
             return
         else 
             # if key exists, update the value
-            sed "${SED_PREFIX[@]}" "s/^$key=.*/$key=$value/g" "$file"
+            sed -i "s/^$key=.*/$key=$value/g" "$file"
         fi
     else
         echo "File not found: $file"

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/ce/extensions/ai-features/handle.ts

@@ -1,13 +0,0 @@
-// extensions
-import { SideMenuHandleOptions, SideMenuPluginProps } from "@/extensions";
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export const AIHandlePlugin = (options: SideMenuPluginProps): SideMenuHandleOptions => {
-  const view = () => {};
-  const domEvents = {};
-
-  return {
-    view,
-    domEvents,
-  };
-};

packages/editor/src/ce/extensions/ai-features/index.ts

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

packages/editor/src/ce/extensions/document-extensions.tsx

@@ -1,14 +1,10 @@
-import { Extensions } from "@tiptap/core";
 import { SlashCommand } from "@/extensions";
 // hooks
 import { TFileHandler } from "@/hooks/use-editor";
 // plane editor types
 import { TIssueEmbedConfig } from "@/plane-editor/types";
-// types
-import { TExtensions } from "@/types";
 
 type Props = {
-  disabledExtensions?: TExtensions[];
   fileHandler: TFileHandler;
   issueEmbedConfig: TIssueEmbedConfig | undefined;
 };
@@ -16,7 +12,7 @@ type Props = {
 export const DocumentEditorAdditionalExtensions = (props: Props) => {
   const { fileHandler } = props;
 
-  const extensions: Extensions = [SlashCommand(fileHandler.upload)];
+  const extensions = [SlashCommand(fileHandler.upload)];
 
   return extensions;
 };

packages/editor/src/ce/extensions/index.ts

@@ -1,2 +1 @@
-export * from "./ai-features";
 export * from "./document-extensions";

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

@@ -1,28 +1,18 @@
-import React from "react";
+import React, { useState } from "react";
 // components
 import { PageRenderer } from "@/components/editors";
-// constants
-import { DEFAULT_DISPLAY_CONFIG } from "@/constants/config";
 // helpers
 import { getEditorClassNames } from "@/helpers/common";
 // hooks
 import { useDocumentEditor } from "@/hooks/use-document-editor";
+import { TFileHandler } from "@/hooks/use-editor";
 // plane editor types
 import { TEmbedConfig } from "@/plane-editor/types";
 // types
-import {
-  EditorRefApi,
-  IMentionHighlight,
-  IMentionSuggestion,
-  TDisplayConfig,
-  TExtensions,
-  TFileHandler,
-} from "@/types";
+import { EditorRefApi, IMentionHighlight, IMentionSuggestion } from "@/types";
 
 interface IDocumentEditor {
   containerClassName?: string;
-  disabledExtensions?: TExtensions[];
-  displayConfig?: TDisplayConfig;
   editorClassName?: string;
   embedHandler: TEmbedConfig;
   fileHandler: TFileHandler;
@@ -42,8 +32,6 @@ interface IDocumentEditor {
 const DocumentEditor = (props: IDocumentEditor) => {
   const {
     containerClassName,
-    disabledExtensions,
-    displayConfig = DEFAULT_DISPLAY_CONFIG,
     editorClassName = "",
     embedHandler,
     fileHandler,
@@ -56,10 +44,16 @@ const DocumentEditor = (props: IDocumentEditor) => {
     tabIndex,
     value,
   } = props;
+  // states
+  const [hideDragHandleOnMouseLeave, setHideDragHandleOnMouseLeave] = useState<() => void>(() => {});
+  // this essentially sets the hideDragHandle function from the DragAndDrop extension as the Plugin
+  // loads such that we can invoke it from react when the cursor leaves the container
+  const setHideDragHandleFunction = (hideDragHandlerFromDragDrop: () => void) => {
+    setHideDragHandleOnMouseLeave(() => hideDragHandlerFromDragDrop);
+  };
 
   // use document editor
   const { editor, isIndexedDbSynced } = useDocumentEditor({
-    disabledExtensions,
     id,
     editorClassName,
     embedHandler,
@@ -70,6 +64,7 @@ const DocumentEditor = (props: IDocumentEditor) => {
     forwardedRef,
     mentionHandler,
     placeholder,
+    setHideDragHandleFunction,
     tabIndex,
   });
 
@@ -83,11 +78,10 @@ const DocumentEditor = (props: IDocumentEditor) => {
 
   return (
     <PageRenderer
-      displayConfig={displayConfig}
+      tabIndex={tabIndex}
       editor={editor}
       editorContainerClassName={editorContainerClassNames}
-      id={id}
-      tabIndex={tabIndex}
+      hideDragHandle={hideDragHandleOnMouseLeave}
     />
   );
 };

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

@@ -16,19 +16,16 @@ import { Editor, ReactRenderer } from "@tiptap/react";
 import { EditorContainer, EditorContentWrapper } from "@/components/editors";
 import { LinkView, LinkViewProps } from "@/components/links";
 import { BlockMenu } from "@/components/menus";
-// types
-import { TDisplayConfig } from "@/types";
 
 type IPageRenderer = {
-  displayConfig: TDisplayConfig;
   editor: Editor;
   editorContainerClassName: string;
-  id: string;
+  hideDragHandle?: () => void;
   tabIndex?: number;
 };
 
 export const PageRenderer = (props: IPageRenderer) => {
-  const { displayConfig, editor, editorContainerClassName, id, tabIndex } = props;
+  const { tabIndex, editor, hideDragHandle, editorContainerClassName } = props;
   // states
   const [linkViewProps, setLinkViewProps] = useState<LinkViewProps>();
   const [isOpen, setIsOpen] = useState(false);
@@ -132,13 +129,12 @@ export const PageRenderer = (props: IPageRenderer) => {
     <>
       <div className="frame-renderer flex-grow w-full -mx-5" onMouseOver={handleLinkHover}>
         <EditorContainer
-          displayConfig={displayConfig}
           editor={editor}
+          hideDragHandle={hideDragHandle}
           editorContainerClassName={editorContainerClassName}
-          id={id}
         >
-          <EditorContentWrapper editor={editor} id={id} tabIndex={tabIndex} />
-          {editor.isEditable && <BlockMenu editor={editor} />}
+          <EditorContentWrapper tabIndex={tabIndex} editor={editor} />
+          {editor && editor.isEditable && <BlockMenu editor={editor} />}
         </EditorContainer>
       </div>
       {isOpen && linkViewProps && coordinates && (

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

@@ -1,8 +1,6 @@
 import { forwardRef, MutableRefObject } from "react";
 // components
 import { PageRenderer } from "@/components/editors";
-// constants
-import { DEFAULT_DISPLAY_CONFIG } from "@/constants/config";
 // extensions
 import { IssueWidget } from "@/extensions";
 // helpers
@@ -12,13 +10,11 @@ import { useReadOnlyEditor } from "@/hooks/use-read-only-editor";
 // plane web types
 import { TEmbedConfig } from "@/plane-editor/types";
 // types
-import { EditorReadOnlyRefApi, IMentionHighlight, TDisplayConfig } from "@/types";
+import { EditorReadOnlyRefApi, IMentionHighlight } from "@/types";
 
 interface IDocumentReadOnlyEditor {
-  id: string;
   initialValue: string;
   containerClassName: string;
-  displayConfig?: TDisplayConfig;
   editorClassName?: string;
   embedHandler: TEmbedConfig;
   tabIndex?: number;
@@ -32,10 +28,8 @@ interface IDocumentReadOnlyEditor {
 const DocumentReadOnlyEditor = (props: IDocumentReadOnlyEditor) => {
   const {
     containerClassName,
-    displayConfig = DEFAULT_DISPLAY_CONFIG,
     editorClassName = "",
     embedHandler,
-    id,
     initialValue,
     forwardedRef,
     tabIndex,
@@ -43,17 +37,17 @@ const DocumentReadOnlyEditor = (props: IDocumentReadOnlyEditor) => {
     mentionHandler,
   } = props;
   const editor = useReadOnlyEditor({
+    initialValue,
     editorClassName,
+    mentionHandler,
+    forwardedRef,
+    handleEditorReady,
     extensions: [
       embedHandler?.issue &&
         IssueWidget({
           widgetCallback: embedHandler?.issue.widgetCallback,
         }),
     ],
-    forwardedRef,
-    handleEditorReady,
-    initialValue,
-    mentionHandler,
   });
 
   if (!editor) {
@@ -64,15 +58,7 @@ const DocumentReadOnlyEditor = (props: IDocumentReadOnlyEditor) => {
     containerClassName,
   });
 
-  return (
-    <PageRenderer
-      displayConfig={displayConfig}
-      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

@@ -1,22 +1,17 @@
 import { FC, ReactNode } from "react";
 import { Editor } from "@tiptap/react";
-// constants
-import { DEFAULT_DISPLAY_CONFIG } from "@/constants/config";
 // helpers
 import { cn } from "@/helpers/common";
-// types
-import { TDisplayConfig } from "@/types";
 
 interface EditorContainerProps {
-  children: ReactNode;
-  displayConfig: TDisplayConfig;
   editor: Editor | null;
   editorContainerClassName: string;
-  id: string;
+  children: ReactNode;
+  hideDragHandle?: () => void;
 }
 
 export const EditorContainer: FC<EditorContainerProps> = (props) => {
-  const { children, displayConfig, editor, editorContainerClassName, id } = props;
+  const { editor, editorContainerClassName, hideDragHandle, children } = props;
 
   const handleContainerClick = () => {
     if (!editor) return;
@@ -57,25 +52,16 @@ export const EditorContainer: FC<EditorContainerProps> = (props) => {
     }
   };
 
-  const handleContainerMouseLeave = () => {
-    const dragHandleElement = document.querySelector("#editor-side-menu");
-    if (!dragHandleElement?.classList.contains("side-menu-hidden")) {
-      dragHandleElement?.classList.add("side-menu-hidden");
-    }
-  };
-
   return (
     <div
-      id={`editor-container-${id}`}
+      id="editor-container"
       onClick={handleContainerClick}
-      onMouseLeave={handleContainerMouseLeave}
+      onMouseLeave={hideDragHandle}
       className={cn(
-        "editor-container cursor-text relative",
+        "cursor-text relative",
         {
           "active-editor": editor?.isFocused && editor?.isEditable,
         },
-        displayConfig.fontSize ?? DEFAULT_DISPLAY_CONFIG.fontSize,
-        displayConfig.fontStyle ?? DEFAULT_DISPLAY_CONFIG.fontStyle,
         editorContainerClassName
       )}
     >

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

@@ -1,8 +1,6 @@
 import { Editor, Extension } from "@tiptap/core";
 // components
 import { EditorContainer } from "@/components/editors";
-// constants
-import { DEFAULT_DISPLAY_CONFIG } from "@/constants/config";
 // hooks
 import { getEditorClassNames } from "@/helpers/common";
 import { useEditor } from "@/hooks/use-editor";
@@ -13,16 +11,17 @@ import { EditorContentWrapper } from "./editor-content";
 type Props = IEditorProps & {
   children?: (editor: Editor) => React.ReactNode;
   extensions: Extension<any, any>[];
+  hideDragHandleOnMouseLeave: () => void;
 };
 
 export const EditorWrapper: React.FC<Props> = (props) => {
   const {
     children,
     containerClassName,
-    displayConfig = DEFAULT_DISPLAY_CONFIG,
     editorClassName = "",
     extensions,
-    id,
+    hideDragHandleOnMouseLeave,
+    id = "",
     initialValue,
     fileHandler,
     forwardedRef,
@@ -58,14 +57,13 @@ export const EditorWrapper: React.FC<Props> = (props) => {
 
   return (
     <EditorContainer
-      displayConfig={displayConfig}
+      hideDragHandle={hideDragHandleOnMouseLeave}
       editor={editor}
       editorContainerClassName={editorContainerClassName}
-      id={id}
     >
       {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/lite-text/editor.tsx

@@ -11,7 +11,7 @@ const LiteTextEditor = (props: ILiteTextEditor) => {
 
   const extensions = [EnterKeyExtension(onEnterKeyPress)];
 
-  return <EditorWrapper {...props} extensions={extensions} />;
+  return <EditorWrapper {...props} extensions={extensions} hideDragHandleOnMouseLeave={() => {}} />;
 };
 
 const LiteTextEditorWithRef = forwardRef<EditorRefApi, ILiteTextEditor>((props, ref) => (

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

@@ -1,7 +1,5 @@
 // components
 import { EditorContainer, EditorContentWrapper } from "@/components/editors";
-// constants
-import { DEFAULT_DISPLAY_CONFIG } from "@/constants/config";
 // helpers
 import { getEditorClassNames } from "@/helpers/common";
 // hooks
@@ -10,20 +8,12 @@ import { useReadOnlyEditor } from "@/hooks/use-read-only-editor";
 import { IReadOnlyEditorProps } from "@/types";
 
 export const ReadOnlyEditorWrapper = (props: IReadOnlyEditorProps) => {
-  const {
-    containerClassName,
-    displayConfig = DEFAULT_DISPLAY_CONFIG,
-    editorClassName = "",
-    id,
-    initialValue,
-    forwardedRef,
-    mentionHandler,
-  } = props;
+  const { containerClassName, editorClassName = "", initialValue, forwardedRef, mentionHandler } = props;
 
   const editor = useReadOnlyEditor({
+    initialValue,
     editorClassName,
     forwardedRef,
-    initialValue,
     mentionHandler,
   });
 
@@ -34,14 +24,9 @@ export const ReadOnlyEditorWrapper = (props: IReadOnlyEditorProps) => {
   if (!editor) return null;
 
   return (
-    <EditorContainer
-      displayConfig={displayConfig}
-      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/components/editors/rich-text/editor.tsx

@@ -1,30 +1,37 @@
-import { forwardRef, useCallback } from "react";
+import { forwardRef, useCallback, useState } from "react";
 // components
 import { EditorWrapper } from "@/components/editors";
 import { EditorBubbleMenu } from "@/components/menus";
 // extensions
-import { SideMenuExtension, SlashCommand } from "@/extensions";
+import { DragAndDrop, SlashCommand } from "@/extensions";
 // types
 import { EditorRefApi, IRichTextEditor } from "@/types";
 
 const RichTextEditor = (props: IRichTextEditor) => {
   const { dragDropEnabled, fileHandler } = props;
+  // states
+  const [hideDragHandleOnMouseLeave, setHideDragHandleOnMouseLeave] = useState<() => void>(() => {});
+
+  // this essentially sets the hideDragHandle function from the DragAndDrop extension as the Plugin
+  // loads such that we can invoke it from react when the cursor leaves the container
+  const setHideDragHandleFunction = (hideDragHandlerFromDragDrop: () => void) => {
+    setHideDragHandleOnMouseLeave(() => hideDragHandlerFromDragDrop);
+  };
 
   const getExtensions = useCallback(() => {
-    const extensions = [SlashCommand(fileHandler.upload)];
+    const extensions = [
+      SlashCommand(fileHandler.upload),
+      // TODO; add the extension conditionally for forms that don't require it
+      // EnterKeyExtension(onEnterKeyPress),
+    ];
 
-    extensions.push(
-      SideMenuExtension({
-        aiEnabled: false,
-        dragDropEnabled: !!dragDropEnabled,
-      })
-    );
+    if (dragDropEnabled) extensions.push(DragAndDrop(setHideDragHandleFunction));
 
     return extensions;
   }, [dragDropEnabled, fileHandler.upload]);
 
   return (
-    <EditorWrapper {...props} extensions={getExtensions()}>
+    <EditorWrapper {...props} extensions={getExtensions()} hideDragHandleOnMouseLeave={hideDragHandleOnMouseLeave}>
       {(editor) => <>{editor && <EditorBubbleMenu editor={editor} />}</>}
     </EditorWrapper>
   );

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

@@ -14,7 +14,7 @@ export const BlockMenu = (props: BlockMenuProps) => {
 
   const handleClickDragHandle = useCallback((event: MouseEvent) => {
     const target = event.target as HTMLElement;
-    if (target.matches("#drag-handle")) {
+    if (target.matches(".drag-handle-dots") || target.matches(".drag-handle-dot")) {
       event.preventDefault();
 
       popup.current?.setProps({

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

@@ -1,7 +0,0 @@
-// types
-import { TDisplayConfig } from "@/types";
-
-export const DEFAULT_DISPLAY_CONFIG: TDisplayConfig = {
-  fontSize: "large-font",
-  fontStyle: "sans-serif",
-};

packages/editor/src/core/extensions/code/code-block-node-view.tsx

@@ -56,7 +56,7 @@ export const CodeBlockComponent: React.FC<CodeBlockComponentProps> = ({ node })
       </Tooltip>
 
       <pre className="bg-custom-background-90 text-custom-text-100 rounded-lg p-4 my-2">
-        <NodeViewContent as="code" className="whitespace-pre-wrap" />
+        <NodeViewContent as="code" className="whitespace-[pre-wrap]" />
       </pre>
     </NodeViewWrapper>
   );