fix observibility dashboard delete (#4508)

opensearch-project · Jul 6, 2023 · fe0104d · fe0104d
1 parent c00982f
commit fe0104d
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/plugins/dashboard/public/application/components/dashboard_listing.tsx b/src/plugins/dashboard/public/application/components/dashboard_listing.tsx
@@ -31,15 +31,14 @@ export const DashboardListing = () => {
       history,
       uiSettings,
       notifications,
-      savedDashboards,
       dashboardProviders,
       data: { query },
       osdUrlStateStorage,
     },
   } = useOpenSearchDashboards<DashboardServices>();
 
   const location = useLocation();
-  const queryParameters = new URLSearchParams(location.search);
+  const queryParameters = useMemo(() => new URLSearchParams(location.search), [location]);
   const initialFiltersFromURL = queryParameters.get('filter');
   const [initialFilter, setInitialFilter] = useState<string | null>(initialFiltersFromURL);
 
@@ -168,10 +167,18 @@ export const DashboardListing = () => {
   // );
 
   const deleteItems = useCallback(
-    (dashboards: object[]) => {
-      return savedDashboards.delete(dashboards.map((d: any) => d.id));
+    async (dashboards: object[]) => {
+      await Promise.all(
+        dashboards.map((dashboard: any) => savedObjectsClient.delete(dashboard.appId, dashboard.id))
+      ).catch((error) => {
+        notifications.toasts.addError(error, {
+          title: i18n.translate('dashboard.dashboardListingDeleteErrorTitle', {
+            defaultMessage: 'Error deleting dashboard',
+          }),
+        });
+      });
     },
-    [savedDashboards]
+    [savedObjectsClient, notifications]
   );
 
   useMount(() => {