diff --git a/libs/i18n/locales/en/translation.json b/libs/i18n/locales/en/translation.json
index e8f35ac74..f8aba0d26 100644
--- a/libs/i18n/locales/en/translation.json
+++ b/libs/i18n/locales/en/translation.json
@@ -637,9 +637,9 @@
"Alias": "Alias",
"Edit alias": "Edit alias",
"Device alias could not be updated": "Device alias could not be updated",
- "{{count}} application errors_one": "{{count}} application error",
- "{{count}} application errors_other": "{{count}} application errors",
+ "{{appCount}} need attention": "{{appCount}} need attention",
"Custom data": "Custom data",
+ "No value reported": "No value reported",
"Failed to fetch owner fleet": "Failed to fetch owner fleet",
"Delete forever": "Delete forever",
"You are about to resume <1>{deviceNameOrAlias}1>": "You are about to resume <1>{deviceNameOrAlias}1>",
@@ -669,6 +669,8 @@
"Device labels don't match any fleet's selector labels": "Device labels don't match any fleet's selector labels",
"Ownership information": "Ownership information",
"Device labels match multiple fleets:": "Device labels match multiple fleets:",
+ "{{count}} application issues_one": "{{count}} application issue",
+ "{{count}} application issues_other": "{{count}} application issues",
"{{count}} status issues_one": "{{count}} status issue",
"{{count}} status issues_other": "{{count}} status issues",
"Issues detected": "Issues detected",
diff --git a/libs/ui-components/src/components/Device/DeviceDetails/DeviceApplications.tsx b/libs/ui-components/src/components/Device/DeviceDetails/DeviceApplications.tsx
index 832cb8ece..4423d65fd 100644
--- a/libs/ui-components/src/components/Device/DeviceDetails/DeviceApplications.tsx
+++ b/libs/ui-components/src/components/Device/DeviceDetails/DeviceApplications.tsx
@@ -41,7 +41,7 @@ const DeviceApplications = ({ device, health, refetch = () => undefined }: Devic
icon={}
badge={
health.level !== null && (
-
+
)
}
/>
diff --git a/libs/ui-components/src/components/Device/DeviceDetails/DeviceCustomDataCard.tsx b/libs/ui-components/src/components/Device/DeviceDetails/DeviceCustomDataCard.tsx
index 1bfd9471e..0974b3d00 100644
--- a/libs/ui-components/src/components/Device/DeviceDetails/DeviceCustomDataCard.tsx
+++ b/libs/ui-components/src/components/Device/DeviceDetails/DeviceCustomDataCard.tsx
@@ -1,6 +1,7 @@
import * as React from 'react';
import {
CardBody,
+ Content,
DescriptionList,
DescriptionListDescription,
DescriptionListGroup,
@@ -8,6 +9,7 @@ import {
} from '@patternfly/react-core';
import TagIcon from '@patternfly/react-icons/dist/js/icons/tag-icon';
+import { propNameToTitle } from '../../../hooks/useDeviceSpecSystemInfo';
import { useTranslation } from '../../../hooks/useTranslation';
import DetailsPageCard, { DetailsPageCardTitle } from '../../DetailsPage/DetailsPageCard';
@@ -21,12 +23,17 @@ const DeviceCustomDataCard = ({ customInfo }: { customInfo: [string, string][] }
} />
- {customInfo.map((entry, index) => (
-
- {entry[0]}
- {entry[1]}
-
- ))}
+ {customInfo.map((entry, index) => {
+ const value = entry[1];
+ return (
+
+ {propNameToTitle(entry[0])}
+
+ {value || {t('No value reported')}}
+
+
+ );
+ })}
diff --git a/libs/ui-components/src/components/Device/DeviceDetails/DeviceHealthAlert.tsx b/libs/ui-components/src/components/Device/DeviceDetails/DeviceHealthAlert.tsx
index ef75c7f88..16a568a6e 100644
--- a/libs/ui-components/src/components/Device/DeviceDetails/DeviceHealthAlert.tsx
+++ b/libs/ui-components/src/components/Device/DeviceDetails/DeviceHealthAlert.tsx
@@ -23,7 +23,7 @@ const DeviceHealthAlertLink = ({ healthItem }: { healthItem: DeviceHealthItem })
return (
);
diff --git a/libs/ui-components/src/components/common/LabelsView.tsx b/libs/ui-components/src/components/common/LabelsView.tsx
index ed979070a..15fea75e8 100644
--- a/libs/ui-components/src/components/common/LabelsView.tsx
+++ b/libs/ui-components/src/components/common/LabelsView.tsx
@@ -18,7 +18,7 @@ const LabelsView = ({ prefix, labels }: LabelsViewProps) => {
return (
{labelItems.map(([key, value], index: number) => (
-