From e674f6c315849542fbd1c9f1deac37aa6422d22b Mon Sep 17 00:00:00 2001
From: CJ Cenizal <cj@cenizal.com>
Date: Fri, 23 Dec 2016 13:46:21 -0800
Subject: [PATCH] Move visualize/landing route to live at visualize/ instead.

---
 .../kibana/public/visualize/index.js          |  7 +++--
 .../public/visualize/landing/landing.js       | 11 --------
 .../visualize_listing.html}                   | 28 +++++++++----------
 .../visualize_listing.js}                     |  2 +-
 4 files changed, 20 insertions(+), 28 deletions(-)
 delete mode 100644 src/core_plugins/kibana/public/visualize/landing/landing.js
 rename src/core_plugins/kibana/public/visualize/{landing/visualize_landing.html => listing/visualize_listing.html} (82%)
 rename src/core_plugins/kibana/public/visualize/{landing/visualize_landing.js => listing/visualize_listing.js} (97%)

diff --git a/src/core_plugins/kibana/public/visualize/index.js b/src/core_plugins/kibana/public/visualize/index.js
index 21154c7ca46b6..e362b15f771ee 100644
--- a/src/core_plugins/kibana/public/visualize/index.js
+++ b/src/core_plugins/kibana/public/visualize/index.js
@@ -1,6 +1,5 @@
 import 'plugins/kibana/visualize/styles/main.less';
 import 'plugins/kibana/visualize/editor/editor';
-import 'plugins/kibana/visualize/landing/landing';
 import 'plugins/kibana/visualize/wizard/wizard';
 import 'plugins/kibana/visualize/editor/add_bucket_agg';
 import 'plugins/kibana/visualize/editor/agg';
@@ -19,13 +18,17 @@ import 'plugins/kibana/visualize/saved_visualizations/_saved_vis';
 import 'plugins/kibana/visualize/saved_visualizations/saved_visualizations';
 import uiRoutes from 'ui/routes';
 
+import visualizeListingTemplate from './listing/visualize_listing.html';
+import { VisualizeListingController } from './listing/visualize_listing';
 
 uiRoutes
 .defaults(/visualize/, {
   requireDefaultIndex: true
 })
 .when('/visualize', {
-  redirectTo: '/visualize/landing'
+  template: visualizeListingTemplate,
+  controller: VisualizeListingController,
+  controllerAs: 'listingController',
 });
 
 // preloading
diff --git a/src/core_plugins/kibana/public/visualize/landing/landing.js b/src/core_plugins/kibana/public/visualize/landing/landing.js
deleted file mode 100644
index bd563b0aa00e5..0000000000000
--- a/src/core_plugins/kibana/public/visualize/landing/landing.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import routes from 'ui/routes';
-import modules from 'ui/modules';
-import visualizeLandingTemplate from './visualize_landing.html';
-import { VisualizeLandingController } from './visualize_landing';
-
-routes
-.when('/visualize/landing', {
-  template: visualizeLandingTemplate,
-  controller: VisualizeLandingController,
-  controllerAs: 'landingController',
-});
diff --git a/src/core_plugins/kibana/public/visualize/landing/visualize_landing.html b/src/core_plugins/kibana/public/visualize/listing/visualize_listing.html
similarity index 82%
rename from src/core_plugins/kibana/public/visualize/landing/visualize_landing.html
rename to src/core_plugins/kibana/public/visualize/listing/visualize_listing.html
index 08a566a2a9694..df487b7734716 100644
--- a/src/core_plugins/kibana/public/visualize/landing/visualize_landing.html
+++ b/src/core_plugins/kibana/public/visualize/listing/visualize_listing.html
@@ -25,7 +25,7 @@
             type="text"
             placeholder="Search..."
             aria-label="Filter"
-            ng-model="landingController.filter"
+            ng-model="listingController.filter"
           >
         </div>
       </div>
@@ -34,10 +34,10 @@
         <!-- Bulk delete button -->
         <button
           class="kuiButton kuiButton--danger kuiButton--iconText"
