Skip to content

[releases/v2.16-cim] MGMT-22665: Handle empty labels in infra env host table #3315

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

Merged
openshift-merge-bot merged 2 commits into from
Dec 16, 2025
Merged

[releases/v2.16-cim] MGMT-22665: Handle empty labels in infra env host table #3315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e8f946
Handle empty labels in infra env host table
LiorSoffer Dec 14, 2025
14535e8
format fix
LiorSoffer Dec 14, 2025
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
1 change: 1 addition & 0 deletions libs/locales/lib/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,7 @@
"ai:No hosts selected": "No hosts selected",
"ai:No IP collisions in network": "No IP collisions in network",
"ai:No label available": "No label available",
"ai:No labels available": "No labels available",
"ai:No location": "No location",
"ai:No matching events": "No matching events",
"ai:No namespace with hosts is available": "No namespace with hosts is available",
Expand Down
34 changes: 20 additions & 14 deletions libs/ui-lib/lib/cim/components/InfraEnv/InfraTableToolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,21 +226,27 @@ const InfraTableToolbar: React.FC<InfraTableToolbarProps> = ({
)}
>
<DropdownGroup label={t('ai:Labels')}>
{Object.entries(hostLabels).map(([label, count]) => (
<DropdownItem
hasCheckbox
key={`host-label-${label}`}
value={label}
isSelected={labelFilter?.includes(label)}
>
<Split hasGutter>
<SplitItem>{label}</SplitItem>
<SplitItem>
<Badge isRead>{count || 0}</Badge>
</SplitItem>
</Split>
{Object.keys(hostLabels).length > 0 ? (
Object.entries(hostLabels).map(([label, count]) => (
<DropdownItem
hasCheckbox
key={`host-label-${label}`}
value={label}
isSelected={labelFilter?.includes(label)}
>
<Split hasGutter>
<SplitItem>{label}</SplitItem>
<SplitItem>
<Badge isRead>{count || 0}</Badge>
</SplitItem>
</Split>
</DropdownItem>
))
) : (
<DropdownItem key="no-labels" isDisabled>
{t('ai:No labels available')}
</DropdownItem>
))}
)}
</DropdownGroup>
</Dropdown>
</ToolbarFilter>
Expand Down
21 changes: 12 additions & 9 deletions libs/ui-lib/lib/common/components/hosts/tableUtils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,15 +394,18 @@ export const labelsColumn = (t: TFunction): TableRow<Host> => ({
cell: (host) => {
const labels = getHostLabels(host);
return {
title: (
<LabelGroup>
{Object.entries(labels).map(([key, value], index) => (
<Label key={`${host.id}-host-label-${index}`} isCompact>
{key} = {value}
</Label>
))}
</LabelGroup>
),
title:
Object.entries(labels).length > 0 ? (
<LabelGroup>
{Object.entries(labels).map(([key, value], index) => (
<Label key={`${host.id}-host-label-${index}`} isCompact>
{key} = {value}
</Label>
))}
</LabelGroup>
) : (
'--'
),
props: { 'data-testid': 'host-labels' },
};
},
Expand Down
Loading