maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

change label behavior (#100991)

Browse source
This commit is contained in:
Joe Reuter 2021-06-02 17:24:56 +02:00 committed by GitHub
parent ef9d2bfb01
commit 65dbcdd27d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.test.ts
View file

@ -965,6 +965,41 @@ describe('state_helpers', () => {
);
});
it('should not carry over label when operation and field change at the same time', () => {
expect(
replaceColumn({
layer: {
indexPatternId: '1',
columnOrder: ['col1'],
columns: {
col1: {
label: 'My custom label',
customLabel: true,
dataType: 'date',
isBucketed: true,
// Private
operationType: 'date_histogram',
sourceField: 'timestamp',
params: {
interval: 'h',
},
},
},
},
indexPattern,
columnId: 'col1',
op: 'terms',
field: indexPattern.fields[4],
visualizationGroups: [],
}).columns.col1
).toEqual(
expect.objectContaining({
label: 'Top values of source',
})
);
});
it('should carry over label on operation switch when customLabel flag on previousColumn is set', () => {
expect(
replaceColumn({

12
x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts
View file

@ -838,12 +838,14 @@ function applyReferenceTransition({
);
}
function copyCustomLabel(
newColumn: IndexPatternColumn,
previousOptions: { customLabel?: boolean; label: string }
) {
function copyCustomLabel(newColumn: IndexPatternColumn, previousOptions: IndexPatternColumn) {
const adjustedColumn = { ...newColumn };
if (previousOptions.customLabel) {
const operationChanged = newColumn.operationType !== previousOptions.operationType;
const fieldChanged =
('sourceField' in newColumn && newColumn.sourceField) !==
('sourceField' in previousOptions && previousOptions.sourceField);
// only copy custom label if either used operation or used field stayed the same
if (previousOptions.customLabel && (!operationChanged || !fieldChanged)) {
adjustedColumn.customLabel = true;
adjustedColumn.label = previousOptions.label;
}