fix(FN-5150): complete Step 1 — mount PrCreateModal tab-agnostically
Fusion-Task-Id: FN-5150 Fusion-Task-Lineage: 09bf24f1-5d23-4049-bd5e-7afbea0a59ae
This commit is contained in:
committed by
gsxdsm
parent
4d9068d927
commit
7be22cc07e
@@ -3401,21 +3401,6 @@ export function TaskDetailContent({
|
|||||||
}}
|
}}
|
||||||
addToast={addToast}
|
addToast={addToast}
|
||||||
/>
|
/>
|
||||||
<PrCreateModal
|
|
||||||
open={prCreateOpen}
|
|
||||||
taskId={task.id}
|
|
||||||
projectId={projectId}
|
|
||||||
defaultBaseBranch={undefined}
|
|
||||||
onClose={() => setPrCreateOpen(false)}
|
|
||||||
onCreated={(prInfo) => {
|
|
||||||
const nextPrInfos = [...(task.prInfos ?? (task.prInfo ? [task.prInfo] : [])), prInfo];
|
|
||||||
(task as TaskDetail).prInfo = nextPrInfos[0] ?? prInfo;
|
|
||||||
(task as TaskDetail).prInfos = nextPrInfos;
|
|
||||||
onTaskUpdated?.({ ...workingTask, prInfo: nextPrInfos[0] ?? prInfo, prInfos: nextPrInfos } as Task);
|
|
||||||
setPrCreateOpen(false);
|
|
||||||
}}
|
|
||||||
addToast={addToast}
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
@@ -3423,6 +3408,23 @@ export function TaskDetailContent({
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
{task.column === "in-review" && (
|
||||||
|
<PrCreateModal
|
||||||
|
open={prCreateOpen}
|
||||||
|
taskId={task.id}
|
||||||
|
projectId={projectId}
|
||||||
|
defaultBaseBranch={undefined}
|
||||||
|
onClose={() => setPrCreateOpen(false)}
|
||||||
|
onCreated={(prInfo) => {
|
||||||
|
const nextPrInfos = [...(task.prInfos ?? (task.prInfo ? [task.prInfo] : [])), prInfo];
|
||||||
|
(task as TaskDetail).prInfo = nextPrInfos[0] ?? prInfo;
|
||||||
|
(task as TaskDetail).prInfos = nextPrInfos;
|
||||||
|
onTaskUpdated?.({ ...workingTask, prInfo: nextPrInfos[0] ?? prInfo, prInfos: nextPrInfos } as Task);
|
||||||
|
setPrCreateOpen(false);
|
||||||
|
}}
|
||||||
|
addToast={addToast}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
{showRecoverBranchBindingBanner && (
|
{showRecoverBranchBindingBanner && (
|
||||||
<div className="detail-section rebind-banner" role="status">
|
<div className="detail-section rebind-banner" role="status">
|
||||||
|
|||||||
Reference in New Issue
Block a user