[Metrics UI] Saved views bugs (#72518) (#73396)

* Add test for logs and metrics telemetry * wait before you go * Remove kubenetes * Fix type check * Add back kubernetes test * Remove kubernetes * Don't allow deleting default default view. * Fix bug with duplicate loads of data. Because the load data function takes options.source and the source of options can change, we need to remove it from deps * Remove unused variable * Reload when loadData function is changed * Don't send the request immediately Co-authored-by: Elastic Machine <[email protected]> Co-authored-by: Elastic Machine <[email protected]>
elastic · Jul 28, 2020 · 6be73e6 · 6be73e6
1 parent 88b373f
commit 6be73e6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/x-pack/plugins/infra/public/components/saved_views/manage_views_flyout.tsx b/x-pack/plugins/infra/public/components/saved_views/manage_views_flyout.tsx
@@ -96,6 +96,10 @@ export function SavedViewManageViewsFlyout<ViewState>({
 
   const renderDeleteAction = useCallback(
     (item: SavedView<ViewState>) => {
+      if (item.id === '0') {
+        return <></>;
+      }
+
       return (
         <DeleteConfimation
           isDisabled={item.isDefault}

diff --git a/x-pack/plugins/infra/public/components/saved_views/toolbar_control.tsx b/x-pack/plugins/infra/public/components/saved_views/toolbar_control.tsx
@@ -161,7 +161,7 @@ export function SavedViewsToolbarControls<ViewState>(props: Props<ViewState>) {
                 />
               </EuiFlexItem>
               <EuiFlexItem>
-                <EuiDescriptionList onClick={showSavedViewMenu}>
+                <EuiDescriptionList compressed={true} onClick={showSavedViewMenu}>
                   <EuiDescriptionListTitle>
                     <FormattedMessage
                       defaultMessage="Current view"

diff --git a/x-pack/plugins/infra/public/containers/saved_view/saved_view.tsx b/x-pack/plugins/infra/public/containers/saved_view/saved_view.tsx
@@ -50,7 +50,7 @@ export const useSavedView = (props: Props) => {
   const { data, loading, find, error: errorOnFind, hasView } = useFindSavedObject<
     SavedViewSavedObject<ViewState>
   >(viewType);
-
+  const [shouldLoadDefault] = useState(props.shouldLoadDefault);
   const [currentView, setCurrentView] = useState<SavedView<any> | null>(null);
   const [loadingDefaultView, setLoadingDefaultView] = useState<boolean | null>(null);
   const { create, error: errorOnCreate, data: createdViewData, createdId } = useCreateSavedObject(
@@ -211,8 +211,6 @@ export const useSavedView = (props: Props) => {
   }, [setCurrentView, defaultViewId, defaultViewState]);
 
   useEffect(() => {
-    const shouldLoadDefault = props.shouldLoadDefault;
-
     if (loadingDefaultView || currentView || !shouldLoadDefault) {
       return;
     }
@@ -225,7 +223,7 @@ export const useSavedView = (props: Props) => {
     }
   }, [
     loadDefaultView,
-    props.shouldLoadDefault,
+    shouldLoadDefault,
     setDefault,
     loadingDefaultView,
     currentView,
@@ -246,7 +244,7 @@ export const useSavedView = (props: Props) => {
     errorOnUpdate,
     errorOnFind,
     errorOnCreate: createError,
-    shouldLoadDefault: props.shouldLoadDefault,
+    shouldLoadDefault,
     makeDefault,
     sourceIsLoading,
     deleteView,

diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout.tsx
@@ -55,7 +55,8 @@ export const Layout = () => {
     sourceId,
     currentTime,
     accountId,
-    region
+    region,
+    false
   );
 
   const options = {

diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx
@@ -57,7 +57,8 @@ export const MetricsExplorerPage = ({ source, derivedIndexPattern }: MetricsExpl
       // load metrics explorer data after default view loaded, unless we're not loading a view
       loadData();
     }
-  }, [loadData, currentView, shouldLoadDefault]);
+    /* eslint-disable-next-line react-hooks/exhaustive-deps */
+  }, [loadData, shouldLoadDefault]);
 
   return (
     <EuiErrorBoundary>