Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/components/issues/issue-detail/inbox/main-content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const InboxIssueMainContent: React.FC<Props> = observer((props) => {
</div>

<div className="pb-12">
<IssueActivity workspaceSlug={workspaceSlug} projectId={projectId} issueId={issueId} disabled={!is_editable} />
<IssueActivity workspaceSlug={workspaceSlug} projectId={projectId} issueId={issueId} />
</div>
</>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ const fileService = new FileService();
type TIssueCommentCreate = {
workspaceSlug: string;
activityOperations: TActivityOperations;
disabled: boolean;
showAccessSpecifier?: boolean;
};

Expand All @@ -40,7 +39,7 @@ const commentAccess: commentAccessType[] = [
];

export const IssueCommentCreate: FC<TIssueCommentCreate> = (props) => {
const { workspaceSlug, activityOperations, disabled, showAccessSpecifier = false } = props;
const { workspaceSlug, activityOperations, showAccessSpecifier = false } = props;
const workspaceStore = useWorkspace();
const workspaceId = workspaceStore.getWorkspaceBySlug(workspaceSlug as string)?.id as string;

Expand Down Expand Up @@ -94,7 +93,7 @@ export const IssueCommentCreate: FC<TIssueCommentCreate> = (props) => {
}
submitButton={
<Button
disabled={isSubmitting || disabled}
disabled={isSubmitting}
variant="primary"
type="submit"
className="!px-2.5 !py-1.5 !text-xs"
Expand Down
29 changes: 11 additions & 18 deletions web/components/issues/issue-detail/issue-activity/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ type TIssueActivity = {
workspaceSlug: string;
projectId: string;
issueId: string;
disabled: boolean;
};

type TActivityTabs = "all" | "activity" | "comments";
Expand Down Expand Up @@ -43,7 +42,7 @@ export type TActivityOperations = {
};

export const IssueActivity: FC<TIssueActivity> = observer((props) => {
const { workspaceSlug, projectId, issueId, disabled } = props;
const { workspaceSlug, projectId, issueId } = props;
// hooks
const { createComment, updateComment, removeComment } = useIssueDetail();
const { setToastAlert } = useToast();
Expand Down Expand Up @@ -147,14 +146,11 @@ export const IssueActivity: FC<TIssueActivity> = observer((props) => {
activityOperations={activityOperations}
showAccessSpecifier={project.is_deployed}
/>
{!disabled && (
<IssueCommentCreate
workspaceSlug={workspaceSlug}
activityOperations={activityOperations}
disabled={disabled}
showAccessSpecifier={project.is_deployed}
/>
)}
<IssueCommentCreate
workspaceSlug={workspaceSlug}
activityOperations={activityOperations}
showAccessSpecifier={project.is_deployed}
/>
</div>
) : activityTab === "activity" ? (
<IssueActivityRoot issueId={issueId} />
Expand All @@ -166,14 +162,11 @@ export const IssueActivity: FC<TIssueActivity> = observer((props) => {
activityOperations={activityOperations}
showAccessSpecifier={project.is_deployed}
/>
{!disabled && (
<IssueCommentCreate
workspaceSlug={workspaceSlug}
activityOperations={activityOperations}
disabled={disabled}
showAccessSpecifier={project.is_deployed}
/>
)}
<IssueCommentCreate
workspaceSlug={workspaceSlug}
activityOperations={activityOperations}
showAccessSpecifier={project.is_deployed}
/>
</div>
)}
</div>
Expand Down
2 changes: 1 addition & 1 deletion web/components/issues/issue-detail/main-content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export const IssueMainContent: React.FC<Props> = observer((props) => {
disabled={!is_editable}
/>

<IssueActivity workspaceSlug={workspaceSlug} projectId={projectId} issueId={issueId} disabled={!is_editable} />
<IssueActivity workspaceSlug={workspaceSlug} projectId={projectId} issueId={issueId} />
</>
);
});
2 changes: 0 additions & 2 deletions web/components/issues/peek-overview/view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,6 @@ export const IssueView: FC<IIssueView> = observer((props) => {
workspaceSlug={workspaceSlug}
projectId={projectId}
issueId={issueId}
disabled={disabled}
/>
</div>
) : (
Expand All @@ -255,7 +254,6 @@ export const IssueView: FC<IIssueView> = observer((props) => {
workspaceSlug={workspaceSlug}
projectId={projectId}
issueId={issueId}
disabled={disabled}
/>
</div>
</div>
Expand Down