[WEB-2388] dev: workspace draft issues

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

@@ -44,18 +44,11 @@
 
 
 class WorkspaceDraftIssueViewSet(BaseViewSet):
-
     model = DraftIssue
 
-    @method_decorator(gzip_page)
-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE"
-    )
-    def list(self, request, slug):
-        filters = issue_filters(request.query_params, "GET")
-        issues = (
-            DraftIssue.objects.filter(workspace__slug=slug)
-            .filter(created_by=request.user)
+    def get_queryset(self):
+        return (
+            DraftIssue.objects.filter(workspace__slug=self.kwargs.get("slug"))
             .select_related("workspace", "project", "state", "parent")
             .prefetch_related(
                 "assignees", "labels", "draft_issue_module__module"
@@ -91,6 +84,17 @@ def list(self, request, slug):
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
             )
+        ).distinct()
+
+    @method_decorator(gzip_page)
+    @allow_permission(
+        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE"
+    )
+    def list(self, request, slug):
+        filters = issue_filters(request.query_params, "GET")
+        issues = (
+            self.get_queryset()
+            .filter(created_by=request.user)
             .order_by("-created_at")
         )
 
@@ -120,7 +124,34 @@ def create(self, request, slug):
         )
         if serializer.is_valid():
             serializer.save()
