Skip to content

Commit

Permalink
Merge pull request #3775 from project-koku/release_prod-stable.15955
Browse files Browse the repository at this point in the history
Deployment commit for prod-stable
  • Loading branch information
dlabrecq authored Apr 9, 2024
2 parents c5675c0 + 63c39c3 commit d19b038
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions src/routes/details/components/breakdown/breakdownHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ class BreakdownHeader extends React.Component<BreakdownHeaderProps, any> {
? orgUnitIdKey
: groupBy;

const showClusterInfo = clusterInfoComponent && isClusterInfoToggleEnabled;

return (
<header style={styles.header}>
<Flex justifyContent={{ default: 'justifyContentSpaceBetween' }} style={styles.headerContent}>
Expand Down Expand Up @@ -166,15 +168,14 @@ class BreakdownHeader extends React.Component<BreakdownHeaderProps, any> {
<Flex justifyContent={{ default: 'justifyContentSpaceBetween' }} style={styles.perspectiveContainer}>
<FlexItem>
<Flex direction={{ default: 'column' }}>
{description ||
(clusterInfoComponent && isClusterInfoToggleEnabled && (
<FlexItem style={styles.description}>
{description}
{clusterInfoComponent && isClusterInfoToggleEnabled ? (
<span style={!description ? styles.clusterInfoContainer : undefined}>{clusterInfoComponent}</span>
) : null}
</FlexItem>
))}
{(description || showClusterInfo) && (
<FlexItem style={styles.description}>
{description}
{showClusterInfo ? (
<span style={!description ? styles.clusterInfoContainer : undefined}>{clusterInfoComponent}</span>
) : null}
</FlexItem>
)}
{dataDetailsComponent && isClusterInfoToggleEnabled ? <FlexItem>{dataDetailsComponent}</FlexItem> : null}
{showCostDistribution && (
<FlexItem style={styles.costDistribution}>
Expand Down

0 comments on commit d19b038

Please sign in to comment.