From 69a42b1a89c21c337eb938cfe33309d2422add81 Mon Sep 17 00:00:00 2001
From: Kia Lam <digitalanime@gmail.com>
Date: Thu, 10 Feb 2022 20:47:19 -0800
Subject: [PATCH] Some lint fixes; fix routesConfig unit test.

---
 awx/ui/src/routeConfig.test.js                    | 5 +++++
 awx/ui/src/screens/TopologyView/ContentLoading.js | 3 ++-
 awx/ui/src/screens/TopologyView/MeshGraph.js      | 4 ++--
 awx/ui/src/screens/TopologyView/Tooltip.js        | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/awx/ui/src/routeConfig.test.js b/awx/ui/src/routeConfig.test.js
index da0dc7e536..35e0a5eae3 100644
--- a/awx/ui/src/routeConfig.test.js
+++ b/awx/ui/src/routeConfig.test.js
@@ -43,6 +43,7 @@ describe('getRouteConfig', () => {
       '/instances',
       '/applications',
       '/execution_environments',
+      '/topology_view',
       '/settings',
     ]);
   });
@@ -71,6 +72,7 @@ describe('getRouteConfig', () => {
       '/instances',
       '/applications',
       '/execution_environments',
+      '/topology_view',
       '/settings',
     ]);
   });
@@ -98,6 +100,7 @@ describe('getRouteConfig', () => {
       '/instances',
       '/applications',
       '/execution_environments',
+      '/topology_view',
     ]);
   });
 
@@ -233,6 +236,7 @@ describe('getRouteConfig', () => {
       '/instances',
       '/applications',
       '/execution_environments',
+      '/topology_view',
     ]);
   });
 
@@ -263,6 +267,7 @@ describe('getRouteConfig', () => {
       '/instances',
       '/applications',
       '/execution_environments',
+      '/topology_view',
     ]);
   });
 });
diff --git a/awx/ui/src/screens/TopologyView/ContentLoading.js b/awx/ui/src/screens/TopologyView/ContentLoading.js
index c92555e47d..b137299c5d 100644
--- a/awx/ui/src/screens/TopologyView/ContentLoading.js
+++ b/awx/ui/src/screens/TopologyView/ContentLoading.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import { t } from '@lingui/macro';
 
 import styled from 'styled-components';
 import {
@@ -30,7 +31,7 @@ const ContentLoading = ({ className }) => (
         component={TextVariants.small}
         style={{ fontWeight: 'bold', color: 'black' }}
       >
-        Please wait until the topology view is populated...
+        {t`Please wait until the topology view is populated...`}
       </Text>
     </TextContent>
     <EmptyStateIcon variant="container" component={Spinner} />
diff --git a/awx/ui/src/screens/TopologyView/MeshGraph.js b/awx/ui/src/screens/TopologyView/MeshGraph.js
index 67ddf3680a..4dc7488063 100644
--- a/awx/ui/src/screens/TopologyView/MeshGraph.js
+++ b/awx/ui/src/screens/TopologyView/MeshGraph.js
@@ -111,14 +111,14 @@ function MeshGraph({ showLegend, zoom }) {
     const graph = data;
 
     const simulation = d3
-      .forceSimulation()
+      .forceSimulation(graph.nodes)
       .force(
         'charge',
         d3.forceManyBody(defaultForceBody).strength(defaultForceStrength)
       )
       .force(
         'link',
-        d3.forceLink().id((d) => d.hostname)
+        d3.forceLink(graph.links).id((d) => d.hostname)
       )
       .force('collide', d3.forceCollide(defaultCollisionFactor))
       .force('forceX', d3.forceX(defaultForceX))
diff --git a/awx/ui/src/screens/TopologyView/Tooltip.js b/awx/ui/src/screens/TopologyView/Tooltip.js
index 142f345448..f82a742158 100644
--- a/awx/ui/src/screens/TopologyView/Tooltip.js
+++ b/awx/ui/src/screens/TopologyView/Tooltip.js
@@ -69,7 +69,7 @@ function Tooltip({
           <TextContent>
             <Text
               component={TextVariants.small}
-              style={{ 'font-weight': 'bold', color: 'black' }}
+              style={{ 'fontWeight': 'bold', color: 'black' }}
             >
               Details
             </Text>