github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Maps] Set maps tab title using same pattern used elsewhere in Kibana (#29976)

Browse source 
* Set maps tab title using same pattern used elsewhere in Kibana

* Include current map title in document title when open

* Only update doc title on /map/:id route. Update doc title on save action

* Remove fluffy formatting

* Remove string literal formatting
This commit is contained in:
Aaron Caldwell 2019-02-05 18:01:40 -07:00 • committed by GitHub
parent 4cec19d9ea
commit b84a65d415
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
x-pack/plugins/maps/public/angular/map_controller.js vendored
View file

@ -28,6 +28,7 @@ import {
} from '../store/ui';
import { getUniqueIndexPatternIds } from '../selectors/map_selectors';
import { Inspector } from 'ui/inspector';
import { DocTitleProvider } from 'ui/doc_title';
import { inspectorAdapters, indexPatternService } from '../kibana_services';
import { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal';
import { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
@ -42,7 +43,7 @@ const REACT_ANCHOR_DOM_ELEMENT_ID = 'react-maps-root';
const app = uiModules.get('app/maps', []);
app.controller('GisMapController', ($scope, $route, config, kbnUrl, localStorage, AppState, globalState) => {
app.controller('GisMapController', ($scope, $route, config, kbnUrl, localStorage, AppState, globalState, Private) => {
const savedMap = $scope.map = $route.current.locals.map;
let unsubscribe;
@ -206,10 +207,12 @@ app.controller('GisMapController', ($scope, $route, config, kbnUrl, localStorage
async function doSave(saveOptions) {
savedMap.syncWithStore(getStore().getState());
const docTitle = Private(DocTitleProvider);
let id;
try {
id = await savedMap.save(saveOptions);
docTitle.change(savedMap.title);
} catch(err) {
toastNotifications.addDanger({
title: `Error on saving '${savedMap.title}'`,

8
x-pack/plugins/maps/public/index.js
View file

@ -19,6 +19,7 @@ import 'ui/agg_types';
import chrome from 'ui/chrome';
import routes from 'ui/routes';
import { uiModules } from 'ui/modules';
import { DocTitleProvider } from 'ui/doc_title';
import 'ui/autoload/styles';
import 'ui/autoload/all';
import 'react-vis/dist/style.css';
@ -82,11 +83,14 @@ routes
template: mapTemplate,
controller: 'GisMapController',
resolve: {
map: function (gisMapSavedObjectLoader, redirectWhenMissing, $route) {
map: function (gisMapSavedObjectLoader, redirectWhenMissing, $route,
Private) {
const id = $route.current.params.id;
const docTitle = Private(DocTitleProvider);
return gisMapSavedObjectLoader.get(id)
.then((savedMap) => {
recentlyAccessed.add(savedMap.getFullPath(), savedMap.title, id);
docTitle.change(savedMap.title);
return savedMap;
})
.catch(redirectWhenMissing({
@ -97,4 +101,4 @@ routes
})
.otherwise({
redirectTo: '/'
});
});