From 8031b3d402e706604989f933918f646cad2a8bb9 Mon Sep 17 00:00:00 2001
From: Michael Abashian <mabashian@users.noreply.github.com>
Date: Tue, 12 Jul 2022 15:24:33 -0400
Subject: [PATCH] Translate contents of Hosts Automated field as a single
 string (#12480)

* Translate contents of Hosts Automated field as a single string

* Adds unit test case for hiding Hosts automated detail when no value is present
---
 .../SubscriptionDetail/SubscriptionDetail.js  | 37 ++++++++++++-------
 .../SubscriptionDetail.test.js                | 13 +++++++
 2 files changed, 37 insertions(+), 13 deletions(-)

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 (
     <>
       <RoutedTabs tabsArray={tabsArray} />
@@ -127,19 +134,23 @@ function SubscriptionDetail() {
             label={t`Hosts imported`}
             value={license_info.current_instances}
           />
-          <Detail
-            dataCy="subscription-hosts-automated"
-            label={t`Hosts automated`}
-            value={
-              <>
-                {license_info.automated_instances} <Trans>since</Trans>{' '}
-                {license_info.automated_since &&
-                  formatDateString(
-                    new Date(license_info.automated_since * 1000).toISOString()
-                  )}
-              </>
-            }
-          />
+          {typeof automatedInstancesCount !== 'undefined' &&
+            automatedInstancesCount !== null && (
+              <Detail
+                dataCy="subscription-hosts-automated"
+                label={t`Hosts automated`}
+                value={
+                  automated_since ? (
+                    <Trans>
+                      {automatedInstancesCount} since{' '}
+                      {automatedInstancesSinceDateTime}
+                    </Trans>
+                  ) : (
+                    automatedInstancesCount
+                  )
+                }
+              />
+            )}
           <Detail
             dataCy="subscription-hosts-remaining"
             label={t`Hosts remaining`}
diff --git a/awx/ui/src/screens/Setting/Subscription/SubscriptionDetail/SubscriptionDetail.test.js b/awx/ui/src/screens/Setting/Subscription/SubscriptionDetail/SubscriptionDetail.test.js
index cd36291b40..63ba2378b7 100644
--- a/awx/ui/src/screens/Setting/Subscription/SubscriptionDetail/SubscriptionDetail.test.js
+++ b/awx/ui/src/screens/Setting/Subscription/SubscriptionDetail/SubscriptionDetail.test.js
@@ -82,4 +82,17 @@ describe('<SubscriptionDetail />', () => {
 
     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(<SubscriptionDetail />, {
+      context: {
+        config: {
+          ...config,
+          license_info: { ...config.license_info, automated_instances: null },
+        },
+      },
+    });
+
+    expect(wrapper.find(`Detail[label="Hosts automated"]`).length).toBe(0);
+  });
 });