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

fix: issue widget modal rendering (#5896)

Browse source
This commit is contained in:
Anmol Singh Bhatia 2024-10-23 15:19:26 +05:30 • committed by GitHub
parent 84c06c4713
commit c4421f5f97
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
web/core/components/issues/issue-detail-widgets/root.tsx
View file

@ -12,10 +12,11 @@ type Props = {
projectId: string;
issueId: string;
disabled: boolean;
renderWidgetModals?: boolean;
};
export const IssueDetailWidgets: FC<Props> = (props) => {
const { workspaceSlug, projectId, issueId, disabled } = props;
const { workspaceSlug, projectId, issueId, disabled, renderWidgetModals = true } = props;
return (
<>
<div className="flex flex-col gap-5">
@ -32,7 +33,9 @@ export const IssueDetailWidgets: FC<Props> = (props) => {
disabled={disabled}
/>
</div>
<IssueDetailWidgetModals workspaceSlug={workspaceSlug} projectId={projectId} issueId={issueId} />
{renderWidgetModals && (
<IssueDetailWidgetModals workspaceSlug={workspaceSlug} projectId={projectId} issueId={issueId} />
)}
</>
);
};

4
web/core/components/issues/issue-detail/main-content.tsx
View file

@ -40,6 +40,7 @@ export const IssueMainContent: React.FC<Props> = observer((props) => {
const { data: currentUser } = useUser();
const {
issue: { getIssueById },
peekIssue,
} = useIssueDetail();
const { setShowAlert } = useReloadConfirmations(isSubmitting === "submitting");
@ -53,6 +54,8 @@ export const IssueMainContent: React.FC<Props> = observer((props) => {
const issue = issueId ? getIssueById(issueId) : undefined;
if (!issue || !issue.project_id) return <></>;
const isPeekModeActive = Boolean(peekIssue);
return (
<>
<div className="rounded-lg space-y-4">
@ -110,6 +113,7 @@ export const IssueMainContent: React.FC<Props> = observer((props) => {
projectId={projectId}
issueId={issueId}
disabled={!isEditable || isArchived}
renderWidgetModals={!isPeekModeActive}
/>
{windowSize[0] < 768 && (