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

TableNG: Use correct row index for background colour calculation (#104426)

Browse Source 
* chore: row index is source index so just use that

* chore: fix better cause why not

---------

Co-authored-by: Adela Almasan <adela.almasan@grafana.com>
Co-authored-by: Sven Grossmann <svennergr@gmail.com>
This commit is contained in:
Alex Spencer
2025-05-02 08:39:03 -07:00
committed by GitHub
co-authored by Adela Almasan Sven Grossmann
parent 4812cdf1a7
commit a8c4c824b9
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.betterer.results
-5
View File
@@ -649,11 +649,6 @@ exports[`better eslint`] = {
[0, 0, 0, "Unexpected any. Specify a different type.", "0"],
[0, 0, 0, "Unexpected any. Specify a different type.", "1"]
],
"packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx:5381": [
[0, 0, 0, "Do not use any type assertions.", "0"],
[0, 0, 0, "Do not use any type assertions.", "1"],
[0, 0, 0, "Do not use any type assertions.", "2"]
],
"packages/grafana-ui/src/components/Table/TableNG/utils.test.ts:5381": [
[0, 0, 0, "Unexpected any. Specify a different type.", "0"],
[0, 0, 0, "Unexpected any. Specify a different type.", "1"],
packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
+10 -13
View File
@@ -196,16 +196,16 @@ export function TableNG(props: TableNGProps) {
// Create a map of column key to column type
const columnTypes = useMemo(
() => props.data.fields.reduce((acc, { name, type }) => ({ ...acc, [name]: type }), {} as ColumnTypes),
() => props.data.fields.reduce<ColumnTypes>((acc, { name, type }) => ({ ...acc, [name]: type }), {}),
[props.data.fields]
);
// Create a map of column key to text wrap
const textWraps = useMemo(
() =>
props.data.fields.reduce(
props.data.fields.reduce<{ [key: string]: boolean }>(
(acc, { name, config }) => ({ ...acc, [name]: config?.custom?.cellOptions?.wrapText ?? false }),
{} as { [key: string]: boolean }
{}
),
[props.data.fields]
);
@@ -243,15 +243,12 @@ export function TableNG(props: TableNGProps) {
}, [props.data.fields]);
const fieldDisplayType = useMemo(() => {
return props.data.fields.reduce(
(acc, { config, name }) => {
if (config?.custom?.cellOptions?.type) {
acc[name] = config.custom.cellOptions.type;
}
return acc;
},
{} as Record<string, TableCellDisplayMode>
);
return props.data.fields.reduce<Record<string, TableCellDisplayMode>>((acc, { config, name }) => {
if (config?.custom?.cellOptions?.type) {
acc[name] = config.custom.cellOptions.type;
}
return acc;
}, {});
}, [props.data.fields]);
// Clean up fieldsData to simplify
@@ -751,7 +748,7 @@ export function mapFrameToDataGrid({
fieldOptions.cellOptions.applyToRow
) {
rowBg = (rowIndex: number): CellColors => {
const display = field.display!(field.values.get(sortedRows[rowIndex].__index));
const display = field.display!(field.values[rowIndex]);
const colors = getCellColors(theme, fieldOptions.cellOptions, display);
return colors;
};