Refactor Visualize routes into VisualizeConstants file. Fix functiona…

…l tests.
elastic · Feb 4, 2017 · 43ceb6e · 43ceb6e
1 parent 39ed424
commit 43ceb6e
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 27 deletions.
diff --git a/src/core_plugins/kibana/public/visualize/editor/editor.js b/src/core_plugins/kibana/public/visualize/editor/editor.js
@@ -18,9 +18,10 @@ import uiRoutes from 'ui/routes';
 import uiModules from 'ui/modules';
 import editorTemplate from 'plugins/kibana/visualize/editor/editor.html';
 import { DashboardConstants } from 'plugins/kibana/dashboard/dashboard_constants';
+import { VisualizeConstants } from '../visualize_constants';
 
 uiRoutes
-.when('/visualize/create', {
+.when(VisualizeConstants.CREATE_URL, {
   template: editorTemplate,
   resolve: {
     savedVis: function (savedVisualizations, courier, $route, Private) {
@@ -37,7 +38,7 @@ uiRoutes
     }
   }
 })
-.when('/visualize/edit/:id', {
+.when(`${VisualizeConstants.EDIT_URL}/:id`, {
   template: editorTemplate,
   resolve: {
     savedVis: function (savedVisualizations, courier, $route) {
@@ -286,10 +287,6 @@ function VisEditor($scope, $route, timefilter, AppState, $window, kbnUrl, courie
     }
   };
 
-  $scope.startOver = function () {
-    kbnUrl.change('/visualize', {});
-  };
-
   /**
    * Called when the user clicks "Save" button.
    */
@@ -315,7 +312,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('/visualize/edit/{{id}}', { id: savedVis.id });
+          kbnUrl.change(`${VisualizeConstants.EDIT_URL}/{{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
@@ -20,12 +20,13 @@ import uiRoutes from 'ui/routes';
 
 import visualizeListingTemplate from './listing/visualize_listing.html';
 import { VisualizeListingController } from './listing/visualize_listing';
+import { VisualizeConstants } from './visualize_constants';
 
 uiRoutes
 .defaults(/visualize/, {
   requireDefaultIndex: true
 })
-.when('/visualize', {
+.when(VisualizeConstants.LANDING_PAGE_URL, {
   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
@@ -0,0 +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',
+};
diff --git a/src/core_plugins/kibana/public/visualize/wizard/wizard.js b/src/core_plugins/kibana/public/visualize/wizard/wizard.js
@@ -1,9 +1,9 @@
-
 import 'plugins/kibana/visualize/saved_visualizations/saved_visualizations';
 import 'ui/directives/saved_object_finder';
 import 'ui/directives/paginated_selectable_list';
 import 'plugins/kibana/discover/saved_searches/saved_searches';
 import { DashboardConstants } from 'plugins/kibana/dashboard/dashboard_constants';
+import { VisualizeConstants } from '../visualize_constants';
 import routes from 'ui/routes';
 import RegistryVisTypesProvider from 'ui/registry/vis_types';
 import uiModules from 'ui/modules';
@@ -15,7 +15,7 @@ const module = uiModules.get('app/visualize', ['kibana/courier']);
 /********
 /** Wizard Step 1
 /********/
-routes.when('/visualize/new', {
+routes.when(VisualizeConstants.WIZARD_STEP_1_PAGE_URL, {
   template: visualizeWizardStep1Template,
   controller: 'VisualizeWizardStep1',
 });
@@ -27,9 +27,15 @@ module.controller('VisualizeWizardStep1', function ($scope, $route, kbnUrl, time
   kbnUrl.removeParam(DashboardConstants.ADD_VISUALIZATION_TO_DASHBOARD_MODE_PARAM);
 
   $scope.visTypes = Private(RegistryVisTypesProvider);
+
   $scope.visTypeUrl = function (visType) {
-    const baseUrl = visType.requiresSearch ? '#/visualize/new/configure?' : '#/visualize/create?';
+    const baseUrl =
+      visType.requiresSearch
+      ? `#${VisualizeConstants.WIZARD_STEP_2_PAGE_URL}?`
+      : `#${VisualizeConstants.CREATE_URL}?`;
+
     const params = [`type=${encodeURIComponent(visType.name)}`];
+
     if (addToDashMode) {
       params.push(DashboardConstants.ADD_VISUALIZATION_TO_DASHBOARD_MODE_PARAM);
     }
@@ -41,7 +47,7 @@ module.controller('VisualizeWizardStep1', function ($scope, $route, kbnUrl, time
 /********
 /** Wizard Step 2
 /********/
-routes.when('/visualize/new/configure', {
+routes.when(VisualizeConstants.WIZARD_STEP_2_PAGE_URL, {
   template: visualizeWizardStep2Template,
   controller: 'VisualizeWizardStep2',
   resolve: {
@@ -59,10 +65,17 @@ module.controller('VisualizeWizardStep2', function ($route, $scope, timefilter,
   $scope.step2WithSearchUrl = function (hit) {
     if (addToDashMode) {
       return kbnUrl.eval(
-        `#/visualize/create?&type={{type}}&savedSearchId={{id}}&${DashboardConstants.ADD_VISUALIZATION_TO_DASHBOARD_MODE_PARAM}`,
-        { type: type, id: hit.id });
+        `#${VisualizeConstants.CREATE_URL}` +
+        `?type={{type}}&savedSearchId={{id}}` +
+        `&${DashboardConstants.ADD_VISUALIZATION_TO_DASHBOARD_MODE_PARAM}`,
+        { type: type, id: hit.id }
+      );
     }
-    return kbnUrl.eval('#/visualize/create?&type={{type}}&savedSearchId={{id}}', { type: type, id: hit.id });
+
+    return kbnUrl.eval(
+      `#${VisualizeConstants.CREATE_URL}?type={{type}}&savedSearchId={{id}}`,
+      { type: type, id: hit.id }
+    );
   };
 
   timefilter.enabled = false;
@@ -76,8 +89,11 @@ module.controller('VisualizeWizardStep2', function ($route, $scope, timefilter,
     if (!pattern) return;
 
     if (addToDashMode) {
-      return `#/visualize/create?${DashboardConstants.ADD_VISUALIZATION_TO_DASHBOARD_MODE_PARAM}&type=${type}&indexPattern=${pattern}`;
+      return `#${VisualizeConstants.CREATE_URL}` +
+        `?${DashboardConstants.ADD_VISUALIZATION_TO_DASHBOARD_MODE_PARAM}` +
+        `&type=${type}&indexPattern=${pattern}`;
     }
-    return `#/visualize/create?type=${type}&indexPattern=${pattern}`;
+
+    return `#${VisualizeConstants.CREATE_URL}?type=${type}&indexPattern=${pattern}`;
   };
 });
diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js
@@ -14,7 +14,7 @@ bdd.describe('visualize app', function describeIndexTests() {
     const toTime = '2015-09-23 18:31:44.000';
 
     PageObjects.common.debug('navigateToApp visualize');
-    return PageObjects.common.navigateToUrl('visualize', 'step/1')
+    return PageObjects.common.navigateToUrl('visualize', 'new')
     .then(function () {
       PageObjects.common.debug('clickAreaChart');
       return PageObjects.visualize.clickAreaChart();

diff --git a/test/functional/apps/visualize/_chart_types.js b/test/functional/apps/visualize/_chart_types.js
@@ -10,7 +10,7 @@ bdd.describe('visualize app', function describeIndexTests() {
 
   bdd.before(function () {
     PageObjects.common.debug('navigateToApp visualize');
-    return PageObjects.common.navigateToUrl('visualize', 'step/1');
+    return PageObjects.common.navigateToUrl('visualize', 'new');
   });
 
   bdd.describe('chart types', function indexPatternCreation() {

diff --git a/test/functional/apps/visualize/_data_table.js b/test/functional/apps/visualize/_data_table.js
@@ -14,7 +14,7 @@ bdd.describe('visualize app', function describeIndexTests() {
 
   bdd.before(function () {
     PageObjects.common.debug('navigateToApp visualize');
-    return PageObjects.common.navigateToUrl('visualize', 'step/1')
+    return PageObjects.common.navigateToUrl('visualize', 'new')
     .then(function () {
       PageObjects.common.debug('clickDataTable');
       return PageObjects.visualize.clickDataTable();

diff --git a/test/functional/apps/visualize/_heatmap_chart.js b/test/functional/apps/visualize/_heatmap_chart.js
@@ -14,7 +14,7 @@ bdd.describe('visualize app', function describeIndexTests() {
 
   bdd.before(function () {
     PageObjects.common.debug('navigateToApp visualize');
-    return PageObjects.common.navigateToApp('visualize')
+    return PageObjects.common.navigateToUrl('visualize', 'new')
     .then(function () {
       PageObjects.common.debug('clickHeatmapChart');
       return PageObjects.visualize.clickHeatmapChart();

diff --git a/test/functional/apps/visualize/_line_chart.js b/test/functional/apps/visualize/_line_chart.js
@@ -14,7 +14,7 @@ bdd.describe('visualize app', function describeIndexTests() {
     const toTime = '2015-09-23 18:31:44.000';
 
     PageObjects.common.debug('navigateToApp visualize');
-    return PageObjects.common.navigateToUrl('visualize', 'step/1')
+    return PageObjects.common.navigateToUrl('visualize', 'new')
     .then(function () {
       PageObjects.common.debug('clickLineChart');
       return PageObjects.visualize.clickLineChart();

diff --git a/test/functional/apps/visualize/_metric_chart.js b/test/functional/apps/visualize/_metric_chart.js
@@ -14,7 +14,7 @@ bdd.describe('visualize app', function describeIndexTests() {
 
   bdd.before(function () {
     PageObjects.common.debug('navigateToApp visualize');
-    return PageObjects.common.navigateToUrl('visualize', 'step/1')
+    return PageObjects.common.navigateToUrl('visualize', 'new')
     .then(function () {
       PageObjects.common.debug('clickMetric');
       return PageObjects.visualize.clickMetric();

diff --git a/test/functional/apps/visualize/_pie_chart.js b/test/functional/apps/visualize/_pie_chart.js
@@ -14,7 +14,7 @@ bdd.describe('visualize app', function describeIndexTests() {
     const toTime = '2015-09-23 18:31:44.000';
 
     PageObjects.common.debug('navigateToApp visualize');
-    return PageObjects.common.navigateToUrl('visualize', 'step/1')
+    return PageObjects.common.navigateToUrl('visualize', 'new')
     .then(function () {
       PageObjects.common.debug('clickPieChart');
       return PageObjects.visualize.clickPieChart();

diff --git a/test/functional/apps/visualize/_tile_map.js b/test/functional/apps/visualize/_tile_map.js
@@ -15,7 +15,7 @@ bdd.describe('visualize app', function describeIndexTests() {
   bdd.before(function () {
 
     PageObjects.common.debug('navigateToApp visualize');
-    return PageObjects.common.navigateToUrl('visualize', 'step/1')
+    return PageObjects.common.navigateToUrl('visualize', 'new')
     .then(function () {
       PageObjects.common.debug('clickTileMap');
       return PageObjects.visualize.clickTileMap();

diff --git a/test/functional/apps/visualize/_vertical_bar_chart.js b/test/functional/apps/visualize/_vertical_bar_chart.js
@@ -14,7 +14,7 @@ bdd.describe('visualize app', function describeIndexTests() {
 
   bdd.before(function () {
     PageObjects.common.debug('navigateToApp visualize');
-    return PageObjects.common.navigateToUrl('visualize', 'step/1')
+    return PageObjects.common.navigateToUrl('visualize', 'new')
     .then(function () {
       PageObjects.common.debug('clickVerticalBarChart');
       return PageObjects.visualize.clickVerticalBarChart();

diff --git a/test/support/page_objects/visualize_page.js b/test/support/page_objects/visualize_page.js
@@ -334,7 +334,7 @@ export default class VisualizePage {
   clickLoadSavedVisButton() {
     // TODO: Use a test subject selector once we rewrite breadcrumbs to accept each breadcrumb
     // element as a child instead of building the breadcrumbs dynamically.
-    return self.remote
+    return this.remote
       .setFindTimeout(defaultFindTimeout)
       .findByCssSelector('[href="#/visualize"]')
       .click();