-          confirm-click="landingController.deleteSelectedItems()"
+          confirm-click="listingController.deleteSelectedItems()"
           confirmation="Are you sure you want to delete the selected visualizations? This action is irreversible!"
           aria-label="Delete selected objects"
-          ng-hide="landingController.getSelectedItemsCount() === 0"
+          ng-hide="listingController.getSelectedItemsCount() === 0"
         >
           <span aria-hidden="true" class="kuiButton__icon kuiIcon fa-trash"></span>
           Delete
@@ -48,7 +48,7 @@
           class="kuiButton kuiButton--primary kuiButton--iconText"
           href="#/visualize/step/1"
           aria-label="Create new visualization"
-          ng-hide="landingController.getSelectedItemsCount() > 0"
+          ng-hide="listingController.getSelectedItemsCount() > 0"
         >
           <span aria-hidden="true" class="kuiButton__icon kuiIcon fa-plus"></span>
           Create visualization
@@ -61,22 +61,22 @@
     </div>
 
     <!-- NoResults -->
-    <div class="kuiPanel kuiPanel--centered" ng-if="!landingController.items.length">
+    <div class="kuiPanel kuiPanel--centered" ng-if="!listingController.items.length">
       <div class="kuiNoResults">
         No visualizations matched your search.
       </div>
     </div>
 
     <!-- Table -->
-    <table class="kuiTable" ng-if="landingController.items.length">
+    <table class="kuiTable" ng-if="listingController.items.length">
       <thead>
         <tr>
           <th class="kuiTableHeaderCell kuiTableHeaderCell--checkBox">
             <input
               type="checkbox"
               class="kuiCheckBox"
-              ng-checked="landingController.areAllItemsChecked()"
-              ng-click="landingController.toggleAll()"
+              ng-checked="listingController.areAllItemsChecked()"
+              ng-click="listingController.toggleAll()"
             >
           </th>
 
@@ -95,15 +95,15 @@
 
       <tbody>
         <tr
-          ng-repeat="item in landingController.items track by item.id | orderBy:'title'"
+          ng-repeat="item in listingController.items track by item.id | orderBy:'title'"
           class="kuiTableRow"
         >
           <td class="kuiTableRowCell kuiTableRowCell--checkBox">
             <input
               type="checkbox"
               class="kuiCheckBox"
-              ng-click="landingController.toggleItem(item)"
-              ng-checked="landingController.isItemChecked(item)"
+              ng-click="listingController.toggleItem(item)"
+              ng-checked="listingController.isItemChecked(item)"
             >
           </td>
 
@@ -119,7 +119,7 @@
 
               <button
                 class="kuiMicroButton kuiTableRowHoverReveal"
-                ng-click="landingController.edit(item)"
+                ng-click="listingController.edit(item)"
                 aria-label="Edit"
                 tooltip="Edit object"
               >
@@ -144,8 +144,8 @@
     <!-- ToolBarFooter -->
     <div class="kuiToolBarFooter">
       <div class="kuiToolBarFooterSection">
-        <div class="kuiToolBarText" ng-hide="landingController.getSelectedItemsCount() === 0">
-          {{ landingController.getSelectedItemsCount() }} selected
+        <div class="kuiToolBarText" ng-hide="listingController.getSelectedItemsCount() === 0">
+          {{ listingController.getSelectedItemsCount() }} selected
         </div>
       </div>
       <div class="kuiToolBarFooterSection">
diff --git a/src/core_plugins/kibana/public/visualize/landing/visualize_landing.js b/src/core_plugins/kibana/public/visualize/listing/visualize_listing.js
similarity index 97%
rename from src/core_plugins/kibana/public/visualize/landing/visualize_landing.js
rename to src/core_plugins/kibana/public/visualize/listing/visualize_listing.js
index e94fd3154dcce..240898e63033b 100644
--- a/src/core_plugins/kibana/public/visualize/landing/visualize_landing.js
+++ b/src/core_plugins/kibana/public/visualize/listing/visualize_listing.js
@@ -1,6 +1,6 @@
 import SavedObjectRegistryProvider from 'ui/saved_objects/saved_object_registry';
 
-export function VisualizeLandingController(
+export function VisualizeListingController(
   $scope,
   kbnUrl,
   Notifier,