Skip to content

Commit

Permalink
review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@flash1293
flash1293 committed Nov 24, 2020
1 parent c8a9530 commit 69ecfbd
Show file tree
Hide file tree
Showing 8 changed files with 261 additions and 86 deletions.
5 changes: 3 additions & 2 deletions src/plugins/expressions/common/expression_functions/series_calculation_helpers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,17 @@ export function getBucketIdentifier(row: DatatableRow, groupColumns?: string[])
* @param outputColumnId Id of the output column
* @param inputColumnId Id of the input column
* @param outputColumnName Optional name of the output column
* @param options Optional options, set `allowColumnOverwrite` to true to not raise an exception if the output column exists already
*/
export function buildResultColumns(
input: Datatable,
outputColumnId: string,
inputColumnId: string,
outputColumnName: string | undefined,
options: { allowColumnOverride: boolean } = { allowColumnOverride: false }
options: { allowColumnOverwrite: boolean } = { allowColumnOverwrite: false }
) {
if (
!options.allowColumnOverride &&
!options.allowColumnOverwrite &&
input.columns.some((column) => column.id === outputColumnId)
) {
throw new Error(
Expand Down
7 changes: 4 additions & 3 deletions x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,9 +338,10 @@ export function DimensionEditor(props: DimensionEditorProps) {
<TimeScaling
selectedColumn={selectedColumn}
columnId={columnId}
layerId={layerId}
state={state}
setState={setState}
layer={state.layers[layerId]}
updateLayer={(newLayer: IndexPatternLayer) =>
setState(mergeLayer({ layerId, state, newLayer }))
}
/>
)}

Expand Down
37 changes: 33 additions & 4 deletions x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
col2: {
dataType: 'number',
isBucketed: false,
label: '',
label: 'Count of records',
operationType: 'count',
sourceField: 'Records',
...colOverrides,
Expand Down Expand Up @@ -869,7 +869,8 @@ describe('IndexPatternDimensionEditorPanel', () => {
columns: {
...props.state.layers.first.columns,
col2: expect.objectContaining({
timeScale: 'm',
timeScale: 's',
label: 'Count of records per second',
}),
},
},
Expand All @@ -878,7 +879,33 @@ describe('IndexPatternDimensionEditorPanel', () => {
});

it('should allow to change time scaling', () => {
const props = getProps({ timeScale: 's' });
const props = getProps({ timeScale: 's', label: 'Count of records per second' });
wrapper = mount(<IndexPatternDimensionEditorComponent {...props} />);
wrapper
.find('[data-test-subj="indexPattern-time-scaling-unit"]')
.find(EuiSelect)
.prop('onChange')!(({
target: { value: 'h' },
} as unknown) as ChangeEvent<HTMLSelectElement>);
expect(props.setState).toHaveBeenCalledWith({
...props.state,
layers: {
first: {
...props.state.layers.first,
columns: {
...props.state.layers.first.columns,
col2: expect.objectContaining({
timeScale: 'h',
label: 'Count of records per hour',
}),
},
},
},
});
});

it('should not adjust label if it is custom', () => {
const props = getProps({ timeScale: 's', customLabel: true, label: 'My label' });
wrapper = mount(<IndexPatternDimensionEditorComponent {...props} />);
wrapper
.find('[data-test-subj="indexPattern-time-scaling-unit"]')
Expand All @@ -895,6 +922,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
...props.state.layers.first.columns,
col2: expect.objectContaining({
timeScale: 'h',
label: 'My label',
}),
},
},
Expand All @@ -903,7 +931,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
});

it('should allow to remove time scaling', () => {
const props = getProps({ timeScale: 's' });
const props = getProps({ timeScale: 's', label: 'Count of records per second' });
wrapper = mount(<IndexPatternDimensionEditorComponent {...props} />);
wrapper
.find('[data-test-subj="indexPattern-time-scaling-remove"]')
Expand All @@ -921,6 +949,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
...props.state.layers.first.columns,
col2: expect.objectContaining({
timeScale: undefined,
label: 'Count of records',
}),
},
},
Expand Down
117 changes: 52 additions & 65 deletions x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/time_scaling.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { EuiToolTip } from '@elastic/eui';
import {
EuiLink,
EuiFormRow,
Expand All @@ -18,30 +19,50 @@ import {
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import React, { useState } from 'react';
import { StateSetter } from '../../types';
import { IndexPatternColumn, operationDefinitionMap } from '../operations';
import { mergeLayer } from '../state_helpers';
import {
adjustTimeScaleLabelSuffix,
DEFAULT_TIME_SCALE,
IndexPatternColumn,
operationDefinitionMap,
} from '../operations';
import { unitSuffixesLong } from '../suffix_formatter';
import { TimeScaleUnit } from '../time_scale';
import { IndexPatternPrivateState } from '../types';
import { IndexPatternLayer } from '../types';

const DEFAULT_TIME_SCALE = 'm' as const;
export function setTimeScaling(
columnId: string,
layer: IndexPatternLayer,
timeScale: TimeScaleUnit | undefined
) {
const currentColumn = layer.columns[columnId];
const label = currentColumn.customLabel
? currentColumn.label
: adjustTimeScaleLabelSuffix(currentColumn.label, currentColumn.timeScale, timeScale);
return {
...layer,
columns: {
...layer.columns,
[columnId]: {
...layer.columns[columnId],
label,
timeScale,
},
},
};
}

export function TimeScaling({
selectedColumn,
columnId,
layerId,
state,
setState,
layer,
updateLayer,
}: {
selectedColumn: IndexPatternColumn;
columnId: string;
layerId: string;
state: IndexPatternPrivateState;
setState: StateSetter<IndexPatternPrivateState>;
layer: IndexPatternLayer;
updateLayer: (newLayer: IndexPatternLayer) => void;
}) {
const [popoverOpen, setPopoverOpen] = useState(false);
const layer = state.layers[layerId];
const hasDateHistogram = layer.columnOrder.some(
(colId) => layer.columns[colId].operationType === 'date_histogram'
);
Expand Down Expand Up @@ -85,26 +106,11 @@ export function TimeScaling({
data-test-subj="indexPattern-time-scaling-enable"
color="text"
onClick={() => {
setState(
mergeLayer({
state,
layerId,
newLayer: {
...state.layers[layerId],
columns: {
...state.layers[layerId].columns,
[columnId]: {
...selectedColumn,
timeScale: DEFAULT_TIME_SCALE,
},
},
},
})
);
updateLayer(setTimeScaling(columnId, layer, DEFAULT_TIME_SCALE));
}}
>
{i18n.translate('xpack.lens.indexPattern.timeScale.enableTimeScale', {
defaultMessage: 'Show as rate',
defaultMessage: 'Show with normalized time units',
})}
</EuiLink>
</EuiText>
Expand All @@ -117,9 +123,20 @@ export function TimeScaling({
<EuiFormRow
display="columnCompressed"
fullWidth
label={i18n.translate('xpack.lens.indexPattern.timeScale.label', {
defaultMessage: 'Normalize by unit',
})}
label={
<EuiToolTip
content={i18n.translate('xpack.lens.indexPattern.timeScale.tooltip', {
defaultMessage:
'Normalized values are displayed as a rate, calculated from the date histogram interval. Values can scale down from a larger interval or scale up from a smaller interval. Partial intervals are handled correctly.',
})}
>
<span>
{i18n.translate('xpack.lens.indexPattern.timeScale.label', {
defaultMessage: 'Normalize by time unit',
})}
</span>
</EuiToolTip>
}
>
<EuiFlexGroup gutterSize="s" alignItems="center">
<EuiFlexItem>
Expand All @@ -132,22 +149,7 @@ export function TimeScaling({
data-test-subj="indexPattern-time-scaling-unit"
value={selectedColumn.timeScale}
onChange={(e) => {
setState(
mergeLayer({
state,
layerId,
newLayer: {
...state.layers[layerId],
columns: {
...state.layers[layerId].columns,
[columnId]: {
...selectedColumn,
timeScale: e.target.value as TimeScaleUnit,
},
},
},
})
);
updateLayer(setTimeScaling(columnId, layer, e.target.value as TimeScaleUnit));
}}
/>
</EuiFlexItem>
Expand All @@ -157,25 +159,10 @@ export function TimeScaling({
data-test-subj="indexPattern-time-scaling-remove"
color="danger"
aria-label={i18n.translate('xpack.lens.timeScale.removeLabel', {
defaultMessage: 'Remove normalizing by unit',
defaultMessage: 'Remove normalizing by time unit',
})}
onClick={() => {
setState(
mergeLayer({
state,
layerId,
newLayer: {
...state.layers[layerId],
columns: {
...state.layers[layerId].columns,
[columnId]: {
...selectedColumn,
timeScale: undefined,
},
},
},
})
);
updateLayer(setTimeScaling(columnId, layer, undefined));
}}
iconType="cross"
/>
Expand Down
2 changes: 2 additions & 0 deletions x-pack/plugins/lens/public/indexpattern_datasource/operations/__mocks__/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ export const {
isColumnTransferable,
getErrorMessages,
isReferenced,
adjustTimeScaleLabelSuffix,
DEFAULT_TIME_SCALE,
} = actualHelpers;

export const { createMockedReferenceOperation } = actualMocks;
Loading

0 comments on commit 69ecfbd

Please sign in to comment.