π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[WEB-4726] fix: intake work item redirection (#7619)
Anmol Singh Bhatiad0f26f873476
diff --git a/apps/api/plane/app/serializers/issue.py b/apps/api/plane/app/serializers/issue.pyindex d002de3390..691140eba0 100644--- a/apps/api/plane/app/serializers/issue.py+++ b/apps/api/plane/app/serializers/issue.py@@ -908,9 +908,14 @@ class IssueLiteSerializer(DynamicBaseSerializer):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 = fieldsdiff --git a/apps/api/plane/app/views/issue/base.py b/apps/api/plane/app/views/issue/base.pyindex 21e5eaf709..4d0d4457ea 100644--- a/apps/api/plane/app/views/issue/base.py+++ b/apps/api/plane/app/views/issue/base.py@@ -51,6 +51,7 @@ from plane.db.models import (IssueRelation,IssueAssignee,IssueLabel,+ IntakeIssue,)from plane.utils.grouper import (issue_group_values,@@ -1223,7 +1224,7 @@ class IssueDetailIdentifierEndpoint(BaseAPIView):# Fetch the issueissue = (- 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")@@ -1315,6 +1316,16 @@ class IssueDetailIdentifierEndpoint(BaseAPIView):)))+ .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 existsdiff --git a/apps/web/app/(all)/[workspaceSlug]/(projects)/browse/[workItem]/page.tsx b/apps/web/app/(all)/[workspaceSlug]/(projects)/browse/[workItem]/page.tsxindex 1d24faa46c..dabb43eb7c 100644--- a/apps/web/app/(all)/[workspaceSlug]/(projects)/browse/[workItem]/page.tsx+++ b/apps/web/app/(all)/[workspaceSlug]/(projects)/browse/[workItem]/page.tsx@@ -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} />diff --git a/apps/web/core/components/inbox/content/inbox-issue-header.tsx b/apps/web/core/components/inbox/content/inbox-issue-header.tsxindex e379c869c2..c42e6a747e 100644--- a/apps/web/core/components/inbox/content/inbox-issue-header.tsx+++ b/apps/web/core/components/inbox/content/inbox-issue-header.tsx@@ -104,7 +104,6 @@ export const InboxIssueActionsHeader: FC<TInboxIssueActionsHeader> = observer((pconst 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;@@ -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")}diff --git a/packages/types/src/issues/issue.ts b/packages/types/src/issues/issue.tsindex 33470b4829..f2adb48110 100644--- a/packages/types/src/issues/issue.ts+++ b/packages/types/src/issues/issue.ts@@ -70,6 +70,7 @@ export type TBaseIssue = {is_draft: boolean;is_epic?: boolean;+ is_intake?: boolean;};export type IssueRelation = {