Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
3247f86
[Maps] saved objects by value
nreese Oct 26, 2020
dd73db4
Merge branch 'master' of github.com:elastic/kibana into by_value
nreese Oct 27, 2020
1c9b361
inject references when unwrapping
nreese Oct 27, 2020
5169f9c
clean up map embeddable initialize
nreese Oct 27, 2020
f7d2440
Merge branch 'master' of github.com:elastic/kibana into by_value
nreese Oct 28, 2020
84843fd
merge with master
nreese Oct 29, 2020
7491503
use attribute service to load savedMap
nreese Oct 30, 2020
5d3e6e1
clean up
nreese Oct 30, 2020
a4387e8
remove clear ui since each route has its own store instance
nreese Oct 30, 2020
1a34a6a
Merge branch 'master' of github.com:elastic/kibana into by_value
nreese Nov 2, 2020
bff1eda
save
nreese Nov 2, 2020
5be9a64
Merge branch 'master' of github.com:elastic/kibana into by_value
nreese Nov 2, 2020
aca8f6e
update for API changes
nreese Nov 2, 2020
f46093b
Merge branch 'master' of github.com:elastic/kibana into by_value
nreese Nov 3, 2020
aa1642e
pass input to stateTransfer
nreese Nov 3, 2020
41294ca
remove map saved object loader
nreese Nov 3, 2020
b7bf3be
remove unused store_operations
nreese Nov 3, 2020
eec85fd
add saved objects to recently accessed
nreese Nov 3, 2020
37e3372
provide default description
nreese Nov 3, 2020
5e21aec
break originatingApp connection when not returnToOrigin
nreese Nov 3, 2020
a9c3c10
clean up file structure
nreese Nov 4, 2020
87126ad
clean up adding help menu
nreese Nov 4, 2020
2370a1b
use SavedMap in map_embeddable to remove dupicated load attributes code
nreese Nov 4, 2020
4c9de95
clean up
nreese Nov 4, 2020
6128b0d
restore imports
nreese Nov 4, 2020
b4005c9
clean up breadcrumbs to match lens
nreese Nov 4, 2020
2b86ce2
fix check for duplicate title
nreese Nov 4, 2020
f6df791
tslint
nreese Nov 4, 2020
5d27667
make title map saved object attribute required
nreese Nov 4, 2020
076cde3
Merge branch 'master' of github.com:elastic/kibana into by_value
nreese Nov 4, 2020
d5f5937
fix jest tests
nreese Nov 4, 2020
3f5cedf
fix logic for hasSaveAndReturnConfig to not show save and return butt…
nreese Nov 4, 2020
a631b95
tslint
nreese Nov 4, 2020
d398759
Merge branch 'master' of github.com:elastic/kibana into by_value
nreese Nov 5, 2020
7752295
fix functional test by triggering MapApp render after save
nreese Nov 5, 2020
afd5375
Merge branch 'master' of github.com:elastic/kibana into by_value
nreese Nov 6, 2020
5261de4
rename map_app_container to map_page
nreese Nov 6, 2020
c13676f
move MapApp and redux connector into folder
nreese Nov 6, 2020
58b4432
review feedback
nreese Nov 6, 2020
ace3e69
use MAP_PATH constant
nreese Nov 6, 2020
92feba6
Merge branch 'master' into by_value
kibanamachine Nov 9, 2020
bd83e0a
update by reference saved object on save and return
nreese Nov 9, 2020
7921138
cleanup breadcrumbs and title
nreese Nov 9, 2020
8c11c29
properly handle deleted map saved objects
nreese Nov 9, 2020
a5f4853
tslint cleanup
nreese Nov 9, 2020
45c2553
merge with master
nreese Nov 10, 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
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ export function EmbeddedMapComponent() {
);

const input: MapEmbeddableInput = {
attributes: { title: '' },
id: uuid.v4(),
filters: mapFilters,
refreshConfig: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ export function savedMap(): ExpressionFunctionDefinition<
return {
type: EmbeddableExpressionType,
input: {
attributes: { title: '' },
id: args.id,
filters: getQueryFilters(filters),
timeRange: args.timerange || defaultTimeRange,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { MapEmbeddableInput } from '../../../../../../plugins/maps/public/embedd
import { fromExpression, Ast } from '@kbn/interpreter/common';

const baseSavedMapInput = {
attributes: { title: '' },
id: 'embeddableId',
filters: [],
isLayerTOCOpen: false,
Expand Down
6 changes: 6 additions & 0 deletions x-pack/plugins/maps/common/i18n_getters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ export function getAppTitle() {
});
}

export function getMapEmbeddableDisplayName() {
return i18n.translate('xpack.maps.embeddableDisplayName', {
defaultMessage: 'map',
});
}

export function getDataSourceLabel() {
return i18n.translate('xpack.maps.source.dataSourceLabel', {
defaultMessage: 'Data source',
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/maps/common/map_saved_object_type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import { SavedObject } from '../../../../src/core/types/saved_objects';

export type MapSavedObjectAttributes = {
title?: string;
title: string;
description?: string;
mapStateJSON?: string;
layerListJSON?: string;
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/maps/kibana.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"uiActions",
"navigation",
"visualizations",
"dashboard",
"embeddable",
"mapsLegacy",
"usageCollection",
Expand Down
8 changes: 8 additions & 0 deletions x-pack/plugins/maps/public/actions/layer_actions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ import { addLayer } from './layer_actions';
import { LayerDescriptor } from '../../common/descriptor_types';
import { LICENSED_FEATURES } from '../licensed_features';

jest.mock('../kibana_services', () => {
return {
getMapsCapabilities() {
return { save: true };
},
};
});

const getStoreMock = jest.fn();
const dispatchMock = jest.fn();

Expand Down
7 changes: 7 additions & 0 deletions x-pack/plugins/maps/public/actions/map_actions.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ jest.mock('./data_request_actions', () => {
syncDataForAllLayers: () => {},
};
});
jest.mock('../kibana_services', () => {
return {
getMapsCapabilities() {
return { save: true };
},
};
});

import { mapExtentChanged, setMouseCoordinates, setQuery } from './map_actions';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@
import React from 'react';
import { shallow } from 'enzyme';

jest.mock('../../kibana_services', () => {
return {
getMapsCapabilities() {
return { save: true };
},
};
});

// @ts-ignore
import { ToolbarOverlay } from './toolbar_overlay';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@
import React from 'react';
import { shallowWithIntl } from 'test_utils/enzyme_helpers';

jest.mock('../../../../../kibana_services', () => {
return {
getMapsCapabilities() {
return { save: true };
},
};
});

import { TOCEntry } from './view';

const LAYER_ID = '1';
Expand Down
Loading