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

TeamsTable: Improve user experiance with links (#84973)

Browse Source
This commit is contained in:
Torkel Ödegaard
2024-03-22 20:27:50 +01:00
committed by GitHub
parent 33b653534e
commit 863a3d1c2c
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.work.sum
View File

@@ -836,4 +836,4 @@ rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE=
rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4= rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4=
rsc.io/quote/v3 v3.1.0 h1:9JKUTTIUgS6kzR9mK1YuGKv6Nl+DijDNIc0ghT58FaY= rsc.io/quote/v3 v3.1.0 h1:9JKUTTIUgS6kzR9mK1YuGKv6Nl+DijDNIc0ghT58FaY=
rsc.io/sampler v1.3.0 h1:7uVkIFmeBqHfdjD+gZwtXXI+RODJ2Wc4O7MPEh/QiW4= rsc.io/sampler v1.3.0 h1:7uVkIFmeBqHfdjD+gZwtXXI+RODJ2Wc4O7MPEh/QiW4=
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 h1:ucqkfpjg9WzSUubAO62csmucvxl4/JeW3F4I4909XkM= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 h1:ucqkfpjg9WzSUubAO62csmucvxl4/JeW3F4I4909XkM=

28
public/app/features/teams/TeamList.tsx
View File

@@ -10,12 +10,12 @@ import {
Column, Column,
DeleteButton, DeleteButton,
FilterInput, FilterInput,
Icon,
InlineField, InlineField,
InteractiveTable, InteractiveTable,
LinkButton, LinkButton,
Pagination, Pagination,
Stack, Stack,
TextLink,
Tooltip, Tooltip,
useStyles2, useStyles2,
} from '@grafana/ui'; } from '@grafana/ui';
@@ -92,11 +92,21 @@ export const TeamList = ({
{ {
id: 'name', id: 'name',
header: 'Name', header: 'Name',
cell: ({ cell: { value } }: Cell<'name'>) => { cell: ({ cell: { value }, row: { original } }: Cell<'name'>) => {
if (!hasFetched) { if (!hasFetched) {
return <Skeleton width={100} />; return <Skeleton width={100} />;
} }
return value;
const canReadTeam = contextSrv.hasPermissionInMetadata(AccessControlAction.ActionTeamsRead, original);
if (!canReadTeam) {
return value;
}
return (
<TextLink color="primary" inline={false} href={`/org/teams/edit/${original.id}`} title="Edit team">
{value}
</TextLink>
);
}, },
sortType: 'string', sortType: 'string',
}, },
@@ -168,12 +178,16 @@ export const TeamList = ({
const canReadTeam = contextSrv.hasPermissionInMetadata(AccessControlAction.ActionTeamsRead, original); const canReadTeam = contextSrv.hasPermissionInMetadata(AccessControlAction.ActionTeamsRead, original);
const canDelete = contextSrv.hasPermissionInMetadata(AccessControlAction.ActionTeamsDelete, original); const canDelete = contextSrv.hasPermissionInMetadata(AccessControlAction.ActionTeamsDelete, original);
return ( return (
<Stack direction="row" justifyContent="flex-end"> <Stack direction="row" justifyContent="flex-end" gap={2}>
{canReadTeam && ( {canReadTeam && (
<Tooltip content={'Edit team'}> <Tooltip content={'Edit team'}>
<a href={`org/teams/edit/${original.id}`} aria-label={`Edit team ${original.name}`}> <LinkButton
<Icon name={'pen'} /> href={`org/teams/edit/${original.id}`}
</a> aria-label={`Edit team ${original.name}`}
icon="pen"
size="sm"
variant="secondary"
/>
</Tooltip> </Tooltip>
)} )}
<DeleteButton <DeleteButton