diff --git a/awx/ui/src/screens/Setting/Subscription/SubscriptionDetail/SubscriptionDetail.js b/awx/ui/src/screens/Setting/Subscription/SubscriptionDetail/SubscriptionDetail.js
index 29e4016d79..894459180a 100644
--- a/awx/ui/src/screens/Setting/Subscription/SubscriptionDetail/SubscriptionDetail.js
+++ b/awx/ui/src/screens/Setting/Subscription/SubscriptionDetail/SubscriptionDetail.js
@@ -35,6 +35,13 @@ function SubscriptionDetail() {
},
];
+ const { automated_instances: automatedInstancesCount, automated_since } =
+ license_info;
+
+ const automatedInstancesSinceDateTime = automated_since
+ ? formatDateString(new Date(automated_since * 1000).toISOString())
+ : null;
+
return (
<>
@@ -127,19 +134,23 @@ function SubscriptionDetail() {
label={t`Hosts imported`}
value={license_info.current_instances}
/>
-
- {license_info.automated_instances} since{' '}
- {license_info.automated_since &&
- formatDateString(
- new Date(license_info.automated_since * 1000).toISOString()
- )}
- >
- }
- />
+ {typeof automatedInstancesCount !== 'undefined' &&
+ automatedInstancesCount !== null && (
+
+ {automatedInstancesCount} since{' '}
+ {automatedInstancesSinceDateTime}
+
+ ) : (
+ automatedInstancesCount
+ )
+ }
+ />
+ )}
', () => {
expect(wrapper.find('Button[aria-label="edit"]').length).toBe(1);
});
+
+ test('should not render Hosts Automated Detail if license_info.automated_instances is undefined', () => {
+ wrapper = mountWithContexts(, {
+ context: {
+ config: {
+ ...config,
+ license_info: { ...config.license_info, automated_instances: null },
+ },
+ },
+ });
+
+ expect(wrapper.find(`Detail[label="Hosts automated"]`).length).toBe(0);
+ });
});