From 230933744c211e27ba9b8eba9330bcedb15d6894 Mon Sep 17 00:00:00 2001
From: Jake McDermott <yo@jakemcdermott.me>
Date: Mon, 16 Dec 2019 08:15:17 -0500
Subject: [PATCH 1/2] Fix nav user links

---
 .../components/PageHeaderToolbar/PageHeaderToolbar.jsx   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/awx/ui_next/src/components/PageHeaderToolbar/PageHeaderToolbar.jsx b/awx/ui_next/src/components/PageHeaderToolbar/PageHeaderToolbar.jsx
index d1b88f5c23..1adce89e4e 100644
--- a/awx/ui_next/src/components/PageHeaderToolbar/PageHeaderToolbar.jsx
+++ b/awx/ui_next/src/components/PageHeaderToolbar/PageHeaderToolbar.jsx
@@ -111,7 +111,14 @@ class PageHeaderToolbar extends Component {
                   </DropdownToggle>
                 }
                 dropdownItems={[
-                  <DropdownItem key="user" href="#/home">
+                  <DropdownItem
+                    key="user"
+                    href={
+                      loggedInUser
+                        ? `#/users/${loggedInUser.id}/details`
+                        : '#/home'
+                    }
+                  >
                     {i18n._(t`User Details`)}
                   </DropdownItem>,
                   <DropdownItem

From a3bc3986bbaaa8fab3a271ec8429ca2c4ce8ae25 Mon Sep 17 00:00:00 2001
From: Jake McDermott <yo@jakemcdermott.me>
Date: Mon, 16 Dec 2019 08:28:53 -0500
Subject: [PATCH 2/2] Fix resource access list user links

---
 .../ResourceAccessListItem.jsx                   |  4 ++--
 .../ResourceAccessListItem.test.jsx.snap         | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/awx/ui_next/src/components/ResourceAccessList/ResourceAccessListItem.jsx b/awx/ui_next/src/components/ResourceAccessList/ResourceAccessListItem.jsx
index bc1b5ccb60..b3cf120056 100644
--- a/awx/ui_next/src/components/ResourceAccessList/ResourceAccessListItem.jsx
+++ b/awx/ui_next/src/components/ResourceAccessList/ResourceAccessListItem.jsx
@@ -79,10 +79,10 @@ class ResourceAccessListItem extends React.Component {
               <DataListCell key="name">
                 {accessRecord.username && (
                   <TextContent>
-                    {accessRecord.url ? (
+                    {accessRecord.id ? (
                       <Text component={TextVariants.h6}>
                         <Link
-                          to={{ pathname: accessRecord.url }}
+                          to={{ pathname: `/users/${accessRecord.id}/details` }}
                           css="font-weight: bold"
                         >
                           {accessRecord.username}
diff --git a/awx/ui_next/src/components/ResourceAccessList/__snapshots__/ResourceAccessListItem.test.jsx.snap b/awx/ui_next/src/components/ResourceAccessList/__snapshots__/ResourceAccessListItem.test.jsx.snap
index 6e14ea7633..3abeda4fb2 100644
--- a/awx/ui_next/src/components/ResourceAccessList/__snapshots__/ResourceAccessListItem.test.jsx.snap
+++ b/awx/ui_next/src/components/ResourceAccessList/__snapshots__/ResourceAccessListItem.test.jsx.snap
@@ -58,7 +58,7 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
                       <ForwardRef
                         to={
                           Object {
-                            "pathname": "/bar",
+                            "pathname": "/users/2/details",
                           }
                         }
                       >
@@ -114,7 +114,7 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
                         <ForwardRef
                           to={
                             Object {
-                              "pathname": "/bar",
+                              "pathname": "/users/2/details",
                             }
                           }
                         >
@@ -193,7 +193,7 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
                           <ForwardRef
                             to={
                               Object {
-                                "pathname": "/bar",
+                                "pathname": "/users/2/details",
                               }
                             }
                           >
@@ -260,7 +260,7 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
                               <Styled(Link)
                                 to={
                                   Object {
-                                    "pathname": "/bar",
+                                    "pathname": "/users/2/details",
                                   }
                                 }
                               >
@@ -308,7 +308,7 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
                                   forwardedRef={null}
                                   to={
                                     Object {
-                                      "pathname": "/bar",
+                                      "pathname": "/users/2/details",
                                     }
                                   }
                                 >
@@ -316,18 +316,18 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
                                     className="sc-bdVaJa fqQVUT"
                                     to={
                                       Object {
-                                        "pathname": "/bar",
+                                        "pathname": "/users/2/details",
                                       }
                                     }
                                   >
                                     <LinkAnchor
                                       className="sc-bdVaJa fqQVUT"
-                                      href="/bar"
+                                      href="/users/2/details"
                                       navigate={[Function]}
                                     >
                                       <a
                                         className="sc-bdVaJa fqQVUT"
-                                        href="/bar"
+                                        href="/users/2/details"
                                         onClick={[Function]}
                                       >
                                         jane