fix(infra): handle not found view with fallback to default

elastic · Apr 28, 2023 · cca3426 · cca3426
1 parent 1ffd3e4
commit cca3426
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/x-pack/plugins/infra/public/hooks/use_inventory_views.ts b/x-pack/plugins/infra/public/hooks/use_inventory_views.ts
@@ -111,7 +111,10 @@ export const useInventoryViews = (): UseInventoryViewsResult => {
  const { data: currentView, isFetching: isFetchingCurrentView } = useQuery({
  queryKey: queryKeys.getById(currentViewId),
  queryFn: ({ queryKey: [, id] }) => inventoryViews.client.getInventoryView(id),
- onError: (error: ServerError) => notify.getViewFailure(error.body?.message ?? error.message),
+ onError: (error: ServerError) => {
+ notify.getViewFailure(error.body?.message ?? error.message);
+ switchViewById(defaultViewId);
+ },
  placeholderData: null,
  });
 

diff --git a/x-pack/plugins/infra/public/hooks/use_metrics_explorer_views.ts b/x-pack/plugins/infra/public/hooks/use_metrics_explorer_views.ts
@@ -111,7 +111,10 @@ export const useMetricsExplorerViews = (): UseMetricsExplorerViewsResult => {
  const { data: currentView, isFetching: isFetchingCurrentView } = useQuery({
  queryKey: queryKeys.getById(currentViewId),
  queryFn: ({ queryKey: [, id] }) => metricsExplorerViews.client.getMetricsExplorerView(id),
- onError: (error: ServerError) => notify.getViewFailure(error.body?.message ?? error.message),
+ onError: (error: ServerError) => {
+ notify.getViewFailure(error.body?.message ?? error.message);
+ switchViewById(defaultViewId);
+ },
  placeholderData: null,
  });
 

diff --git a/x-pack/plugins/infra/public/hooks/use_saved_views_notifier.ts b/x-pack/plugins/infra/public/hooks/use_saved_views_notifier.ts
@@ -6,6 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { useMemo } from 'react';
 import { useKibanaContextForPlugin } from './use_kibana';
 
 export const useSavedViewsNotifier = () => {
@@ -44,9 +45,12 @@ export const useSavedViewsNotifier = () => {
  });
  };
 
- return {
- deleteViewFailure,
- getViewFailure,
- upsertViewFailure,
- };
+ return useMemo(
+ () => ({
+ deleteViewFailure,
+ getViewFailure,
+ upsertViewFailure,
+ }),
+ []
+ );
 };