IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Users: Add back check for undefined / null for value for lastSeenAtAge in table view (#84265)

Browse Source 
bug: add check for undefined / null for value
This commit is contained in:
Eric Leijonmarck 2024-03-12 14:22:13 +01:00 committed by GitHub
parent 6eaab9e57d
commit 0cb9f2bb8d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/admin/Users/OrgUsersTable.tsx
View File

@ -109,7 +109,7 @@ export const OrgUsersTable = ({
id: 'lastSeenAtAge', id: 'lastSeenAtAge',
header: 'Last active', header: 'Last active',
cell: ({ cell: { value } }: Cell<'lastSeenAtAge'>) => { cell: ({ cell: { value } }: Cell<'lastSeenAtAge'>) => {
return <>{value && value === '10 years' ? <Text color={'disabled'}>Never</Text> : value}</>; return <>{value && <>{value === '10 years' ? <Text color={'disabled'}>Never</Text> : value}</>}</>;
}, },
sortType: (a, b) => new Date(a.original.lastSeenAt).getTime() - new Date(b.original.lastSeenAt).getTime(), sortType: (a, b) => new Date(a.original.lastSeenAt).getTime() - new Date(b.original.lastSeenAt).getTime(),
}, },

2
public/app/features/admin/Users/UsersTable.tsx
View File

@ -117,7 +117,7 @@ export const UsersTable = ({
iconName: 'question-circle', iconName: 'question-circle',
}, },
cell: ({ cell: { value } }: Cell<'lastSeenAtAge'>) => { cell: ({ cell: { value } }: Cell<'lastSeenAtAge'>) => {
return <>{value && value === '10 years' ? <Text color={'disabled'}>Never</Text> : value}</>; return <>{value && <>{value === '10 years' ? <Text color={'disabled'}>Never</Text> : value}</>}</>;
}, },
sortType: (a, b) => new Date(a.original.lastSeenAt!).getTime() - new Date(b.original.lastSeenAt!).getTime(), sortType: (a, b) => new Date(a.original.lastSeenAt!).getTime() - new Date(b.original.lastSeenAt!).getTime(),
}, },