Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from Mar 12, 2024
Merged

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

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2085be1
refactor: change lastseenatage to Never
eleijonmarck Mar 12, 2024
aab0a72
removed unncessecary fragments
eleijonmarck Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion public/app/features/admin/Users/OrgUsersTable.tsx
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@ import {
Pagination,
Stack,
Tag,
Text,
Tooltip,
} from '@grafana/ui';
import { UserRolePicker } from 'app/core/components/RolePicker/UserRolePicker';
Expand Down Expand Up @@ -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}</>}</>;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return <>{value && <>{value === '10 years' ? <Text color={'disabled'}>Never</Text> : value}</>}</>;
return <>{value && value === '10 years' ? <Text color={'disabled'}>Never</Text> : value}</>;

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed in the OrgUsersTable.tsx and the UsersTable.tsx

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eleijonmarck Let me correct myself, the change that I recommended changes the result if value === undefined (however I don't think the value could be undefined), so your first solution was right, could you please revert this change and the other one? Sorry 😇

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mgyongyosi i tested out the changes locally 🤔 i think. let me first try locally again

},
sortType: (a, b) => new Date(a.original.lastSeenAt).getTime() - new Date(b.original.lastSeenAt).getTime(),
},
{
Expand Down