[WEB-3352] fix: home recent item redirection (#6586)
* fix: dashboard recent item redirection * chore: code refactor
This commit is contained in:
parent
7ae841d525
commit
ac74cd9e92
3 changed files with 15 additions and 4 deletions
|
|
@ -24,12 +24,16 @@ export const RecentIssue = (props: BlockProps) => {
|
||||||
const { setPeekIssue } = useIssueDetail();
|
const { setPeekIssue } = useIssueDetail();
|
||||||
// derived values
|
// derived values
|
||||||
const issueDetails: TIssueEntityData = activity.entity_data as TIssueEntityData;
|
const issueDetails: TIssueEntityData = activity.entity_data as TIssueEntityData;
|
||||||
|
|
||||||
|
if (!issueDetails) return <></>;
|
||||||
|
|
||||||
const state = getStateById(issueDetails?.state);
|
const state = getStateById(issueDetails?.state);
|
||||||
|
const workItemLink = `/${workspaceSlug}/projects/${issueDetails?.project_id}/issues/${issueDetails.id}`;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ListItem
|
<ListItem
|
||||||
key={activity.id}
|
key={activity.id}
|
||||||
itemLink=""
|
itemLink={workItemLink}
|
||||||
title={issueDetails?.name}
|
title={issueDetails?.name}
|
||||||
prependTitleElement={
|
prependTitleElement={
|
||||||
<div className="flex-shrink-0 flex items-center gap-2">
|
<div className="flex-shrink-0 flex items-center gap-2">
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,9 @@ export const RecentPage = (props: BlockProps) => {
|
||||||
const { getUserDetails } = useMember();
|
const { getUserDetails } = useMember();
|
||||||
// derived values
|
// derived values
|
||||||
const pageDetails = activity.entity_data as TPageEntityData;
|
const pageDetails = activity.entity_data as TPageEntityData;
|
||||||
|
|
||||||
|
if (!pageDetails) return <></>;
|
||||||
|
|
||||||
const ownerDetails = getUserDetails(pageDetails?.owned_by);
|
const ownerDetails = getUserDetails(pageDetails?.owned_by);
|
||||||
const pageLink = pageDetails.project_id
|
const pageLink = pageDetails.project_id
|
||||||
? `/${workspaceSlug}/projects/${pageDetails.project_id}/pages/${pageDetails.id}`
|
? `/${workspaceSlug}/projects/${pageDetails.project_id}/pages/${pageDetails.id}`
|
||||||
|
|
@ -36,7 +39,7 @@ export const RecentPage = (props: BlockProps) => {
|
||||||
return (
|
return (
|
||||||
<ListItem
|
<ListItem
|
||||||
key={activity.id}
|
key={activity.id}
|
||||||
itemLink=""
|
itemLink={pageLink}
|
||||||
title={getPageName(pageDetails?.name)}
|
title={getPageName(pageDetails?.name)}
|
||||||
prependTitleElement={
|
prependTitleElement={
|
||||||
<div className="flex-shrink-0 flex items-center gap-2">
|
<div className="flex-shrink-0 flex items-center gap-2">
|
||||||
|
|
|
||||||
|
|
@ -21,10 +21,14 @@ export const RecentProject = (props: BlockProps) => {
|
||||||
// derived values
|
// derived values
|
||||||
const projectDetails: TProjectEntityData = activity.entity_data as TProjectEntityData;
|
const projectDetails: TProjectEntityData = activity.entity_data as TProjectEntityData;
|
||||||
|
|
||||||
|
if (!projectDetails) return <></>;
|
||||||
|
|
||||||
|
const projectLink = `/${workspaceSlug}/projects/${projectDetails?.id}/issues`;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ListItem
|
<ListItem
|
||||||
key={activity.id}
|
key={activity.id}
|
||||||
itemLink=""
|
itemLink={projectLink}
|
||||||
title={projectDetails?.name}
|
title={projectDetails?.name}
|
||||||
prependTitleElement={
|
prependTitleElement={
|
||||||
<div className="flex-shrink-0 flex items-center gap-2">
|
<div className="flex-shrink-0 flex items-center gap-2">
|
||||||
|
|
@ -69,7 +73,7 @@ export const RecentProject = (props: BlockProps) => {
|
||||||
onItemClick={(e) => {
|
onItemClick={(e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
router.push(`/${workspaceSlug}/projects/${projectDetails?.id}/issues`);
|
router.push(projectLink);
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue