Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

[WEB-1983] fix: intake cycle and module operation and intake api updated (#5155)

Bavisetti Narayanae45ff158a44
diff --git a/apiserver/plane/api/views/inbox.py b/apiserver/plane/api/views/inbox.py
index 43c9d56521..dc74e0f0cb 100644
--- a/apiserver/plane/api/views/inbox.py
+++ b/apiserver/plane/api/views/inbox.py
@@ -3,8 +3,11 @@ import json
# Django improts
from django.core.serializers.json import DjangoJSONEncoder
-from django.db.models import Q
from django.utils import timezone
+from django.db.models import Q, Value, UUIDField
+from django.db.models.functions import Coalesce
+from django.contrib.postgres.aggregates import ArrayAgg
+from django.contrib.postgres.fields import ArrayField
# Third party imports
from rest_framework import status
@@ -224,8 +227,27 @@ class InboxIssueAPIEndpoint(BaseAPIView):
issue_data = request.data.pop("issue", False)
if bool(issue_data):
- issue = Issue.objects.get(
- pk=issue_id, workspace__slug=slug, project_id=project_id
+ issue = Issue.objects.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),
+ ),
+ Value([], output_field=ArrayField(UUIDField())),
+ ),
+ ).get(
+ pk=issue_id,
+ workspace__slug=slug,
+ project_id=project_id,
)
# Only allow guests and viewers to edit name and description
if project_member.role <= 10:
diff --git a/web/core/store/inbox/inbox-issue.store.ts b/web/core/store/inbox/inbox-issue.store.ts
index bd9c2dd297..8d33fddeec 100644
--- a/web/core/store/inbox/inbox-issue.store.ts
+++ b/web/core/store/inbox/inbox-issue.store.ts
@@ -176,6 +176,21 @@ export class InboxIssueStore implements IInboxIssueStore {
set(this.issue, issueKey, issue[issueKey]);
});
await this.issueService.patchIssue(this.workspaceSlug, this.projectId, this.issue.id, issue);
+ if (issue.cycle_id) {
+ await this.store.issue.issueDetail.addIssueToCycle(this.workspaceSlug, this.projectId, issue.cycle_id, [
+ this.issue.id,
+ ]);
+ }
+ if (issue.module_ids) {
+ await this.store.issue.issueDetail.changeModulesInIssue(
+ this.workspaceSlug,
+ this.projectId,
+ this.issue.id,
+ issue.module_ids,
+ []
+ );
+ }
+
// fetching activity
this.fetchIssueActivity();
} catch {