-            return Response(serializer.data, status=status.HTTP_201_CREATED)
+            issue = (
+                self.get_queryset()
+                .filter(pk=serializer.data.get("id"))
+                .values(
+                    "id",
+                    "name",
+                    "state_id",
+                    "sort_order",
+                    "completed_at",
+                    "estimate_point",
+                    "priority",
+                    "start_date",
+                    "target_date",
+                    "project_id",
+                    "parent_id",
+                    "cycle_id",
+                    "module_ids",
+                    "label_ids",
+                    "assignee_ids",
+                    "created_at",
+                    "updated_at",
+                    "created_by",
+                    "updated_by",
+                )
+                .first()
+            )
+
+            return Response(issue, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     @allow_permission(
@@ -131,45 +162,7 @@ def create(self, request, slug):
     )
     def partial_update(self, request, slug, pk):
         issue = (
-            DraftIssue.objects.filter(workspace__slug=slug)
-            .filter(pk=pk)
-            .filter(created_by=request.user)
-            .select_related("workspace", "project", "state", "parent")
-            .prefetch_related(
-                "assignees", "labels", "draft_issue_module__module"
-            )
-            .annotate(cycle_id=F("draft_issue_cycle__cycle_id"))
-            .annotate(
-                label_ids=Coalesce(
-                    ArrayAgg(
-                        "labels__id",
-                        distinct=True,
-                        filter=~Q(labels__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "assignees__id",
-                        distinct=True,
-                        filter=~Q(assignees__id__isnull=True)
-                        & Q(assignees__member_project__is_active=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                module_ids=Coalesce(
-                    ArrayAgg(
-                        "draft_issue_module__module_id",
-                        distinct=True,
-                        filter=~Q(draft_issue_module__module_id__isnull=True)
-                        & Q(
-                            draft_issue_module__module__archived_at__isnull=True
-                        ),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-            )
-            .first()
+            self.get_queryset().filter(pk=pk, created_by=request.user).first()
         )
 
         if not issue:
@@ -202,46 +195,8 @@ def partial_update(self, request, slug, pk):
     )
     def retrieve(self, request, slug, pk=None):
         issue = (
-            DraftIssue.objects.filter(workspace__slug=slug)
-            .filter(pk=pk)
-            .filter(created_by=request.user)
-            .select_related("workspace", "project", "state", "parent")
-            .prefetch_related(
-                "assignees", "labels", "draft_issue_module__module"
-            )
-            .annotate(cycle_id=F("draft_issue_cycle__cycle_id"))
-            .filter(pk=pk)
-            .annotate(
-                label_ids=Coalesce(
-                    ArrayAgg(
-                        "labels__id",
-                        distinct=True,
-                        filter=~Q(labels__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "assignees__id",
-                        distinct=True,
-                        filter=~Q(assignees__id__isnull=True)
-                        & Q(assignees__member_project__is_active=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                module_ids=Coalesce(
-                    ArrayAgg(
-                        "draft_issue_module__module_id",
-                        distinct=True,
-                        filter=~Q(draft_issue_module__module_id__isnull=True)
-                        & Q(
-                            draft_issue_module__module__archived_at__isnull=True
-                        ),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-            )
-        ).first()
+            self.get_queryset().filter(pk=pk, created_by=request.user).first()
+        )
 
         if not issue:
             return Response(
@@ -268,42 +223,7 @@ def destroy(self, request, slug, pk=None):
         level="WORKSPACE",
     )
     def create_draft_to_issue(self, request, slug, draft_id):
-        draft_issue = (
-            DraftIssue.objects.filter(workspace__slug=slug, pk=draft_id)
-            .annotate(cycle_id=F("draft_issue_cycle__cycle_id"))
-            .annotate(
-                label_ids=Coalesce(
-                    ArrayAgg(
-                        "labels__id",
-                        distinct=True,
-                        filter=~Q(labels__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "assignees__id",
-                        distinct=True,
-                        filter=~Q(assignees__id__isnull=True)
-                        & Q(assignees__member_project__is_active=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                module_ids=Coalesce(
-                    ArrayAgg(
-                        "draft_issue_module__module_id",
-                        distinct=True,
-                        filter=~Q(draft_issue_module__module_id__isnull=True)
-                        & Q(
-                            draft_issue_module__module__archived_at__isnull=True
-                        ),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-            )
-            .select_related("project", "workspace")
-            .first()
-        )
+        draft_issue = self.get_queryset().filter(pk=draft_id).first()
 
         if not draft_issue.project_id:
             return Response(

apiserver/plane/utils/paginator.py

@@ -150,7 +150,7 @@ def get_result(self, limit=1000, cursor=None):
             raise BadPaginationError("Pagination offset cannot be negative")
 
         results = queryset[offset:stop]
-
+        print(limit, "limit")
         if cursor.value != limit:
             results = results[-(limit + 1) :]
 
@@ -761,7 +761,7 @@ def paginate(
     ):
         """Paginate the request"""
         per_page = self.get_per_page(request, default_per_page, max_per_page)
-
+        print(per_page, "per_page")
         # Convert the cursor value to integer and float from string
         input_cursor = None
         try:
@@ -788,6 +788,7 @@ def paginate(
             paginator = paginator_cls(**paginator_kwargs)
 
         try:
+            print(per_page, "per_page 2")
             cursor_result = paginator.get_result(
                 limit=per_page, cursor=input_cursor
             )

packages/types/src/index.d.ts

@@ -29,3 +29,4 @@ export * from "./pragmatic";
 export * from "./publish";
 export * from "./workspace-notifications";
 export * from "./favorite";
+export * from "./workspace-draft-issues/base";

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

@@ -10,6 +10,7 @@ export * from "./issue_relation";
 export * from "./issue_sub_issues";
 export * from "./activity/base";
 
+
 export type TLoader =
   | "init-loader"
   | "mutation"

packages/types/src/workspace-draft-issues/base.d.ts

@@ -0,0 +1,61 @@
+import { TIssuePriorities } from "../issues";
+
+export type TWorkspaceDraftIssue = {
+  id: string;
+  name: string;
+  sort_order: number;
+
+  state_id: string | undefined;
+  priority: TIssuePriorities | undefined;
+  label_ids: string[];
+  assignee_ids: string[];
+  estimate_point: string | undefined;
+
+  project_id: string | undefined;
+  parent_id: string | undefined;
+  cycle_id: string | undefined;
+  module_ids: string[] | undefined;
+
+  start_date: string | undefined;
+  target_date: string | undefined;
+  completed_at: string | undefined;
+
+  created_at: string;
+  updated_at: string;
+  created_by: string;
+  updated_by: string;
+
+  is_draft: boolean;
+};
+
+export type TWorkspaceDraftPaginationInfo<T> = {
+  next_cursor: string | undefined;
+  prev_cursor: string | undefined;
+  next_page_results: boolean | undefined;
+  prev_page_results: boolean | undefined;
+  total_pages: number | undefined;
+  count: number | undefined; // current paginated results count
+  total_count: number | undefined; // total available results count
+  total_results: number | undefined;
+  results: T[] | undefined;
+  extra_stats: string | undefined;
+  grouped_by: string | undefined;
+  sub_grouped_by: string | undefined;
+};
+
+export type TWorkspaceDraftQueryParams = {
+  per_page: number;
+  cursor: string;
+};
+
+export type TWorkspaceDraftIssueLoader =
+  | "init-loader"
+  | "empty-state"
+  | "mutation"
+  | "pagination"
+  | "loaded"
+  | "create"
+  | "update"
+  | "delete"
+  | "move"
+  | undefined;

web/app/[workspaceSlug]/(projects)/drafts/header.tsx

@@ -0,0 +1,62 @@
+"use client";
+
+import { FC, useState } from "react";
+import { observer } from "mobx-react";
+import { PenSquare } from "lucide-react";
+// ui
+import { Breadcrumbs, Button, Header } from "@plane/ui";
+// components
+import { BreadcrumbLink } from "@/components/common";
+import { CreateUpdateIssueModal } from "@/components/issues";
+// constants
+import { EIssuesStoreType } from "@/constants/issue";
+// hooks
+import { useUserPermissions } from "@/hooks/store";
+// plane-web
+import { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants/user-permissions";
+
+export const WorkspaceDraftHeader: FC = observer(() => {
+  // state
+  const [isDraftIssueModalOpen, setIsDraftIssueModalOpen] = useState(false);
+  // store hooks
+  const { allowPermissions } = useUserPermissions();
+
+  // check if user is authorized to create draft issue
+  const isAuthorizedUser = allowPermissions(
+    [EUserPermissions.ADMIN, EUserPermissions.MEMBER],
+    EUserPermissionsLevel.WORKSPACE
+  );
+
+  return (
+    <>
+      <CreateUpdateIssueModal
+        isOpen={isDraftIssueModalOpen}
+        storeType={EIssuesStoreType.WORKSPACE_DRAFT}
+        onClose={() => setIsDraftIssueModalOpen(false)}
+        isDraft
+      />
+      <Header>
+        <Header.LeftItem>
+          <Breadcrumbs>
+            <Breadcrumbs.BreadcrumbItem
+              type="text"
+              link={<BreadcrumbLink label={`Draft`} icon={<PenSquare className="h-4 w-4 text-custom-text-300" />} />}
+            />
+          </Breadcrumbs>
+        </Header.LeftItem>
+
+        <Header.RightItem>
+          <Button
+            variant="primary"
+            size="sm"
+            className="items-center gap-1"
+            onClick={() => setIsDraftIssueModalOpen(true)}
+            disabled={!isAuthorizedUser}
+          >
+            Draft <span className="hidden sm:inline-block">issue</span>
+          </Button>
+        </Header.RightItem>
+      </Header>
+    </>
+  );
+});

web/app/[workspaceSlug]/(projects)/drafts/layout.tsx

@@ -0,0 +1,13 @@
+"use client";
+
+import { AppHeader, ContentWrapper } from "@/components/core";
+import { WorkspaceDraftHeader } from "./header";
+
+export default function WorkspaceDraftLayout({ children }: { children: React.ReactNode }) {
+  return (
+    <>
+      <AppHeader header={<WorkspaceDraftHeader />} />
+      <ContentWrapper>{children}</ContentWrapper>
+    </>
+  );
+}