From 4cfb8fe48256c922ed7dbc94520b6c057012826d Mon Sep 17 00:00:00 2001 From: Alexandre Bortoluzzi Date: Thu, 5 May 2022 12:51:17 +0200 Subject: [PATCH 1/5] feat: display token description on user tokens list page --- awx/ui/src/screens/User/UserTokenList/UserTokenList.js | 5 +++++ awx/ui/src/screens/User/UserTokenList/UserTokenListItem.js | 3 +++ 2 files changed, 8 insertions(+) diff --git a/awx/ui/src/screens/User/UserTokenList/UserTokenList.js b/awx/ui/src/screens/User/UserTokenList/UserTokenList.js index 14d659f020..03bb495fab 100644 --- a/awx/ui/src/screens/User/UserTokenList/UserTokenList.js +++ b/awx/ui/src/screens/User/UserTokenList/UserTokenList.js @@ -134,6 +134,10 @@ function UserTokenList() { name: t`Application name`, key: 'application__name', }, + { + name: t`Description`, + key: 'description', + }, { name: t`Scope`, key: 'scope', @@ -181,6 +185,7 @@ function UserTokenList() { headerRow={ {t`Application Name`} + {t`Description`} {t`Scope`} {t`Expires`} diff --git a/awx/ui/src/screens/User/UserTokenList/UserTokenListItem.js b/awx/ui/src/screens/User/UserTokenList/UserTokenListItem.js index d5ab4db96d..c55681cd34 100644 --- a/awx/ui/src/screens/User/UserTokenList/UserTokenListItem.js +++ b/awx/ui/src/screens/User/UserTokenList/UserTokenListItem.js @@ -26,6 +26,9 @@ function UserTokenListItem({ token, isSelected, onSelect, rowIndex }) { : t`Personal access token`} + + {toTitleCase(token.description)} + {toTitleCase(token.scope)} From e1705738a1f9208ee97552e099cdb22b6e24adeb Mon Sep 17 00:00:00 2001 From: Alexandre Bortoluzzi Date: Thu, 5 May 2022 12:51:35 +0200 Subject: [PATCH 2/5] fix: french vocabulary --- awx/ui/src/locales/fr/messages.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/ui/src/locales/fr/messages.po b/awx/ui/src/locales/fr/messages.po index e7d2c31a24..c28fdc82e2 100644 --- a/awx/ui/src/locales/fr/messages.po +++ b/awx/ui/src/locales/fr/messages.po @@ -9071,7 +9071,7 @@ msgstr "Utilisateur" #: components/AppContainer/PageHeaderToolbar.js:165 msgid "User Details" -msgstr "Détails de l'erreur" +msgstr "Détails de l'utilisateur" #: screens/Setting/SettingList.js:117 #: screens/Setting/Settings.js:114 @@ -10164,4 +10164,4 @@ msgstr "{selectedItemsCount, plural, one {Click to run a health check on the sel #: components/AppContainer/AppContainer.js:154 msgid "{sessionCountdown, plural, one {You will be logged out in # second due to inactivity} other {You will be logged out in # seconds due to inactivity}}" -msgstr "{sessionCountdown, plural, one {You will be logged out in # second due to inactivity} other {You will be logged out in # seconds due to inactivity}}" +msgstr "{sessionCountdown, plural, one {You will be logged out in # second due to inactivity} other {You will be logged out in # seconds due to inactivity}}" From bbdab82433e2cbd6b80accf85186f5e1900b63f9 Mon Sep 17 00:00:00 2001 From: Alexandre Bortoluzzi Date: Fri, 6 May 2022 14:26:00 +0200 Subject: [PATCH 3/5] fix: user token list item tests --- .../User/UserTokenList/UserTokenListItem.test.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/awx/ui/src/screens/User/UserTokenList/UserTokenListItem.test.js b/awx/ui/src/screens/User/UserTokenList/UserTokenListItem.test.js index dd390bf178..4e7baad772 100644 --- a/awx/ui/src/screens/User/UserTokenList/UserTokenListItem.test.js +++ b/awx/ui/src/screens/User/UserTokenList/UserTokenListItem.test.js @@ -26,7 +26,7 @@ const token = { }, created: '2020-06-23T15:06:43.188634Z', modified: '2020-06-23T15:06:43.224151Z', - description: '', + description: 'foobar-token', user: 1, token: '************', refresh_token: '************', @@ -62,8 +62,9 @@ describe('', () => { }); expect(wrapper.find('Td').first().prop('select').isSelected).toBe(false); expect(wrapper.find('Td').at(1).text()).toBe('Foobar app'); - expect(wrapper.find('Td').at(2).text()).toContain('Read'); - expect(wrapper.find('Td').at(3).text()).toContain('10/25/3019, 3:06:43 PM'); + expect(wrapper.find('Td').at(2).text()).toBe('Foobar-token'); + expect(wrapper.find('Td').at(3).text()).toContain('Read'); + expect(wrapper.find('Td').at(4).text()).toContain('10/25/3019, 3:06:43 PM'); }); test('should render personal access token row properly', async () => { @@ -89,8 +90,9 @@ describe('', () => { }); expect(wrapper.find('Td').first().prop('select').isSelected).toBe(false); expect(wrapper.find('Td').at(1).text()).toEqual('Personal access token'); - expect(wrapper.find('Td').at(2).text()).toEqual('Write'); - expect(wrapper.find('Td').at(3).text()).toContain('10/25/3019, 3:06:43 PM'); + expect(wrapper.find('Td').at(2).text()).toEqual('Foobar-token'); + expect(wrapper.find('Td').at(3).text()).toEqual('Write'); + expect(wrapper.find('Td').at(4).text()).toContain('10/25/3019, 3:06:43 PM'); }); test('should be checked', async () => { From 1e12e125789d877dc2feac5c50351c4f4b69d948 Mon Sep 17 00:00:00 2001 From: Alexandre Bortoluzzi Date: Fri, 6 May 2022 14:32:54 +0200 Subject: [PATCH 4/5] style: prettier file --- awx/ui/src/screens/User/UserTokenList/UserTokenListItem.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/src/screens/User/UserTokenList/UserTokenListItem.js b/awx/ui/src/screens/User/UserTokenList/UserTokenListItem.js index c55681cd34..80e1639df7 100644 --- a/awx/ui/src/screens/User/UserTokenList/UserTokenListItem.js +++ b/awx/ui/src/screens/User/UserTokenList/UserTokenListItem.js @@ -27,7 +27,7 @@ function UserTokenListItem({ token, isSelected, onSelect, rowIndex }) { - {toTitleCase(token.description)} + {toTitleCase(token.description)} {toTitleCase(token.scope)} From 2669904c721a37b56b4306833b1b4c3f94f88d84 Mon Sep 17 00:00:00 2001 From: Alexandre Bortoluzzi Date: Tue, 17 May 2022 23:04:34 +0200 Subject: [PATCH 5/5] fix: header row style --- awx/ui/src/components/PaginatedTable/HeaderRow.js | 1 + 1 file changed, 1 insertion(+) diff --git a/awx/ui/src/components/PaginatedTable/HeaderRow.js b/awx/ui/src/components/PaginatedTable/HeaderRow.js index 56d23934e0..a3041775d5 100644 --- a/awx/ui/src/components/PaginatedTable/HeaderRow.js +++ b/awx/ui/src/components/PaginatedTable/HeaderRow.js @@ -7,6 +7,7 @@ import { parseQueryString, updateQueryString } from 'util/qs'; const Th = styled(PFTh)` --pf-c-table--cell--Overflow: initial; + --pf-c-table--cell--MaxWidth: none; `; export default function HeaderRow({