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

Fix renaming columns when displayName or displayNameFromDS are present (#67751)

Browse Source 
* Fix renaming columns when displayName or displayNameFromDS are present

* refactor

* Fix showing correct column header title
This commit is contained in:
Victor Marin
2023-05-11 09:31:34 +03:00
committed by GitHub
parent bcebb2cb60
commit d8dfef71e2
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/panel/datagrid/DataGridPanel.tsx
View File

@@ -196,7 +196,7 @@ export function DataGridPanel({ options, data, id, fieldConfig, width, height }:
const onHeaderMenuClick = (col: number, screenPosition: Rectangle) => {
dispatch({
type: DatagridActionType.openHeaderDropdownMenu,
payload: { screenPosition, columnIndex: col, value: frame.fields[col].name },
payload: { screenPosition, columnIndex: col, value: state.columns[col].title },
});
};

5
public/app/plugins/panel/datagrid/state.ts
View File

@@ -219,11 +219,10 @@ export const datagridReducer = (state: DatagridState, action: DatagridAction): D
columns = [
...updateColumnsPayload.frame.fields.map((field: Field, index: number) => {
const displayName = getFieldDisplayName(field, updateColumnsPayload.frame);
// find column by field name and update width in new set. We cannot use index because
// if a column gets deleted we don't know the correct index anymore
const width = state.columns.find((column) => column.title === displayName)?.width;
const width = state.columns.find((column) => column.title === field.name)?.width;
const displayName = getFieldDisplayName(field, updateColumnsPayload.frame);
return {
title: displayName,

5
public/app/plugins/panel/datagrid/utils.ts
View File

@@ -77,6 +77,11 @@ export async function updateSnapshot(
updateData?: (frames: DataFrame[]) => Promise<boolean>
): Promise<boolean> {
if (updateData && isDatagridEnabled()) {
for (let i = 0; i < frame.fields.length; i++) {
delete frame.fields[i].config.displayName;
delete frame.fields[i].config.displayNameFromDS;
}
return await updateData([frame]);
}