binarybeach/bb-plane-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: work log activity validation (#5332)

Browse source
This commit is contained in:
Anmol Singh Bhatia 2024-08-08 16:43:45 +05:30 • committed by GitHub
parent be82cbb8e8
commit 1b624ef3ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
web/core/components/inbox/content/issue-root.tsx
View file

@ -160,7 +160,7 @@ export const InboxIssueMainContent: React.FC<Props> = observer((props) => {
/> />
<div className="pb-12 pl-3"> <div className="pb-12 pl-3">
<IssueActivity workspaceSlug={workspaceSlug} projectId={projectId} issueId={issue.id} /> <IssueActivity workspaceSlug={workspaceSlug} projectId={projectId} issueId={issue.id} isIntakeIssue />
</div> </div>
</> </>
); );

17
web/core/components/issues/issue-detail/issue-activity/root.tsx
View file

@ -21,6 +21,7 @@ type TIssueActivity = {
projectId: string; projectId: string;
issueId: string; issueId: string;
disabled?: boolean; disabled?: boolean;
isIntakeIssue?: boolean;
}; };
export type TActivityOperations = { export type TActivityOperations = {
@ -30,7 +31,7 @@ export type TActivityOperations = {
}; };
export const IssueActivity: FC<TIssueActivity> = observer((props) => { export const IssueActivity: FC<TIssueActivity> = observer((props) => {
const { workspaceSlug, projectId, issueId, disabled = false } = props; const { workspaceSlug, projectId, issueId, disabled = false, isIntakeIssue = false } = props;
// hooks // hooks
const { createComment, updateComment, removeComment } = useIssueDetail(); const { createComment, updateComment, removeComment } = useIssueDetail();
const { getProjectById } = useProject(); const { getProjectById } = useProject();
@ -114,12 +115,14 @@ export const IssueActivity: FC<TIssueActivity> = observer((props) => {
<div className="flex items-center justify-between"> <div className="flex items-center justify-between">
<div className="text-lg text-custom-text-100">Activity</div> <div className="text-lg text-custom-text-100">Activity</div>
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<IssueActivityWorklogCreateButton {!isIntakeIssue && (
workspaceSlug={workspaceSlug} <IssueActivityWorklogCreateButton
projectId={projectId} workspaceSlug={workspaceSlug}
issueId={issueId} projectId={projectId}
disabled={disabled} issueId={issueId}
/> disabled={disabled}
/>
)}
<ActivityFilterRoot selectedFilters={selectedFilters} toggleFilter={toggleFilter} /> <ActivityFilterRoot selectedFilters={selectedFilters} toggleFilter={toggleFilter} />
</div> </div>
</div> </div>