public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OrgUsers: Refactor change LastSeenAtAge from '10 years' to 'Never' (#84247)

Browse Source 
* refactor: change lastseenatage to Never

* removed unncessecary fragments
This commit is contained in:
Eric Leijonmarck
2024-03-12 12:18:33 +01:00
committed by GitHub
parent c45f96e9de
commit fbfaf8e003
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/admin/Users/OrgUsersTable.tsx
+4 -1
View File
@@ -15,6 +15,7 @@ import {
Pagination, Pagination,
Stack, Stack,
Tag, Tag,
Text,
Tooltip, Tooltip,
} from '@grafana/ui'; } from '@grafana/ui';
import { UserRolePicker } from 'app/core/components/RolePicker/UserRolePicker'; import { UserRolePicker } from 'app/core/components/RolePicker/UserRolePicker';
@@ -107,7 +108,9 @@ export const OrgUsersTable = ({
{ {
id: 'lastSeenAtAge', id: 'lastSeenAtAge',
header: 'Last active', header: 'Last active',
cell: ({ cell: { value } }: Cell<'lastSeenAtAge'>) => value, cell: ({ cell: { value } }: Cell<'lastSeenAtAge'>) => {
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(),
}, },
{ {
public/app/features/admin/Users/UsersTable.tsx
+1 -1
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(),
}, },