From d549c217bb211cc25bfa84da6e5eaf53c90173f0 Mon Sep 17 00:00:00 2001
From: Marliana Lara <mlara@redhat.com>
Date: Thu, 16 Jan 2020 22:55:47 -0500
Subject: [PATCH] Fetch new inventory on location change

---
 awx/ui_next/src/app.scss                      |  4 ---
 .../src/screens/Inventory/Inventories.jsx     | 26 +++++++------------
 .../src/screens/Inventory/Inventory.jsx       | 22 ++++++++++++----
 .../src/screens/Inventory/Inventory.test.jsx  | 11 +++++---
 .../Inventory/InventoryEdit/InventoryEdit.jsx |  3 +++
 .../Inventory/InventoryList/InventoryList.jsx |  4 +--
 6 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/awx/ui_next/src/app.scss b/awx/ui_next/src/app.scss
index edf29254b3..f0ba17e429 100644
--- a/awx/ui_next/src/app.scss
+++ b/awx/ui_next/src/app.scss
@@ -183,10 +183,6 @@
   z-index: 20;
 }
 
-.at-u-textRight {
-  text-align: right;
-}
-
 //
 // AlertModal styles
 //
diff --git a/awx/ui_next/src/screens/Inventory/Inventories.jsx b/awx/ui_next/src/screens/Inventory/Inventories.jsx
index 4253078486..aa58a7a0b2 100644
--- a/awx/ui_next/src/screens/Inventory/Inventories.jsx
+++ b/awx/ui_next/src/screens/Inventory/Inventories.jsx
@@ -85,22 +85,16 @@ class Inventories extends Component {
             path={`${match.path}/smart_inventory/add`}
             render={() => <SmartInventoryAdd />}
           />
-          <Route
-            path={`${match.path}/inventory/:id`}
-            render={({ match: newRouteMatch }) => (
-              <Config>
-                {({ me }) => (
-                  <Inventory
-                    history={history}
-                    location={location}
-                    setBreadcrumb={this.setBreadCrumbConfig}
-                    me={me || {}}
-                    match={newRouteMatch}
-                  />
-                )}
-              </Config>
-            )}
-          />
+          <Route path={`${match.path}/inventory/:id`}>
+            <Config>
+              {({ me }) => (
+                <Inventory
+                  setBreadcrumb={this.setBreadCrumbConfig}
+                  me={me || {}}
+                />
+              )}
+            </Config>
+          </Route>
           <Route
             path={`${match.path}/smart_inventory/:id`}
             render={({ match: newRouteMatch }) => (
diff --git a/awx/ui_next/src/screens/Inventory/Inventory.jsx b/awx/ui_next/src/screens/Inventory/Inventory.jsx
index e632610660..8c7efe089f 100644
--- a/awx/ui_next/src/screens/Inventory/Inventory.jsx
+++ b/awx/ui_next/src/screens/Inventory/Inventory.jsx
@@ -2,7 +2,15 @@ import React, { useEffect, useState } from 'react';
 import { t } from '@lingui/macro';
 import { withI18n } from '@lingui/react';
 import { Card, PageSection } from '@patternfly/react-core';
-import { Switch, Route, Redirect, withRouter, Link } from 'react-router-dom';
+import {
+  Switch,
+  Route,
+  Redirect,
+  Link,
+  useHistory,
+  useLocation,
+  useRouteMatch,
+} from 'react-router-dom';
 import { TabbedCardHeader } from '@components/Card';
 import CardCloseButton from '@components/CardCloseButton';
 import ContentError from '@components/ContentError';
@@ -17,10 +25,15 @@ import InventorySources from './InventorySources';
 import { InventoriesAPI } from '@api';
 import InventoryEdit from './InventoryEdit';
 
-function Inventory({ history, i18n, location, match, setBreadcrumb }) {
+function Inventory({ i18n, setBreadcrumb }) {
   const [contentError, setContentError] = useState(null);
   const [hasContentLoading, setHasContentLoading] = useState(true);
   const [inventory, setInventory] = useState(null);
+  const history = useHistory();
+  const location = useLocation();
+  const match = useRouteMatch({
+    path: '/inventories/inventory/:id',
+  });
 
   useEffect(() => {
     async function fetchData() {
@@ -36,7 +49,7 @@ function Inventory({ history, i18n, location, match, setBreadcrumb }) {
     }
 
     fetchData();
-  }, [match.params.id, setBreadcrumb]);
+  }, [match.params.id, location.pathname, setBreadcrumb]);
 
   const tabsArray = [
     { name: i18n._(t`Details`), link: `${match.url}/details`, id: 0 },
@@ -132,7 +145,6 @@ function Inventory({ history, i18n, location, match, setBreadcrumb }) {
                 <InventoryGroups
                   location={location}
                   match={match}
-                  history={history}
                   setBreadcrumb={setBreadcrumb}
                   inventory={inventory}
                 />
@@ -178,4 +190,4 @@ function Inventory({ history, i18n, location, match, setBreadcrumb }) {
 }
 
 export { Inventory as _Inventory };
-export default withI18n()(withRouter(Inventory));
+export default withI18n()(Inventory);
diff --git a/awx/ui_next/src/screens/Inventory/Inventory.test.jsx b/awx/ui_next/src/screens/Inventory/Inventory.test.jsx
index f242b01a7d..2ec0aa040e 100644
--- a/awx/ui_next/src/screens/Inventory/Inventory.test.jsx
+++ b/awx/ui_next/src/screens/Inventory/Inventory.test.jsx
@@ -7,6 +7,13 @@ import mockInventory from './shared/data.inventory.json';
 import Inventory from './Inventory';
 
 jest.mock('@api');
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useRouteMatch: () => ({
+    url: '/inventories/1',
+    params: { id: 1 },
+  }),
+}));
 
 InventoriesAPI.readDetail.mockResolvedValue({
   data: mockInventory,
@@ -17,9 +24,7 @@ describe('<Inventory />', () => {
 
   test('initially renders succesfully', async () => {
     await act(async () => {
-      wrapper = mountWithContexts(
-        <Inventory setBreadcrumb={() => {}} match={{ params: { id: 1 } }} />
-      );
+      wrapper = mountWithContexts(<Inventory setBreadcrumb={() => {}} />);
     });
     await waitForElement(wrapper, 'ContentLoading', el => el.length === 0);
     await waitForElement(wrapper, '.pf-c-tabs__item', el => el.length === 6);
diff --git a/awx/ui_next/src/screens/Inventory/InventoryEdit/InventoryEdit.jsx b/awx/ui_next/src/screens/Inventory/InventoryEdit/InventoryEdit.jsx
index f5ec4bd931..0dfa05ae2e 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryEdit/InventoryEdit.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryEdit/InventoryEdit.jsx
@@ -90,12 +90,15 @@ function InventoryEdit({ inventory }) {
       setError(err);
     }
   };
+
   if (contentLoading) {
     return <ContentLoading />;
   }
+
   if (error) {
     return <ContentError />;
   }
+
   return (
     <CardBody>
       <InventoryForm
diff --git a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx
index b0d99846df..f175b8d2dc 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx
@@ -221,8 +221,8 @@ class InventoriesList extends Component {
                 inventory={inventory}
                 detailUrl={
                   inventory.kind === 'smart'
-                    ? `${match.url}/smart_inventory/${inventory.id}`
-                    : `${match.url}/inventory/${inventory.id}`
+                    ? `${match.url}/smart_inventory/${inventory.id}/details`
+                    : `${match.url}/inventory/${inventory.id}/details`
                 }
                 onSelect={() => this.handleSelect(inventory)}
                 isSelected={selected.some(row => row.id === inventory.id)}