[WEB-3868] fix: issue detail widget modals #6933

This commit is contained in:
Aaryan Khandelwal 2025-04-15 17:46:45 +05:30 committed by GitHub
parent 608da1465c
commit 48557cb670
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 28 additions and 17 deletions

View file

@ -12,16 +12,18 @@ import { IssueLinkCreateUpdateModal } from "../issue-detail/links/create-update-
// helpers // helpers
import { useLinkOperations } from "./links/helper"; import { useLinkOperations } from "./links/helper";
import { useSubIssueOperations } from "./sub-issues/helper"; import { useSubIssueOperations } from "./sub-issues/helper";
import { TWorkItemWidgets } from ".";
type Props = { type Props = {
workspaceSlug: string; workspaceSlug: string;
projectId: string; projectId: string;
issueId: string; issueId: string;
issueServiceType: TIssueServiceType; issueServiceType: TIssueServiceType;
hideWidgets?: TWorkItemWidgets[];
}; };
export const IssueDetailWidgetModals: FC<Props> = observer((props) => { export const IssueDetailWidgetModals: FC<Props> = observer((props) => {
const { workspaceSlug, projectId, issueId, issueServiceType } = props; const { workspaceSlug, projectId, issueId, issueServiceType, hideWidgets } = props;
// store hooks // store hooks
const { const {
isIssueLinkModalOpen, isIssueLinkModalOpen,
@ -134,21 +136,27 @@ export const IssueDetailWidgetModals: FC<Props> = observer((props) => {
// render conditions // render conditions
const shouldRenderExistingIssuesModal = const shouldRenderExistingIssuesModal =
!hideWidgets?.includes("sub-work-items") &&
issueCrudOperationState?.existing?.toggle && issueCrudOperationState?.existing?.toggle &&
issueCrudOperationState?.existing?.parentIssueId && issueCrudOperationState?.existing?.parentIssueId &&
isSubIssuesModalOpen; isSubIssuesModalOpen;
const shouldRenderCreateUpdateModal = const shouldRenderCreateUpdateModal =
issueCrudOperationState?.create?.toggle && issueCrudOperationState?.create?.parentIssueId && isCreateIssueModalOpen; !hideWidgets?.includes("sub-work-items") &&
issueCrudOperationState?.create?.toggle &&
issueCrudOperationState?.create?.parentIssueId &&
isCreateIssueModalOpen;
return ( return (
<> <>
<IssueLinkCreateUpdateModal {!hideWidgets?.includes("links") && (
isModalOpen={isIssueLinkModalOpen} <IssueLinkCreateUpdateModal
handleOnClose={handleIssueLinkModalOnClose} isModalOpen={isIssueLinkModalOpen}
linkOperations={handleLinkOperations} handleOnClose={handleIssueLinkModalOnClose}
issueServiceType={issueServiceType} linkOperations={handleLinkOperations}
/> issueServiceType={issueServiceType}
/>
)}
{shouldRenderCreateUpdateModal && ( {shouldRenderCreateUpdateModal && (
<CreateUpdateIssueModal <CreateUpdateIssueModal
@ -171,15 +179,17 @@ export const IssueDetailWidgetModals: FC<Props> = observer((props) => {
/> />
)} )}
<ExistingIssuesListModal {!hideWidgets?.includes("relations") && (
workspaceSlug={workspaceSlug} <ExistingIssuesListModal
projectId={projectId} workspaceSlug={workspaceSlug}
isOpen={isRelationModalOpen?.issueId === issueId && isRelationModalOpen?.relationType === relationKey} projectId={projectId}
handleClose={handleRelationOnClose} isOpen={isRelationModalOpen?.issueId === issueId && isRelationModalOpen?.relationType === relationKey}
searchParams={{ issue_relation: true, issue_id: issueId }} handleClose={handleRelationOnClose}
handleOnSubmit={handleExistingIssueModalOnSubmit} searchParams={{ issue_relation: true, issue_id: issueId }}
workspaceLevelToggle handleOnSubmit={handleExistingIssueModalOnSubmit}
/> workspaceLevelToggle
/>
)}
</> </>
); );
}); });

View file

@ -59,6 +59,7 @@ export const IssueDetailWidgets: FC<Props> = (props) => {
projectId={projectId} projectId={projectId}
issueId={issueId} issueId={issueId}
issueServiceType={issueServiceType} issueServiceType={issueServiceType}
hideWidgets={hideWidgets}
/> />
)} )}
</> </>