Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion apps/api/plane/app/serializers/issue.py
Original file line number Diff line number Diff line change
Expand Up @@ -908,9 +908,14 @@ class Meta:
class IssueDetailSerializer(IssueSerializer):
description_html = serializers.CharField()
is_subscribed = serializers.BooleanField(read_only=True)
is_intake = serializers.BooleanField(read_only=True)

class Meta(IssueSerializer.Meta):
fields = IssueSerializer.Meta.fields + ["description_html", "is_subscribed"]
fields = IssueSerializer.Meta.fields + [
"description_html",
"is_subscribed",
"is_intake",
]
read_only_fields = fields


Expand Down
13 changes: 12 additions & 1 deletion apps/api/plane/app/views/issue/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
IssueRelation,
IssueAssignee,
IssueLabel,
IntakeIssue,
)
from plane.utils.grouper import (
issue_group_values,
Expand Down Expand Up @@ -1223,7 +1224,7 @@ def get(self, request, slug, project_identifier, issue_identifier):

# Fetch the issue
issue = (
Issue.issue_objects.filter(project_id=project.id)
Issue.objects.filter(project_id=project.id)
.filter(workspace__slug=slug)
.select_related("workspace", "project", "state", "parent")
.prefetch_related("assignees", "labels", "issue_module__module")
Expand Down Expand Up @@ -1315,6 +1316,16 @@ def get(self, request, slug, project_identifier, issue_identifier):
)
)
)
.annotate(
is_intake=Exists(
IntakeIssue.objects.filter(
issue=OuterRef("id"),
status__in=[-2, 0],
workspace__slug=slug,
project_id=project.id,
)
)
)
).first()

# Check if the issue exists
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ const IssueDetailsPage = observer(() => {
return () => window.removeEventListener("resize", handleToggleIssueDetailSidebar);
}, [issueDetailSidebarCollapsed, toggleIssueDetailSidebar]);

useEffect(() => {
if (data?.is_intake) {
router.push(`/${workspaceSlug}/projects/${data.project_id}/intake/?currentTab=open&inboxIssueId=${data?.id}`);
}
}, [workspaceSlug, data]);

return (
<>
<PageHead title={pageTitle} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ export const InboxIssueActionsHeader: FC<TInboxIssueActionsHeader> = observer((p

const currentInboxIssueId = inboxIssue?.issue?.id;

const intakeIssueLink = `${workspaceSlug}/projects/${issue?.project_id}/intake/?currentTab=${currentTab}&inboxIssueId=${currentInboxIssueId}`;

const redirectIssue = (): string | undefined => {
let nextOrPreviousIssueId: string | undefined = undefined;
Expand Down Expand Up @@ -413,7 +412,7 @@ export const InboxIssueActionsHeader: FC<TInboxIssueActionsHeader> = observer((p
</div>
</CustomMenu.MenuItem>
)}
<CustomMenu.MenuItem onClick={() => handleCopyIssueLink(intakeIssueLink)}>
<CustomMenu.MenuItem onClick={() => handleCopyIssueLink(workItemLink)}>
<div className="flex items-center gap-2">
<Copy size={14} strokeWidth={2} />
{t("inbox_issue.actions.copy")}
Expand Down
1 change: 1 addition & 0 deletions packages/types/src/issues/issue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ export type TBaseIssue = {

is_draft: boolean;
is_epic?: boolean;
is_intake?: boolean;
};

export type IssueRelation = {
Expand Down
Loading