Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
f46855e
[lens] Dimension panel lets users select operations and fields indivi…
wylieconlon May 30, 2019
dcde41d
Merge remote-tracking branch 'origin/feature/lens' into lens/aggregat…
wylieconlon May 31, 2019
4a3ea3f
Merge remote-tracking branch 'origin/master' into lens/aggregations
wylieconlon Jun 3, 2019
30f69e3
Split files and add tests
wylieconlon Jun 3, 2019
82e2865
Merge remote-tracking branch 'origin/feature/lens' into lens/aggregat…
wylieconlon Jun 3, 2019
fe4238a
Fix dimension labeling and add clear button
wylieconlon Jun 4, 2019
4d09416
Support more aggregations, aggregation nesting, rollups, and clearing
wylieconlon Jun 5, 2019
6f81ded
Merge remote-tracking branch 'origin/feature/lens' into lens/aggregat…
wylieconlon Jun 5, 2019
3bf54d4
Fix esaggs expression
wylieconlon Jun 5, 2019
241187b
Merge remote-tracking branch 'origin/feature/lens' into lens/aggregat…
wylieconlon Jun 6, 2019
8c50598
Increase top-level test coverage of dimension panel
wylieconlon Jun 6, 2019
063715c
Merge branch 'feature/lens' into lens/aggregations
flash1293 Jun 7, 2019
8359b28
start work on param editors for operations
flash1293 Jun 7, 2019
6a3e6f8
add params for terms
flash1293 Jun 7, 2019
9cb80a8
remove unused variable
flash1293 Jun 7, 2019
4718369
Merge branch 'feature/lens' into lens/agg-configs
flash1293 Jun 11, 2019
5510db0
refactor operations
flash1293 Jun 11, 2019
404944f
move esaggs configurations to individual operation files
flash1293 Jun 11, 2019
8e0dc86
implement new edit flow
flash1293 Jun 12, 2019
520f0e7
split up dimension panel code
flash1293 Jun 12, 2019
7d6f3c9
Merge branch 'feature/lens' into lens/agg-configs
flash1293 Jun 12, 2019
cdcc822
fix some tests
flash1293 Jun 13, 2019
3e7c3b4
Merge branch 'feature/lens' into lens/agg-configs
flash1293 Jun 13, 2019
b72998d
moved stuff around and started cleaning up and adding tests
flash1293 Jun 13, 2019
41eb4d4
fix tests for dimension panel
flash1293 Jun 13, 2019
0674c2c
fix tests
flash1293 Jun 13, 2019
6d420e6
add tests and i18n
flash1293 Jun 13, 2019
2f54558
added a few more tests
flash1293 Jun 13, 2019
d3e356c
add test subj
flash1293 Jun 13, 2019
a1f55cf
remove unused import
flash1293 Jun 13, 2019
60c0239
start work on operation switching
flash1293 Jun 14, 2019
4511c81
highlight currently active operation
flash1293 Jun 14, 2019
5183115
Merge branch 'feature/lens' into lens/popover-configs
flash1293 Jun 19, 2019
6d91f2e
Auto format
flash1293 Jun 19, 2019
2cdc322
adjust user flow as discussed
flash1293 Jun 19, 2019
aa3c8fd
Merge branch 'feature/lens' into lens/popover-configs
flash1293 Jun 24, 2019
1ae848f
resolve merge conflicts
flash1293 Jun 24, 2019
09328ad
fix styling and add label behavior
flash1293 Jun 24, 2019
82b7ce4
start fixing tests and things
flash1293 Jun 24, 2019
df18560
fix css issues
flash1293 Jun 25, 2019
78f45c5
fix existing dimension panel test
flash1293 Jun 25, 2019
f82a200
add tests
flash1293 Jun 25, 2019
2798552
condense tests
flash1293 Jun 25, 2019
486bae9
rename stuff and carry over params when switching columns if possible
flash1293 Jun 25, 2019
46f594a
Merge branch 'feature/lens' into lens/popover-configs
flash1293 Jun 26, 2019
2690790
PR review fixes
flash1293 Jun 26, 2019
bbf573b
Merge branch 'feature/lens' into lens/popover-configs
flash1293 Jun 26, 2019
c4947bc
review fixes
flash1293 Jun 27, 2019
084cd26
Merge branch 'feature/lens' into lens/popover-configs
flash1293 Jun 27, 2019
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
4 changes: 2 additions & 2 deletions x-pack/legacy/plugins/lens/public/index.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Import the EUI global scope so we can use EUI constants
@import 'src/legacy/ui/public/styles/_styling_constants';

@import './drag_drop/drag_drop.scss';
@import './xy_visualization_plugin/xy_expression.scss';
@import './indexpattern_plugin/indexpattern';
@import './editor_frame_plugin/editor_frame/index';
@import './drag_drop/drag_drop.scss';
@import './editor_frame_plugin/editor_frame/index';
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
const actual = jest.requireActual('../operations');

jest.spyOn(actual, 'getPotentialColumns');
jest.spyOn(actual.operationDefinitionMap.date_histogram, 'inlineOptions');
jest.spyOn(actual.operationDefinitionMap.date_histogram, 'paramEditor');

export const {
getPotentialColumns,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import './popover';
@import './summary';
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
.lnsConfigPanel__summaryPopoverLeft,
.lnsConfigPanel__summaryPopoverRight {
padding: $euiSizeS;
}

.lnsConfigPanel__summaryPopoverLeft {
padding-top: 0;
background-color: $euiColorLightestShade;
}

.lnsConfigPanel__summaryPopoverRight {
width: $euiSize * 20;
}

.lnsConfigPanel__fieldOption--incompatible {
color: $euiColorLightShade;
}

.lnsConfigPanel__operation {
padding: $euiSizeXS;
font-size: 0.875rem;
}

.lnsConfigPanel__operation--selected {
background-color: $euiColorLightShade;
}

.lnsConfigPanel__operation--incompatible {
opacity: 0.7;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The lack of contrast here makes this a lot less effective than I was expecting. I think @cchaos might be able to make some suggestions, but I'm thinking that instead of opacity you could use a black font color for compatible, and gray font color for incompatible?
Screenshot 2019-06-25 13 01 58

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, also not really happy with that. Maybe a separator of some kind would be a good idea?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's not block the change on this

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
.lnsConfigPanel__summary {
@include euiFontSizeS;
background: $euiColorEmptyShade;
border-radius: $euiBorderRadius;
display: flex;
align-items: center;
margin-top: $euiSizeXS;
padding: $euiSizeS;
}

.lnsConfigPanel__summaryPopover {
flex-grow: 1;
line-height: 0;
overflow: hidden;
}

.lnsConfigPanel__summaryPopoverAnchor {
max-width: 100%;
}

.lnsConfigPanel__summaryIcon {
margin-right: $euiSizeXS;
}

.lnsConfigPanel__summaryLink {
max-width: 100%;
display: flex;
}

.lnsConfigPanel__summaryField {
color: $euiColorPrimary;
}
Loading