[FIX] Dashboard list integrated delete (#3796) (#3876)

* [FIx] Dashboard-List Integrated Delete * Add toast notification on deletion error * add toast notification dependency --------- (cherry picked from commit 9d27023) Signed-off-by: Peter Fitzgibbons <[email protected]> Signed-off-by: Josh Romero <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Peter Fitzgibbons <[email protected]> Co-authored-by: Josh Romero <[email protected]>
opensearch-project · Apr 18, 2023 · d476d23 · d476d23
1 parent 0ae76d2
commit d476d23
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/plugins/dashboard/public/application/application.ts b/src/plugins/dashboard/public/application/application.ts
@@ -37,6 +37,7 @@ import 'angular-sanitize';
 import { i18nDirective, i18nFilter, I18nProvider } from '@osd/i18n/angular';
 import {
   ChromeStart,
+  ToastsStart,
   IUiSettingsClient,
   CoreStart,
   SavedObjectsClientContract,
@@ -93,6 +94,7 @@ export interface RenderDeps {
   setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'];
   savedObjects: SavedObjectsStart;
   restorePreviousUrl: () => void;
+  toastNotifications: ToastsStart;
 }
 
 let angularModuleInstance: IModule | null = null;

diff --git a/src/plugins/dashboard/public/application/legacy_app.js b/src/plugins/dashboard/public/application/legacy_app.js
@@ -114,7 +114,6 @@ export function initDashboardApp(app, deps) {
           deps.core.chrome.docTitle.change(
             i18n.translate('dashboard.dashboardPageTitle', { defaultMessage: 'Dashboards' })
           );
-          const service = deps.savedDashboards;
           const dashboardConfig = deps.dashboardConfig;
 
           // syncs `_g` portion of url with query services
@@ -171,7 +170,18 @@ export function initDashboardApp(app, deps) {
             history.push(deps.addBasePath(viewUrl));
           };
           $scope.delete = (dashboards) => {
-            return service.delete(dashboards.map((d) => d.id));
+            const ids = dashboards.map((d) => ({ id: d.id, appId: d.appId }));
+            return Promise.all(
+              ids.map(({ id, appId }) => {
+                return deps.savedObjectsClient.delete(appId, id);
+              })
+            ).catch((error) => {
+              deps.toastNotifications.addError(error, {
+                title: i18n.translate('dashboard.dashboardListingDeleteErrorTitle', {
+                  defaultMessage: 'Error deleting dashboard',
+                }),
+              });
+            });
           };
           $scope.hideWriteControls = dashboardConfig.getHideWriteControls();
           $scope.initialFilter = parse(history.location.search).filter || EMPTY_FILTER;

diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx
@@ -344,7 +344,7 @@ export class DashboardPlugin
     registerDashboardProvider({
       savedObjectsType: 'dashboard',
       savedObjectsName: 'Dashboard',
-      appId: 'dashboards',
+      appId: 'dashboard',
       viewUrlPathFn: (obj) => `#/view/${obj.id}`,
       editUrlPathFn: (obj) => `/view/${obj.id}?_a=(viewMode:edit)`,
       createUrl: core.http.basePath.prepend('/app/dashboards#/create'),