From 9d648edc192249cf9ae274a4b84bd0a0ada63679 Mon Sep 17 00:00:00 2001
From: Alex Corey <alex.swansboro@gmail.com>
Date: Thu, 12 Aug 2021 09:08:40 -0400
Subject: [PATCH] fixes several react warnings

---
 awx/ui/src/components/Lookup/Lookup.js                       | 5 +++++
 awx/ui/src/screens/ActivityStream/ActivityStream.js          | 4 ++--
 awx/ui/src/screens/InstanceGroup/InstanceGroup.js            | 2 +-
 awx/ui/src/screens/InstanceGroup/InstanceGroup.test.js       | 2 +-
 .../Organization/OrganizationDetail/OrganizationDetail.js    | 5 ++++-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/awx/ui/src/components/Lookup/Lookup.js b/awx/ui/src/components/Lookup/Lookup.js
index c4d1554020..4449cc85ea 100644
--- a/awx/ui/src/components/Lookup/Lookup.js
+++ b/awx/ui/src/components/Lookup/Lookup.js
@@ -89,6 +89,11 @@ function Lookup(props) {
   }, [state.selectedItems, multiple]);
 
   const clearQSParams = () => {
+    if (!history.location.search) {
+      // This prevents "Warning: Hash history cannot PUSH the same path;
+      // a new entry will not be added to the history stack" from appearing in the console.
+      return;
+    }
     const parts = history.location.search.replace(/^\?/, '').split('&');
     const ns = qsConfig.namespace;
     const otherParts = parts.filter((param) => !param.startsWith(`${ns}.`));
diff --git a/awx/ui/src/screens/ActivityStream/ActivityStream.js b/awx/ui/src/screens/ActivityStream/ActivityStream.js
index a91450b9bf..88304a96c0 100644
--- a/awx/ui/src/screens/ActivityStream/ActivityStream.js
+++ b/awx/ui/src/screens/ActivityStream/ActivityStream.js
@@ -256,8 +256,8 @@ function ActivityStream() {
             renderToolbar={(props) => (
               <DatalistToolbar {...props} qsConfig={QS_CONFIG} />
             )}
-            renderRow={(streamItem) => (
-              <ActivityStreamListItem streamItem={streamItem} />
+            renderRow={(streamItem, index) => (
+              <ActivityStreamListItem key={index} streamItem={streamItem} />
             )}
           />
         </Card>
diff --git a/awx/ui/src/screens/InstanceGroup/InstanceGroup.js b/awx/ui/src/screens/InstanceGroup/InstanceGroup.js
index 10e713fb79..5761495fdb 100644
--- a/awx/ui/src/screens/InstanceGroup/InstanceGroup.js
+++ b/awx/ui/src/screens/InstanceGroup/InstanceGroup.js
@@ -66,7 +66,7 @@ function InstanceGroup({ setBreadcrumb }) {
       name: (
         <>
           <CaretLeftIcon />
-          {t`Back to instance groups`}
+          {t`Back to Instance Groups`}
         </>
       ),
       link: '/instance_groups',
diff --git a/awx/ui/src/screens/InstanceGroup/InstanceGroup.test.js b/awx/ui/src/screens/InstanceGroup/InstanceGroup.test.js
index f46275b815..7c725a2ae7 100644
--- a/awx/ui/src/screens/InstanceGroup/InstanceGroup.test.js
+++ b/awx/ui/src/screens/InstanceGroup/InstanceGroup.test.js
@@ -32,7 +32,7 @@ describe('<InstanceGroup/>', () => {
 
   test('should render expected tabs', async () => {
     const expectedTabs = [
-      'Back to instance groups',
+      'Back to Instance Groups',
       'Details',
       'Instances',
       'Jobs',
diff --git a/awx/ui/src/screens/Organization/OrganizationDetail/OrganizationDetail.js b/awx/ui/src/screens/Organization/OrganizationDetail/OrganizationDetail.js
index b5fd882941..5898992bb3 100644
--- a/awx/ui/src/screens/Organization/OrganizationDetail/OrganizationDetail.js
+++ b/awx/ui/src/screens/Organization/OrganizationDetail/OrganizationDetail.js
@@ -135,7 +135,10 @@ function OrganizationDetail({ organization }) {
             value={
               <ChipGroup numChips={5} totalChips={galaxy_credentials.length}>
                 {galaxy_credentials.map((credential) => (
-                  <Link to={`/credentials/${credential.id}/details`}>
+                  <Link
+                    key={credential.id}
+                    to={`/credentials/${credential.id}/details`}
+                  >
                     <CredentialChip
                       credential={credential}
                       key={credential.id}