Skip to content

Commit 3e43ad0

Browse files
committed
chore: version bump 1.3.0-beta-13
1 parent a701edf commit 3e43ad0

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "1.3.0-beta-12",
3+
"version": "1.3.0-beta-13",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Common/SegmentedBarChart/SegmentedBarChart.tsx

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -39,43 +39,43 @@ const SegmentedBarChart: React.FC<SegmentedBarChartProps> = ({
3939

4040
const renderValue = (value: string | number, label: string) => (
4141
<span className={countClassName} data-testid={`segmented-bar-chart-${label}-value`}>
42-
{value}/{total}
42+
{isProportional ? `${value}/${total}` : value}
4343
</span>
4444
)
4545

46-
const renderContent = (entity: Entity) => {
46+
const renderContent = () => {
4747
if (isProportional) {
48-
if (entity.value === 0) {
49-
return null
50-
}
51-
return (
52-
<>
53-
{renderValue(entity.value, entity.label)}
54-
<div className="flex left dc__gap-6">
55-
<span style={{ backgroundColor: entity.color }} className="h-12 dc__border-radius-2 w-4" />
56-
{renderLabel(entity.label)}
48+
return entities?.map((entity) => {
49+
if (entity.value === 0) {
50+
return null
51+
}
52+
return (
53+
<div className="flexbox-col">
54+
{renderValue(entity.value, entity.label)}
55+
<div className="flex left dc__gap-6">
56+
<span style={{ backgroundColor: entity.color }} className="h-12 dc__border-radius-2 w-4" />
57+
{renderLabel(entity.label)}
58+
</div>
5759
</div>
58-
</>
59-
)
60+
)
61+
})
6062
}
61-
return (
62-
<>
63+
return entities?.map((entity) => (
64+
<div className={`${isProportional ? 'flexbox-col' : 'flexbox dc__gap-4 dc__align-items-center'}`}>
6365
<div className="dot" style={{ backgroundColor: entity.color, width: '10px', height: '10px' }} />
6466
{renderValue(entity.value, entity.label)}
6567
{renderLabel(entity.label)}
66-
</>
67-
)
68+
</div>
69+
))
70+
}
71+
72+
if (!entities.length) {
73+
return null
6874
}
6975

7076
return (
7177
<div className={`flexbox-col w-100 dc__gap-12 ${rootClassName}`}>
72-
<div className={`flexbox ${isProportional ? 'dc__gap-24' : 'dc__gap-16'}`}>
73-
{entities?.map((entity) => (
74-
<div className={`${isProportional ? 'flexbox-col' : 'flexbox dc__gap-4 dc__align-items-center'}`}>
75-
{renderContent(entity)}
76-
</div>
77-
))}
78-
</div>
78+
<div className={`flexbox ${isProportional ? 'dc__gap-24' : 'dc__gap-16'}`}>{renderContent()}</div>
7979
<div className="flexbox dc__gap-2">
8080
{filteredEntities?.map((entity, index, map) => (
8181
<div

0 commit comments

Comments
 (0)