diff --git a/web/components/issues/issue-detail/issue-activity/root.tsx b/web/components/issues/issue-detail/issue-activity/root.tsx index a399b097e..56fe16847 100644 --- a/web/components/issues/issue-detail/issue-activity/root.tsx +++ b/web/components/issues/issue-detail/issue-activity/root.tsx @@ -2,7 +2,7 @@ import { FC, useMemo, useState } from "react"; import { observer } from "mobx-react-lite"; import { History, LucideIcon, MessageSquare, Network } from "lucide-react"; // hooks -import { useIssueDetail } from "hooks/store"; +import { useIssueDetail, useProject } from "hooks/store"; import useToast from "hooks/use-toast"; // components import { IssueActivityCommentRoot, IssueActivityRoot, IssueCommentRoot, IssueCommentCreate } from "./"; @@ -14,7 +14,6 @@ type TIssueActivity = { projectId: string; issueId: string; disabled: boolean; - showAccessSpecifier?: boolean; }; type TActivityTabs = "all" | "activity" | "comments"; @@ -44,10 +43,11 @@ export type TActivityOperations = { }; export const IssueActivity: FC = observer((props) => { - const { workspaceSlug, projectId, issueId, disabled, showAccessSpecifier } = props; + const { workspaceSlug, projectId, issueId, disabled } = props; // hooks const { createComment, updateComment, removeComment } = useIssueDetail(); const { setToastAlert } = useToast(); + const { getProjectById } = useProject(); // state const [activityTab, setActivityTab] = useState("all"); @@ -108,6 +108,9 @@ export const IssueActivity: FC = observer((props) => { [workspaceSlug, projectId, issueId, createComment, updateComment, removeComment, setToastAlert] ); + const project = getProjectById(projectId); + if (!project) return <>; + return (
{/* header */} @@ -142,14 +145,14 @@ export const IssueActivity: FC = observer((props) => { workspaceSlug={workspaceSlug} issueId={issueId} activityOperations={activityOperations} - showAccessSpecifier={showAccessSpecifier} + showAccessSpecifier={project.is_deployed} /> {!disabled && ( )}
@@ -161,14 +164,14 @@ export const IssueActivity: FC = observer((props) => { workspaceSlug={workspaceSlug} issueId={issueId} activityOperations={activityOperations} - showAccessSpecifier={showAccessSpecifier} + showAccessSpecifier={project.is_deployed} /> {!disabled && ( )} diff --git a/web/components/issues/issue-detail/main-content.tsx b/web/components/issues/issue-detail/main-content.tsx index efa02c18c..bac77ee61 100644 --- a/web/components/issues/issue-detail/main-content.tsx +++ b/web/components/issues/issue-detail/main-content.tsx @@ -1,7 +1,7 @@ import { useState } from "react"; import { observer } from "mobx-react-lite"; // hooks -import { useIssueDetail, useProject, useProjectState, useUser } from "hooks/store"; +import { useIssueDetail, useProjectState, useUser } from "hooks/store"; // components import { IssueDescriptionForm, IssueAttachmentRoot, IssueUpdateStatus } from "components/issues"; import { IssueParentDetail } from "./parent"; @@ -32,14 +32,10 @@ export const IssueMainContent: React.FC = observer((props) => { const { issue: { getIssueById }, } = useIssueDetail(); - const { getProjectById } = useProject(); const issue = getIssueById(issueId); if (!issue) return <>; - const project = getProjectById(projectId); - if (!project) return <>; - const currentIssueState = projectStates?.find((s) => s.id === issue.state_id); return ( @@ -109,7 +105,6 @@ export const IssueMainContent: React.FC = observer((props) => { projectId={projectId} issueId={issueId} disabled={!is_editable} - showAccessSpecifier={project.is_deployed} /> ); diff --git a/web/components/issues/peek-overview/view.tsx b/web/components/issues/peek-overview/view.tsx index d422d91e0..bb187f8eb 100644 --- a/web/components/issues/peek-overview/view.tsx +++ b/web/components/issues/peek-overview/view.tsx @@ -12,13 +12,13 @@ import useToast from "hooks/use-toast"; import { DeleteArchivedIssueModal, DeleteIssueModal, - IssueActivity, IssueSubscription, IssueUpdateStatus, PeekOverviewIssueDetails, PeekOverviewProperties, TIssueOperations, } from "components/issues"; +import { IssueActivity } from "../issue-detail/issue-activity"; // ui import { CenterPanelIcon, CustomSelect, FullScreenPanelIcon, SidePanelIcon, Spinner } from "@plane/ui"; // helpers @@ -237,19 +237,12 @@ export const IssueView: FC = observer((props) => { disabled={disabled} /> - {/* */} + disabled={disabled} + /> ) : (
@@ -266,19 +259,12 @@ export const IssueView: FC = observer((props) => { setIsSubmitting={(value) => setIsSubmitting(value)} /> - {/* */} + disabled={disabled} + />