diff --git a/packages/grafana-ui/src/components/QueryField/QueryField.tsx b/packages/grafana-ui/src/components/QueryField/QueryField.tsx index 1c79e62239e6..156883ac7cc1 100644 --- a/packages/grafana-ui/src/components/QueryField/QueryField.tsx +++ b/packages/grafana-ui/src/components/QueryField/QueryField.tsx @@ -68,6 +68,12 @@ export class UnThemedQueryField extends PureComponent {}, + }; + constructor(props: QueryFieldProps) { super(props); @@ -236,12 +242,6 @@ export class UnThemedQueryField extends PureComponent {}, -}; - const getStyles = (theme: GrafanaTheme2) => { const focusStyles = getFocusStyles(theme); return { diff --git a/packages/grafana-ui/src/components/Table/DefaultCell.tsx b/packages/grafana-ui/src/components/Table/DefaultCell.tsx index 37e115e22590..02b03f10ea37 100644 --- a/packages/grafana-ui/src/components/Table/DefaultCell.tsx +++ b/packages/grafana-ui/src/components/Table/DefaultCell.tsx @@ -83,9 +83,12 @@ export const DefaultCell = (props: TableCellProps) => { cellProps.style = { ...cellProps.style, textWrap: 'wrap' }; } + const { key, ...rest } = cellProps; + return (
+
{column.render('Footer')}
); diff --git a/packages/grafana-ui/src/components/Table/HeaderRow.tsx b/packages/grafana-ui/src/components/Table/HeaderRow.tsx index 6f3fc92fcaaa..6222f50630f0 100644 --- a/packages/grafana-ui/src/components/Table/HeaderRow.tsx +++ b/packages/grafana-ui/src/components/Table/HeaderRow.tsx @@ -43,7 +43,7 @@ export const HeaderRow = (props: HeaderRowProps) => { }; function renderHeaderCell(column: any, tableStyles: TableStyles, showTypeIcons?: boolean) { - const headerProps = column.getHeaderProps(); + const { key, ...headerProps } = column.getHeaderProps(); const field: Field = column.field ?? null; const tableFieldOptions: TableFieldOptions | undefined = field?.config.custom; @@ -81,7 +81,7 @@ function renderHeaderCell(column: any, tableStyles: TableStyles, showTypeIcons?: } return ( -
+
{column.canSort && sortHeaderContent} {!column.canSort && headerContent} {!column.canSort && column.canFilter && } diff --git a/packages/grafana-ui/src/components/Table/RowsList.tsx b/packages/grafana-ui/src/components/Table/RowsList.tsx index aa2de95800c4..7e00eded5bb0 100644 --- a/packages/grafana-ui/src/components/Table/RowsList.tsx +++ b/packages/grafana-ui/src/components/Table/RowsList.tsx @@ -301,10 +301,12 @@ export const RowsList = (props: RowsListProps) => { ); style.height = bbox.height; } + const { key, ...rowProps } = row.getRowProps({ style, ...additionalProps }); return (
onRowHover(index, data)} onMouseLeave={onRowLeave} diff --git a/public/app/core/components/TagFilter/TagFilter.tsx b/public/app/core/components/TagFilter/TagFilter.tsx index 26732fc4eb4e..fd2f40566ac2 100644 --- a/public/app/core/components/TagFilter/TagFilter.tsx +++ b/public/app/core/components/TagFilter/TagFilter.tsx @@ -116,7 +116,6 @@ export const TagFilter = ({ }; const selectOptions = { - key: selectKey, onFocus, isLoading, options, @@ -160,7 +159,7 @@ export const TagFilter = ({ Clear tags )} - } aria-label="Tag filter" /> + } aria-label="Tag filter" />
); }; diff --git a/public/app/features/auth-config/FieldRenderer.tsx b/public/app/features/auth-config/FieldRenderer.tsx index 56ef4c5526a7..faba435a5ddd 100644 --- a/public/app/features/auth-config/FieldRenderer.tsx +++ b/public/app/features/auth-config/FieldRenderer.tsx @@ -63,7 +63,6 @@ export const FieldRenderer = ({ required: !!fieldData.validation?.required, invalid: !!errors[name], error: fieldData.validation?.message, - key: name, description: fieldData.description, defaultValue: fieldData.defaultValue?.value, }; @@ -71,13 +70,13 @@ export const FieldRenderer = ({ switch (fieldData.type) { case 'text': return ( - + ); case 'secret': return ( - + + + ); case 'checkbox': return ( - + ); default: console.error(`Unknown field type: ${fieldData.type}`); diff --git a/public/app/features/browse-dashboards/components/DashboardsTree.tsx b/public/app/features/browse-dashboards/components/DashboardsTree.tsx index 4250fc7a479b..d85132ae4c9e 100644 --- a/public/app/features/browse-dashboards/components/DashboardsTree.tsx +++ b/public/app/features/browse-dashboards/components/DashboardsTree.tsx @@ -215,10 +215,11 @@ function VirtualListRow({ index, style, data }: VirtualListRowProps) { prepareRow(row); const dashboardItem = row.original.item; + const { key, ...rowProps } = row.getRowProps({ style }); if (dashboardItem.kind === 'ui' && dashboardItem.uiKind === 'divider') { return ( -
+

); @@ -226,7 +227,8 @@ function VirtualListRow({ index, style, data }: VirtualListRowProps) { return (
+
{row.cells.map((cell: Cell, index: number) => { return ( +
+
{!response.isItemLoaded(p.row.index) ? ( ) : isDeleted ? ( @@ -180,8 +182,9 @@ export const generateColumns = ( columns.push({ Cell: (p) => { const parts = (access.location?.values[p.row.index] ?? '').split('/'); + const { key, ...cellProps } = p.cellProps; return ( -
+
{!response.isItemLoaded(p.row.index) ? ( ) : ( @@ -225,8 +228,9 @@ export const generateColumns = ( columns.push({ Header: getFieldDisplayName(sortField), Cell: (p) => { + const { key, ...cellProps } = p.cellProps; return ( -
+
{getDisplayValue({ sortField, getDisplay: disp, @@ -261,11 +265,13 @@ export const generateColumns = ( columns.push({ Header: () =>
Score
, Cell: (p) => { + const { key, ...cellProps } = p.cellProps; return ( // TODO: fix keyboard a11y // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
showExplainPopup(p.row.index)} > @@ -309,8 +315,9 @@ function makeDataSourceColumn( if (!dslist?.length) { return null; } + const { key, ...cellProps } = p.cellProps; return ( -
+
{dslist.map((v, i) => { const settings = srv.getInstanceSettings(v); const icon = settings?.meta?.info?.logos?.small; @@ -358,10 +365,11 @@ function makeDeletedRemainingColumn( Cell: (p) => { const i = p.row.index; const deletedDate = deletedField.values[i]; + const { key, ...cellProps } = p.cellProps; if (!deletedDate || !response.isItemLoaded(p.row.index)) { return ( -
+
); @@ -374,7 +382,7 @@ function makeDeletedRemainingColumn( : formatDuration(duration, { style: 'long' }); return ( -
+
{formatted} @@ -437,8 +445,9 @@ function makeTypeColumn( break; } } + const { key, ...cellProps } = p.cellProps; return ( -
+
{!response.isItemLoaded(p.row.index) ? ( ) : ( @@ -464,8 +473,9 @@ function makeTagsColumn( return { Cell: (p) => { const tags = field.values[p.row.index]; + const { key, ...cellProps } = p.cellProps; return ( -
+
{!response.isItemLoaded(p.row.index) ? ( ) : (