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.

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

[Maps] show dynamic style ranges in legend #35417

Merged
merged 40 commits into from
May 7, 2019
Merged
Show file tree
Hide file tree
Changes from 36 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
707e3f6
show grab and edit buttons when hovering over layer name
nreese Apr 18, 2019
d1e84fd
display layer details when layer name is clicked
nreese Apr 19, 2019
6e08974
Merge branch 'master' of github.com:elastic/kibana into map_legend
nreese Apr 19, 2019
fdc48a7
add range to dynamic style property state
nreese Apr 19, 2019
7a53284
render dynamic ranges in TOC details
nreese Apr 22, 2019
d3a61e7
render symbol size and border width header in legend
nreese Apr 22, 2019
91b6fb0
simplify VectorStyle.getIcon
nreese Apr 22, 2019
cd41c77
removed unused component
nreese Apr 22, 2019
b80ecf5
open TOC details on map load
nreese Apr 22, 2019
be53b70
save open TOC details state in embeddable config
nreese Apr 22, 2019
92b440d
show gradients for dynmaic fill color icon
nreese Apr 22, 2019
368d0ce
merge with master
nreese Apr 23, 2019
4344a65
round corners of dynamic icon if points only
nreese Apr 23, 2019
b471c1e
add tooltip to legend label
nreese Apr 23, 2019
a599b91
add edit panel action to action panel
nreese Apr 23, 2019
3742fed
add functional test for details in legend
nreese Apr 23, 2019
f5bb797
fix broken gis_page function doesLayerExist
nreese Apr 23, 2019
75178c0
add unit tests for VectorStyle.getDescriptorWithDynamicRanges
nreese Apr 23, 2019
e5baf9c
Merge branch 'master' of github.com:elastic/kibana into map_legend
nreese Apr 24, 2019
360b907
Merge branch 'master' of github.com:elastic/kibana into map_legend
nreese Apr 25, 2019
32c8e5b
Merge branch 'master' of github.com:elastic/kibana into map_legend
nreese Apr 26, 2019
7d6be48
open actions menu on layer title click, add arrow up/down for togging…
nreese Apr 26, 2019
e6cb899
merge with master
nreese Apr 30, 2019
ec6dab6
Design cleanup of layers panel (#31)
cchaos May 1, 2019
fc94d60
Merge branch 'master' of github.com:elastic/kibana into map_legend
nreese May 1, 2019
6954add
fix functional test
nreese May 1, 2019
7ab6f51
update jest snapshots
nreese May 1, 2019
2291d55
Merge branch 'master' of github.com:elastic/kibana into map_legend
nreese May 1, 2019
1b8d951
merge with master
nreese May 2, 2019
db80a19
refactor StylePropertyLegendRow to use same function to render lineWi…
nreese May 2, 2019
c996678
fix functional test
nreese May 2, 2019
e8ce5c2
fix another functional test
nreese May 2, 2019
26dd43a
Merge branch 'master' of github.com:elastic/kibana into map_legend
nreese May 2, 2019
101af97
make escapeLayerName function instead of instance method
nreese May 3, 2019
0be94f5
move _isLayerDetailsOpen into prop from redux connector
nreese May 3, 2019
9da2a4e
remove index.js file
nreese May 3, 2019
bedce44
Merge branch 'master' of github.com:elastic/kibana into map_legend
nreese May 7, 2019
52ddfa3
do not show legend details toggle when layer has not legend details
nreese May 7, 2019
1955637
rename FillableVector to FillableRectangle
nreese May 7, 2019
fdf55b1
use mixin pattern instead of encapulated function call
nreese May 7, 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: 3 additions & 1 deletion x-pack/plugins/maps/public/angular/map_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ import {
updateFlyout,
FLYOUT_STATE,
setReadOnly,
setIsLayerTOCOpen
setIsLayerTOCOpen,
setOpenTOCDetails,
} from '../store/ui';
import { getQueryableUniqueIndexPatternIds } from '../selectors/map_selectors';
import { getInspectorAdapters } from '../store/non_serializable_instances';
Expand Down Expand Up @@ -147,6 +148,7 @@ app.controller('GisMapController', ($scope, $route, config, kbnUrl, localStorage
if (savedMap.uiStateJSON) {
const uiState = JSON.parse(savedMap.uiStateJSON);
store.dispatch(setIsLayerTOCOpen(_.get(uiState, 'isLayerTOCOpen', DEFAULT_IS_LAYER_TOC_OPEN)));
store.dispatch(setOpenTOCDetails(_.get(uiState, 'openTOCDetails', [])));
}

const layerList = getInitialLayers(savedMap.layerListJSON);
Expand Down
5 changes: 3 additions & 2 deletions x-pack/plugins/maps/public/angular/services/saved_gis_map.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
getRefreshConfig,
getQuery,
} from '../../selectors/map_selectors';
import { getIsLayerTOCOpen } from '../../store/ui';
import { getIsLayerTOCOpen, getOpenTOCDetails } from '../../store/ui';
import { convertMapExtentToPolygon } from '../../elasticsearch_geo_utils';
import { copyPersistentState } from '../../store/util';
import { extractReferences, injectReferences } from '../../../common/migrations/references';
Expand Down Expand Up @@ -101,7 +101,8 @@ module.factory('SavedGisMap', function (Private) {
});

this.uiStateJSON = JSON.stringify({
isLayerTOCOpen: getIsLayerTOCOpen(state)
isLayerTOCOpen: getIsLayerTOCOpen(state),
openTOCDetails: getOpenTOCDetails(state),
});

this.bounds = convertMapExtentToPolygon(getMapExtent(state));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,12 @@
pointer-events: none; /* 1 */
}

.mapWidgetOverlay__rightSideWrapper {
overflow: hidden; // Fixes Chrome overflow
}

.mapWidgetOverlay__rightSide {
min-width: 19rem;
max-width: 24rem;
width: $euiSize * 20;
}

.mapWidgetOverlay__layerWrapper {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
@include euiScrollBar;
overflow-y: auto;
flex-basis: auto !important; // Fixes IE and ensures the layer items are visible
padding-bottom: $euiSizeS + 1px;
border-top: 1px solid $euiColorLightestShade;
}

.mapLayerControl__addLayerButton,
Expand All @@ -18,5 +20,5 @@
.mapLayerControl__openLayerTOCButton,
.mapLayerControl__closeLayerTOCButton {
@include size($euiSizeXL);
background-color: $euiColorEmptyShade;
background-color: $euiColorEmptyShade !important; // During all states
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading