Rename VisualizeConstants from _URL to _PATH.

stacey-gammon · Feb 16, 2017 · 91dfe1a · 91dfe1a
1 parent 8129fcd
commit 91dfe1a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/src/core_plugins/kibana/public/visualize/editor/editor.js b/src/core_plugins/kibana/public/visualize/editor/editor.js
@@ -21,7 +21,7 @@ import { DashboardConstants } from 'plugins/kibana/dashboard/dashboard_constants
 import { VisualizeConstants } from '../visualize_constants';
 
 uiRoutes
-.when(VisualizeConstants.CREATE_URL, {
+.when(VisualizeConstants.CREATE_PATH, {
  template: editorTemplate,
  resolve: {
  savedVis: function (savedVisualizations, courier, $route, Private) {
@@ -38,7 +38,7 @@ uiRoutes
  }
  }
 })
-.when(`${VisualizeConstants.EDIT_URL}/:id`, {
+.when(`${VisualizeConstants.EDIT_PATH}/:id`, {
  template: editorTemplate,
  resolve: {
  savedVis: function (savedVisualizations, courier, $route) {
@@ -313,7 +313,7 @@ function VisEditor($scope, $route, timefilter, AppState, $window, kbnUrl, courie
  } else if (savedVis.id === $route.current.params.id) {
  docTitle.change(savedVis.lastSavedTitle);
  } else {
- kbnUrl.change(`${VisualizeConstants.EDIT_URL}/{{id}}`, { id: savedVis.id });
+ kbnUrl.change(`${VisualizeConstants.EDIT_PATH}/{{id}}`, { id: savedVis.id });
  }
  }
  }, notify.fatal);

diff --git a/src/core_plugins/kibana/public/visualize/index.js b/src/core_plugins/kibana/public/visualize/index.js
@@ -27,7 +27,7 @@ uiRoutes
 .defaults(/visualize/, {
  requireDefaultIndex: true
 })
-.when(VisualizeConstants.LANDING_PAGE_URL, {
+.when(VisualizeConstants.LANDING_PAGE_PATH, {
  template: visualizeListingTemplate,
  controller: VisualizeListingController,
  controllerAs: 'listingController',

diff --git a/src/core_plugins/kibana/public/visualize/visualize_constants.js b/src/core_plugins/kibana/public/visualize/visualize_constants.js
@@ -1,7 +1,7 @@
 export const VisualizeConstants = {
- LANDING_PAGE_URL: '/visualize',
- WIZARD_STEP_1_PAGE_URL: '/visualize/new',
- WIZARD_STEP_2_PAGE_URL: '/visualize/new/configure',
- CREATE_URL: '/visualize/create',
- EDIT_URL: '/visualize/edit',
+ LANDING_PAGE_PATH: '/visualize',
+ WIZARD_STEP_1_PAGE_PATH: '/visualize/new',
+ WIZARD_STEP_2_PAGE_PATH: '/visualize/new/configure',
+ CREATE_PATH: '/visualize/create',
+ EDIT_PATH: '/visualize/edit',
 };
diff --git a/src/core_plugins/kibana/public/visualize/wizard/wizard.js b/src/core_plugins/kibana/public/visualize/wizard/wizard.js
@@ -18,10 +18,10 @@ const module = uiModules.get('app/visualize', ['kibana/courier']);
 
 // Redirect old route to new route.
 routes.when('/visualize/step/1', {
- redirectTo: VisualizeConstants.WIZARD_STEP_1_PAGE_URL,
+ redirectTo: VisualizeConstants.WIZARD_STEP_1_PAGE_PATH,
 });
 
-routes.when(VisualizeConstants.WIZARD_STEP_1_PAGE_URL, {
+routes.when(VisualizeConstants.WIZARD_STEP_1_PAGE_PATH, {
  template: visualizeWizardStep1Template,
  controller: 'VisualizeWizardStep1',
 });
@@ -37,8 +37,8 @@ module.controller('VisualizeWizardStep1', function ($scope, $route, kbnUrl, time
  $scope.visTypeUrl = function (visType) {
  const baseUrl =
  visType.requiresSearch
- ? `#${VisualizeConstants.WIZARD_STEP_2_PAGE_URL}?`
- : `#${VisualizeConstants.CREATE_URL}?`;
+ ? `#${VisualizeConstants.WIZARD_STEP_2_PAGE_PATH}?`
+ : `#${VisualizeConstants.CREATE_PATH}?`;
 
  const params = [`type=${encodeURIComponent(visType.name)}`];
 
@@ -58,10 +58,10 @@ module.controller('VisualizeWizardStep1', function ($scope, $route, kbnUrl, time
 // NOTE: Accessing this route directly means the user has entered into the wizard UX without
 // selecting a Visualization type in step 1. So we want to redirect them to step 1, not step 2.
 routes.when('/visualize/step/2', {
- redirectTo: VisualizeConstants.WIZARD_STEP_1_PAGE_URL,
+ redirectTo: VisualizeConstants.WIZARD_STEP_1_PAGE_PATH,
 });
 
-routes.when(VisualizeConstants.WIZARD_STEP_2_PAGE_URL, {
+routes.when(VisualizeConstants.WIZARD_STEP_2_PAGE_PATH, {
  template: visualizeWizardStep2Template,
  controller: 'VisualizeWizardStep2',
  resolve: {
@@ -79,15 +79,15 @@ module.controller('VisualizeWizardStep2', function ($route, $scope, timefilter,
  $scope.step2WithSearchUrl = function (hit) {
  if (addToDashMode) {
  return kbnUrl.eval(
- `#${VisualizeConstants.CREATE_URL}` +
+ `#${VisualizeConstants.CREATE_PATH}` +
  `?type={{type}}&savedSearchId={{id}}` +
  `&${DashboardConstants.ADD_VISUALIZATION_TO_DASHBOARD_MODE_PARAM}`,
  { type: type, id: hit.id }
  );
  }
 
  return kbnUrl.eval(
- `#${VisualizeConstants.CREATE_URL}?type={{type}}&savedSearchId={{id}}`,
+ `#${VisualizeConstants.CREATE_PATH}?type={{type}}&savedSearchId={{id}}`,
  { type: type, id: hit.id }
  );
  };
@@ -103,11 +103,11 @@ module.controller('VisualizeWizardStep2', function ($route, $scope, timefilter,
  if (!pattern) return;
 
  if (addToDashMode) {
- return `#${VisualizeConstants.CREATE_URL}` +
+ return `#${VisualizeConstants.CREATE_PATH}` +
  `?${DashboardConstants.ADD_VISUALIZATION_TO_DASHBOARD_MODE_PARAM}` +
  `&type=${type}&indexPattern=${pattern}`;
  }
 
- return `#${VisualizeConstants.CREATE_URL}?type=${type}&indexPattern=${pattern}`;
+ return `#${VisualizeConstants.CREATE_PATH}?type=${type}&indexPattern=${pattern}`;
  };
 });