[Maps] avoid using MAP_SAVED_OBJECT_TYPE constant when defining URL p…

…aths
elastic · Jun 23, 2020 · d9ce877 · d9ce877
1 parent 1cdeec0
commit d9ce877
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/x-pack/plugins/maps/common/constants.ts b/x-pack/plugins/maps/common/constants.ts
@@ -27,13 +27,16 @@ export const APP_ID = 'maps';
 export const APP_ICON = 'gisApp';
 export const TELEMETRY_TYPE = 'maps-telemetry';
 
-export const MAP_APP_PATH = `app/${APP_ID}`;
+export const MAPS_APP_PATH = `app/${APP_ID}`;
+export const MAP_PATH = 'map';
 export const GIS_API_PATH = `api/${APP_ID}`;
 export const INDEX_SETTINGS_API_PATH = `${GIS_API_PATH}/indexSettings`;
 export const FONTS_API_PATH = `${GIS_API_PATH}/fonts`;
 
-export const MAP_BASE_URL = `/${MAP_APP_PATH}/${MAP_SAVED_OBJECT_TYPE}`;
-
+const MAP_BASE_URL = `/${MAPS_APP_PATH}/${MAP_PATH}`;
+export function createNewMapPath() {
+  return MAP_BASE_URL;
+}
 export function createMapPath(id: string) {
   return `${MAP_BASE_URL}/${id}`;
 }

diff --git a/x-pack/plugins/maps/public/maps_vis_type_alias.js b/x-pack/plugins/maps/public/maps_vis_type_alias.js
@@ -5,7 +5,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { APP_ID, APP_ICON, MAP_SAVED_OBJECT_TYPE } from '../common/constants';
+import { APP_ID, APP_ICON, MAP_PATH } from '../common/constants';
 import { getShowMapVisualizationTypes, getVisualizations } from './kibana_services';
 
 export function getMapsVisTypeAlias() {
@@ -28,7 +28,7 @@ The Maps app offers more functionality and is easier to use.`,
 
   return {
     aliasApp: APP_ID,
-    aliasPath: `/${MAP_SAVED_OBJECT_TYPE}`,
+    aliasPath: `/${MAP_PATH}`,
     name: APP_ID,
     title: i18n.translate('xpack.maps.visTypeAlias.title', {
       defaultMessage: 'Maps',

diff --git a/x-pack/plugins/maps/public/routing/bootstrap/services/saved_gis_map.js b/x-pack/plugins/maps/public/routing/bootstrap/services/saved_gis_map.js
@@ -19,7 +19,7 @@ import {
 import { getIsLayerTOCOpen, getOpenTOCDetails } from '../../../selectors/ui_selectors';
 import { copyPersistentState } from '../../../reducers/util';
 import { extractReferences, injectReferences } from '../../../../common/migrations/references';
-import { MAP_BASE_URL, MAP_SAVED_OBJECT_TYPE } from '../../../../common/constants';
+import { createMapPath, MAP_SAVED_OBJECT_TYPE } from '../../../../common/constants';
 import { getStore } from '../../store_operations';
 
 export function createSavedGisMapClass(services) {
@@ -76,7 +76,7 @@ export function createSavedGisMapClass(services) {
     }
 
     getFullPath() {
-      return `${MAP_BASE_URL}/${this.id}`;
+      return createMapPath(this.id);
     }
 
     getLayerList() {

diff --git a/x-pack/plugins/maps/public/routing/page_elements/breadcrumbs.js b/x-pack/plugins/maps/public/routing/page_elements/breadcrumbs.js
@@ -6,7 +6,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { getCoreChrome } from '../../kibana_services';
-import { MAP_SAVED_OBJECT_TYPE } from '../../../common/constants';
+import { MAP_PATH } from '../../../common/constants';
 import _ from 'lodash';
 import { getLayerListRaw } from '../../selectors/map_selectors';
 import { copyPersistentState } from '../../reducers/util';
@@ -31,7 +31,7 @@ function hasUnsavedChanges(savedMap, initialLayerListConfig) {
 }
 
 export const updateBreadcrumbs = (savedMap, initialLayerListConfig, currentPath = '') => {
-  const isOnMapNow = currentPath.startsWith(`/${MAP_SAVED_OBJECT_TYPE}`);
+  const isOnMapNow = currentPath.startsWith(`/${MAP_PATH}`);
   const breadCrumbs = isOnMapNow
     ? [
         {

diff --git a/x-pack/plugins/maps/server/tutorials/ems/index.ts b/x-pack/plugins/maps/server/tutorials/ems/index.ts
@@ -6,7 +6,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { TutorialsCategory } from '../../../../../../src/plugins/home/server';
-import { MAP_BASE_URL } from '../../../common/constants';
+import { createNewMapPath } from '../../../common/constants';
 
 export function emsBoundariesSpecProvider({
   emsLandingPageUrl,
@@ -64,7 +64,7 @@ Indexing EMS administrative boundaries in Elasticsearch allows for search on bou
 2. Click `Add layer`, then select `Upload GeoJSON`.\n\
 3. Upload the GeoJSON file and click `Import file`.',
                     values: {
-                      newMapUrl: prependBasePath(MAP_BASE_URL),
+                      newMapUrl: prependBasePath(createNewMapPath()),
                     },
                   }),
                 },