Add ConfirmationModal for deleting visualizations.

cjcenizal · Feb 4, 2017 · d0325ba · d0325ba
1 parent f243762
commit d0325ba
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/src/core_plugins/kibana/public/visualize/listing/visualize_listing.html b/src/core_plugins/kibana/public/visualize/listing/visualize_listing.html
@@ -38,10 +38,9 @@
         <!-- Bulk delete button -->
         <button
           class="kuiButton kuiButton--danger"
-          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-if="listingController.getSelectedItemsCount() > 0"
+          ng-click="listingController.deleteSelectedItems()"
           tooltip="Delete selected visualizations"
         >
           <span aria-hidden="true" class="kuiButton__icon kuiIcon fa-trash"></span>

diff --git a/src/core_plugins/kibana/public/visualize/listing/visualize_listing.js b/src/core_plugins/kibana/public/visualize/listing/visualize_listing.js
@@ -2,6 +2,7 @@ import SavedObjectRegistryProvider from 'ui/saved_objects/saved_object_registry'
 
 export function VisualizeListingController(
   $scope,
+  confirmModal,
   kbnUrl,
   Notifier,
   Private,
@@ -56,14 +57,23 @@ export function VisualizeListingController(
   };
 
   this.deleteSelectedItems = function deleteSelectedItems() {
-    const selectedIds = selectedItems.map(item => item.id);
+    const doDelete = () => {
+      const selectedIds = selectedItems.map(item => item.id);
 
-    visualizationService.delete(selectedIds)
-      .then(fetchObjects)
-      .then(() => {
-        selectedItems = [];
-      })
-      .catch(error => notify.error(error));
+      visualizationService.delete(selectedIds)
+        .then(fetchObjects)
+        .then(() => {
+          selectedItems = [];
+        })
+        .catch(error => notify.error(error));
+    };
+
+    confirmModal(
+      'Are you sure you want to delete the selected visualizations? This action is irreversible!',
+      {
+        confirmButtonText: 'Delete',
+        onConfirm: doDelete
+      });
   };
 
   this.getUrlForItem = function getUrlForItem(item) {