Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Lens] Split up dimension panel code #80423

Merged
merged 9 commits into from
Oct 19, 2020
Merged

[Lens] Split up dimension panel code #80423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8c13202
[Lens] Split up dimension panel code
wylieconlon Oct 13, 2020
b3a5691
Fix test failures
wylieconlon Oct 14, 2020
e28b342
Merge remote-tracking branch 'origin/master' into lens/refactor-dimen…
wylieconlon Oct 14, 2020
0f40ffa
Merge remote-tracking branch 'origin/master' into lens/refactor-dimen…
wylieconlon Oct 16, 2020
22ef78c
Style updates
wylieconlon Oct 16, 2020
41836c4
Merge remote-tracking branch 'origin/master' into lens/refactor-dimen…
wylieconlon Oct 16, 2020
50645c9
Merge branch 'master' into lens/refactor-dimensions
kibanamachine Oct 16, 2020
2daadc6
Merge branch 'master' into lens/refactor-dimensions
kibanamachine Oct 16, 2020
f8be59e
Merge branch 'master' into lens/refactor-dimensions
kibanamachine Oct 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions x-pack/plugins/lens/public/indexpattern_datasource/__mocks__/state_helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ export const {
sortByField,
hasField,
updateLayerIndexPattern,
mergeLayer,
} = actual;
20 changes: 10 additions & 10 deletions x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,16 @@ import {
EuiListGroupItemProps,
EuiFormLabel,
} from '@elastic/eui';
import { IndexPatternDimensionEditorProps, OperationSupportMatrix } from './dimension_panel';
import { IndexPatternDimensionEditorProps } from './dimension_panel';
import { OperationSupportMatrix } from './operation_support';
import { IndexPatternColumn, OperationType } from '../indexpattern';
import {
operationDefinitionMap,
getOperationDisplay,
buildColumn,
changeField,
} from '../operations';
import { deleteColumn, changeColumn, updateColumnParam } from '../state_helpers';
import { deleteColumn, changeColumn, updateColumnParam, mergeLayer } from '../state_helpers';
import { FieldSelect } from './field_select';
import { hasField, fieldIsInvalid } from '../utils';
import { BucketNestingEditor } from './bucket_nesting_editor';
Expand Down Expand Up @@ -394,12 +395,11 @@ export function DimensionEditor(props: DimensionEditorProps) {
<LabelInput
value={selectedColumn.label}
onChange={(value) => {
setState({
...state,
layers: {
...state.layers,
[layerId]: {
...state.layers[layerId],
setState(
mergeLayer({
state,
layerId,
newLayer: {
columns: {
...state.layers[layerId].columns,
[columnId]: {
Expand All @@ -409,8 +409,8 @@ export function DimensionEditor(props: DimensionEditorProps) {
},
},
},
},
});
})
);
}}
/>
)}
Expand Down
Loading