Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

fix: work log activity validation (#5332)

Anmol Singh Bhatia1b624ef3ac54
diff --git a/web/core/components/inbox/content/issue-root.tsx b/web/core/components/inbox/content/issue-root.tsx
index 3db2f9fa01..a95be412d8 100644
--- a/web/core/components/inbox/content/issue-root.tsx
+++ b/web/core/components/inbox/content/issue-root.tsx
@@ -160,7 +160,7 @@ export const InboxIssueMainContent: React.FC<Props> = observer((props) => {
/>
<div className="pb-12 pl-3">
- <IssueActivity workspaceSlug={workspaceSlug} projectId={projectId} issueId={issue.id} />
+ <IssueActivity workspaceSlug={workspaceSlug} projectId={projectId} issueId={issue.id} isIntakeIssue />
</div>
</>
);
diff --git a/web/core/components/issues/issue-detail/issue-activity/root.tsx b/web/core/components/issues/issue-detail/issue-activity/root.tsx
index dad83881dc..3af87e7704 100644
--- a/web/core/components/issues/issue-detail/issue-activity/root.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/root.tsx
@@ -21,6 +21,7 @@ type TIssueActivity = {
projectId: string;
issueId: string;
disabled?: boolean;
+ isIntakeIssue?: boolean;
};
export type TActivityOperations = {
@@ -30,7 +31,7 @@ export type TActivityOperations = {
};
export const IssueActivity: FC<TIssueActivity> = observer((props) => {
- const { workspaceSlug, projectId, issueId, disabled = false } = props;
+ const { workspaceSlug, projectId, issueId, disabled = false, isIntakeIssue = false } = props;
// hooks
const { createComment, updateComment, removeComment } = useIssueDetail();
const { getProjectById } = useProject();
@@ -114,12 +115,14 @@ export const IssueActivity: FC<TIssueActivity> = observer((props) => {
<div className="flex items-center justify-between">
<div className="text-lg text-custom-text-100">Activity</div>
<div className="flex items-center gap-2">
- <IssueActivityWorklogCreateButton
- workspaceSlug={workspaceSlug}
- projectId={projectId}
- issueId={issueId}
- disabled={disabled}
- />
+ {!isIntakeIssue && (
+ <IssueActivityWorklogCreateButton
+ workspaceSlug={workspaceSlug}
+ projectId={projectId}
+ issueId={issueId}
+ disabled={disabled}
+ />
+ )}
<ActivityFilterRoot selectedFilters={selectedFilters} toggleFilter={toggleFilter} />
</div>
</div>