ФУНКЦИИ - МЕЖПРОЕКТНАЯ КОММУНИКАЦИЯ: трассировка source-target в карточке запроса

This commit is contained in:
DCCONSTRUCTIONS
2026-04-18 22:01:48 +03:00
parent fb33f093de
commit 2ee6d8559c
7 changed files with 192 additions and 0 deletions
@@ -78,6 +78,12 @@ class ExternalContourIssueSerializer(BaseSerializer):
class ExternalContourRequestSerializer(BaseSerializer):
issue = ExternalContourIssueSerializer(read_only=True)
source_project_id = serializers.SerializerMethodField()
source_project_name = serializers.SerializerMethodField()
target_project_id = serializers.SerializerMethodField()
target_project_name = serializers.SerializerMethodField()
requested_by_id = serializers.SerializerMethodField()
requested_by_name = serializers.SerializerMethodField()
requested_at = serializers.SerializerMethodField()
status = serializers.SerializerMethodField()
class Meta:
@@ -89,6 +95,12 @@ class ExternalContourRequestSerializer(BaseSerializer):
"created_by",
"issue",
"source_project_id",
"source_project_name",
"target_project_id",
"target_project_name",
"requested_by_id",
"requested_by_name",
"requested_at",
"status",
]
read_only_fields = fields
@@ -96,6 +108,44 @@ class ExternalContourRequestSerializer(BaseSerializer):
def get_source_project_id(self, obj):
return obj.extra.get("source_project_id")
def get_source_project_name(self, obj):
return obj.extra.get("source_project_name")
def get_target_project_id(self, obj):
target_project_id = obj.extra.get("target_project_id")
if target_project_id:
return target_project_id
if obj.issue and obj.issue.project_id:
return str(obj.issue.project_id)
return None
def get_target_project_name(self, obj):
target_project_name = obj.extra.get("target_project_name")
if target_project_name:
return target_project_name
if obj.issue and obj.issue.project:
return obj.issue.project.name
return None
def get_requested_by_id(self, obj):
requested_by_id = obj.extra.get("requested_by_id")
if requested_by_id:
return requested_by_id
if obj.created_by_id:
return str(obj.created_by_id)
return None
def get_requested_by_name(self, obj):
return obj.extra.get("requested_by_name")
def get_requested_at(self, obj):
requested_at = obj.extra.get("requested_at")
if requested_at:
return requested_at
if obj.created_at:
return obj.created_at.isoformat()
return None
def get_status(self, obj):
issue = obj.issue
if issue and issue.state and issue.state.group in ["completed", "cancelled"]:
@@ -29,6 +29,7 @@ import { useDebouncedDuplicateIssues } from "@/plane-web/hooks/use-debounced-dup
import { IssueService } from "@/services/issue/issue.service";
import { WorkItemVersionService } from "@/services/issue/work_item_version.service";
import { ExternalContoursIssueContentProperties } from "./issue-properties";
import { ExternalContoursRequestTraceability } from "./request-traceability";
const workItemVersionService = new WorkItemVersionService();
const issueService = new IssueService();
@@ -174,6 +175,10 @@ export const ExternalContoursIssueMainContent = observer(function ExternalContou
</div>
</div>
<div className="py-4">
<ExternalContoursRequestTraceability contourRequest={contourRequest} />
</div>
<div className="py-4">
<IssueAttachmentRoot workspaceSlug={workspaceSlug} projectId={targetProjectId} issueId={issue.id} disabled={!isEditable} />
</div>
@@ -0,0 +1,92 @@
/**
* Copyright (c) 2023-present Plane Software, Inc. and contributors
* SPDX-License-Identifier: AGPL-3.0-only
* See the LICENSE file for details.
*/
import { observer } from "mobx-react";
import { useTranslation } from "@plane/i18n";
import { Badge } from "@plane/propel/badge";
import type { TExternalContourRequest } from "@plane/types";
import { Avatar } from "@plane/ui";
import { renderFormattedDate } from "@plane/utils";
import { ExternalContourStatePill } from "./state-pill";
type Props = {
contourRequest: TExternalContourRequest;
};
export const ExternalContoursRequestTraceability = observer(function ExternalContoursRequestTraceability(props: Props) {
const { contourRequest } = props;
const { t } = useTranslation();
const issue = contourRequest.issue;
const requestedByName = contourRequest.requested_by_name || issue.created_by_detail?.display_name || t("common.none");
const requestedAt = contourRequest.requested_at || contourRequest.created_at;
const targetProjectName = contourRequest.target_project_name || issue.project_detail?.name || t("common.none");
const targetIssueKey =
issue.project_detail?.identifier && issue.sequence_id
? `${issue.project_detail.identifier}-${issue.sequence_id}`
: issue.sequence_id
? `#${issue.sequence_id}`
: t("common.none");
return (
<div className="rounded-lg border border-subtle bg-surface-2 p-4">
<div className="mb-3">
<h5 className="text-body-sm-medium">{t("external_contours_page.traceability.title")}</h5>
<p className="mt-1 text-12 text-tertiary">{t("external_contours_page.traceability.description")}</p>
</div>
<div className="grid gap-3 md:grid-cols-2 xl:grid-cols-3">
<div className="rounded-md border border-subtle bg-surface-1 p-3">
<div className="text-11 font-medium text-tertiary">{t("external_contours_page.traceability.source_contour")}</div>
<div className="mt-1 text-13 font-medium text-secondary">
{contourRequest.source_project_name || t("common.none")}
</div>
</div>
<div className="rounded-md border border-subtle bg-surface-1 p-3">
<div className="text-11 font-medium text-tertiary">{t("external_contours_page.traceability.target_contour")}</div>
<div className="mt-1 flex items-center gap-2">
<Badge variant="neutral">{targetProjectName}</Badge>
</div>
</div>
<div className="rounded-md border border-subtle bg-surface-1 p-3">
<div className="text-11 font-medium text-tertiary">{t("external_contours_page.traceability.status")}</div>
<div className="mt-1">
<ExternalContourStatePill request={contourRequest} />
</div>
</div>
<div className="rounded-md border border-subtle bg-surface-1 p-3">
<div className="text-11 font-medium text-tertiary">{t("external_contours_page.traceability.requested_by")}</div>
<div className="mt-1 flex items-center gap-2">
<Avatar
src={issue.created_by_detail?.avatar_url || ""}
name={requestedByName}
size="md"
showTooltip
/>
<span className="text-13 font-medium text-secondary">{requestedByName}</span>
</div>
</div>
<div className="rounded-md border border-subtle bg-surface-1 p-3">
<div className="text-11 font-medium text-tertiary">{t("external_contours_page.traceability.requested_at")}</div>
<div className="mt-1 text-13 font-medium text-secondary">
{requestedAt ? renderFormattedDate(requestedAt) : t("common.none")}
</div>
</div>
<div className="rounded-md border border-subtle bg-surface-1 p-3">
<div className="text-11 font-medium text-tertiary">{t("external_contours_page.traceability.linked_item")}</div>
<div className="mt-1 flex items-center gap-2">
<Badge variant="neutral">{targetIssueKey}</Badge>
</div>
</div>
</div>
</div>
);
});