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

…84247) * refactor: change lastseenatage to Never * removed unncessecary fragments (cherry picked from commit fbfaf8e)
grafana · Mar 12, 2024 · f56cc0d · f56cc0d
1 parent 9bbd9cf
commit f56cc0d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/public/app/features/admin/Users/OrgUsersTable.tsx b/public/app/features/admin/Users/OrgUsersTable.tsx
@@ -15,6 +15,7 @@ import {
   Pagination,
   Stack,
   Tag,
+  Text,
   Tooltip,
 } from '@grafana/ui';
 import { UserRolePicker } from 'app/core/components/RolePicker/UserRolePicker';
@@ -107,7 +108,9 @@ export const OrgUsersTable = ({
       {
         id: 'lastSeenAtAge',
         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(),
       },
       {

diff --git a/public/app/features/admin/Users/UsersTable.tsx b/public/app/features/admin/Users/UsersTable.tsx
@@ -117,7 +117,7 @@ export const UsersTable = ({
           iconName: 'question-circle',
         },
         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(),
       },