[7.x] [Ingest pipelines] Fix bug when deleting pipeline from details …

…panel (elastic#65216) (elastic#65344)
spalger · May 5, 2020 · 1fed9f0 · 1fed9f0
1 parent cd23f6d
commit 1fed9f0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/...ck/plugins/ingest_pipelines/public/application/sections/pipelines_list/details_flyout.tsx b/...ck/plugins/ingest_pipelines/public/application/sections/pipelines_list/details_flyout.tsx
@@ -73,7 +73,10 @@ export const PipelineDetailsFlyout: FunctionComponent<Props> = ({
         defaultMessage: 'Delete',
       }),
       icon: <EuiIcon type="trash" />,
-      onClick: () => onDeleteClick([pipeline.name]),
+      onClick: () => {
+        setShowPopover(false);
+        onDeleteClick([pipeline.name]);
+      },
     },
   ];
 

diff --git a/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/main.tsx b/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/main.tsx
@@ -125,14 +125,7 @@ export const PipelinesList: React.FunctionComponent<RouteComponentProps> = ({
     } else {
       // Somehow we triggered show pipeline details, but do not have a pipeline.
       // We assume not found.
-      return (
-        <PipelineNotFoundFlyout
-          onClose={() => {
-            goHome();
-          }}
-          pipelineName={pipelineNameFromLocation}
-        />
-      );
+      return <PipelineNotFoundFlyout onClose={goHome} pipelineName={pipelineNameFromLocation} />;
     }
   };
 
@@ -195,9 +188,10 @@ export const PipelinesList: React.FunctionComponent<RouteComponentProps> = ({
             if (deleteResponse?.hasDeletedPipelines) {
               // reload pipelines list
               sendRequest();
+              setSelectedPipeline(undefined);
+              goHome();
             }
             setPipelinesToDelete([]);
-            setSelectedPipeline(undefined);
           }}
           pipelinesToDelete={pipelinesToDelete}
         />