Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🐛 Fix double tab pane in issue incidents detail modal from PF upgrade #1104

Merged
merged 4 commits into from
Jul 11, 2023
Merged

🐛 Fix double tab pane in issue incidents detail modal from PF upgrade #1104

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb5d689
:bug: Fix double tab pane in issue incidents detail modal from PF upg…
mturley Jul 10, 2023
4856453
Simplify array expression with flat operation
mturley Jul 11, 2023
c14e3e1
Merge branch 'main' into fix-incident-modal-tabs
mturley Jul 11, 2023
cdd1c33
Merge branch 'main' into fix-incident-modal-tabs
mturley Jul 11, 2023
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
40 changes: 19 additions & 21 deletions ...es/issues/issue-detail-drawer/file-incidents-detail-modal/file-incidents-detail-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ export const FileIncidentsDetailModal: React.FC<
// TODO render incident facts?
// TODO render documentation links? are those part of the markdown? where do we get them from the hub?

console.log({ activeTabIncidentId });

return (
<Modal
title={fileReport.file}
Expand All @@ -85,14 +87,14 @@ export const FileIncidentsDetailModal: React.FC<
})}
/>
) : (
<>
<Tabs
activeKey={activeTabIncidentId}
onSelect={(_event, tabKey) =>
setActiveTabIncidentId(tabKey as IncidentIdOrAll)
}
>
{firstFiveIncidents.map((incident, index) => (
<Tabs
activeKey={activeTabIncidentId}
onSelect={(_event, tabKey) =>
setActiveTabIncidentId(tabKey as IncidentIdOrAll)
}
>
{[
firstFiveIncidents.map((incident, index) => (
<Tab
key={incident.id}
eventKey={incident.id}
Expand Down Expand Up @@ -121,16 +123,10 @@ export const FileIncidentsDetailModal: React.FC<
</Grid>
) : null}
</Tab>
))}
</Tabs>
{totalNumIncidents > 5 ? (
<Tabs
activeKey="all"
onSelect={(_event, tabKey) =>
setActiveTabIncidentId(tabKey as IncidentIdOrAll)
}
>
)),
totalNumIncidents > 5 && [
<Tab
key="all"
eventKey="all"
title={`All incidents (${totalNumIncidents})`} // TODO i18n
>
Expand All @@ -141,10 +137,12 @@ export const FileIncidentsDetailModal: React.FC<
title="TODO"
/>
<FileAllIncidentsTable fileReport={fileReport} />
</Tab>
</Tabs>
) : null}
</>
</Tab>,
],
]
.flat(1)
.filter(Boolean)}
</Tabs>
)}
</Modal>
);
Expand Down