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] Originating App Breadcrumb #75692

Merged
merged 5 commits into from
Aug 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
@@ -0,0 +1,36 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/

import { getBreadcrumbs } from './get_breadcrumbs';

jest.mock('../../../kibana_services', () => {});
jest.mock('../../maps_router', () => {});

const getHasUnsavedChanges = () => {
return false;
};

test('should get breadcrumbs "Maps / mymap"', () => {
const breadcrumbs = getBreadcrumbs({ title: 'mymap', getHasUnsavedChanges });
expect(breadcrumbs.length).toBe(2);
expect(breadcrumbs[0].text).toBe('Maps');
expect(breadcrumbs[1].text).toBe('mymap');
});

test('should get breadcrumbs "Dashboard / Maps / mymap" with originatingApp', () => {
const breadcrumbs = getBreadcrumbs({
title: 'mymap',
getHasUnsavedChanges,
originatingApp: 'dashboardId',
getAppNameFromId: (appId) => {
return 'Dashboard';
},
});
expect(breadcrumbs.length).toBe(3);
expect(breadcrumbs[0].text).toBe('Dashboard');
expect(breadcrumbs[1].text).toBe('Maps');
expect(breadcrumbs[2].text).toBe('mymap');
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/

import { i18n } from '@kbn/i18n';
import { getNavigateToApp } from '../../../kibana_services';
// @ts-expect-error
import { goToSpecifiedPath } from '../../maps_router';

export const unsavedChangesWarning = i18n.translate(
'xpack.maps.breadCrumbs.unsavedChangesWarning',
{
defaultMessage: 'Your map has unsaved changes. Are you sure you want to leave?',
}
);

export function getBreadcrumbs({
title,
getHasUnsavedChanges,
originatingApp,
getAppNameFromId,
}: {
title: string;
getHasUnsavedChanges: () => boolean;
originatingApp?: string;
getAppNameFromId?: (id: string) => string;
}) {
const breadcrumbs = [];
if (originatingApp && getAppNameFromId) {
breadcrumbs.push({
onClick: () => {
getNavigateToApp()(originatingApp);
},
text: getAppNameFromId(originatingApp),
});
}

breadcrumbs.push({
text: i18n.translate('xpack.maps.mapController.mapsBreadcrumbLabel', {
defaultMessage: 'Maps',
}),
onClick: () => {
if (getHasUnsavedChanges()) {
const navigateAway = window.confirm(unsavedChangesWarning);
if (navigateAway) {
goToSpecifiedPath('/');
}
} else {
goToSpecifiedPath('/');
}
},
});

breadcrumbs.push({ text: title });

return breadcrumbs;
}
36 changes: 10 additions & 26 deletions x-pack/plugins/maps/public/routing/routes/maps_app/maps_app_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
*/

import React from 'react';
import { i18n } from '@kbn/i18n';
import 'mapbox-gl/dist/mapbox-gl.css';
import _ from 'lodash';
import { DEFAULT_IS_LAYER_TOC_OPEN } from '../../../reducers/ui';
Expand All @@ -29,13 +28,9 @@ import { AppStateManager } from '../../state_syncing/app_state_manager';
import { startAppStateSyncing } from '../../state_syncing/app_sync';
import { esFilters } from '../../../../../../../src/plugins/data/public';
import { MapContainer } from '../../../connected_components/map_container';
import { goToSpecifiedPath } from '../../maps_router';
import { getIndexPatternsFromIds } from '../../../index_pattern_util';
import { getTopNavConfig } from './top_nav_config';

const unsavedChangesWarning = i18n.translate('xpack.maps.breadCrumbs.unsavedChangesWarning', {
defaultMessage: 'Your map has unsaved changes. Are you sure you want to leave?',
});
import { getBreadcrumbs, unsavedChangesWarning } from './get_breadcrumbs';

export class MapsAppView extends React.Component {
_globalSyncUnsubscribe = null;
Expand Down Expand Up @@ -104,7 +99,7 @@ export class MapsAppView extends React.Component {
getCoreChrome().setBreadcrumbs([]);
}

_hasUnsavedChanges() {
_hasUnsavedChanges = () => {
const savedLayerList = this.props.savedMap.getLayerList();
return !savedLayerList
? !_.isEqual(this.props.layerListConfigOnly, this.state.initialLayerListConfig)
Expand All @@ -114,27 +109,16 @@ export class MapsAppView extends React.Component {
// Need to perform the same process for layerListConfigOnly to compare apples to apples
// and avoid undefined properties in layerListConfigOnly triggering unsaved changes.
!_.isEqual(JSON.parse(JSON.stringify(this.props.layerListConfigOnly)), savedLayerList);
}
};

_setBreadcrumbs = () => {
getCoreChrome().setBreadcrumbs([
{
text: i18n.translate('xpack.maps.mapController.mapsBreadcrumbLabel', {
defaultMessage: 'Maps',
}),
onClick: () => {
if (this._hasUnsavedChanges()) {
const navigateAway = window.confirm(unsavedChangesWarning);
if (navigateAway) {
goToSpecifiedPath('/');
}
} else {
goToSpecifiedPath('/');
}
},
},
{ text: this.props.savedMap.title },
]);
const breadcrumbs = getBreadcrumbs({
title: this.props.savedMap.title,
getHasUnsavedChanges: this._hasUnsavedChanges,
originatingApp: this.state.originatingApp,
getAppNameFromId: this.props.stateTransfer.getAppNameFromId,
});
getCoreChrome().setBreadcrumbs(breadcrumbs);
};

_updateFromGlobalState = ({ changes, state: globalState }) => {
Expand Down