Merge branch 'master' into kbn-commands-to-support-build-for-bazel-pa…

…ckages
elastic · Apr 12, 2021 · 13d3394 · 13d3394
2 parents ff08bfb + 9946125
commit 13d3394
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/test/functional/apps/discover/_discover_histogram.ts b/test/functional/apps/discover/_discover_histogram.ts
@@ -21,9 +21,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   };
   const testSubjects = getService('testSubjects');
   const browser = getService('browser');
+  const retry = getService('retry');
 
-  // FLAKY: https://github.com/elastic/kibana/issues/94532
-  describe.skip('discover histogram', function describeIndexTests() {
+  describe('discover histogram', function describeIndexTests() {
     before(async () => {
       await esArchiver.loadIfNeeded('logstash_functional');
       await esArchiver.load('long_window_logstash');
@@ -107,8 +107,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       canvasExists = await elasticChart.canvasExists();
       expect(canvasExists).to.be(false);
       await testSubjects.click('discoverChartToggle');
-      canvasExists = await elasticChart.canvasExists();
-      expect(canvasExists).to.be(true);
+      await retry.waitFor(`Discover histogram to be displayed`, async () => {
+        canvasExists = await elasticChart.canvasExists();
+        return canvasExists;
+      });
+
       await PageObjects.discover.saveSearch('persisted hidden histogram');
       await PageObjects.header.waitUntilLoadingHasFinished();
 

diff --git a/...plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx b/...plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx
@@ -570,7 +570,7 @@ export const InnerVisualizationWrapper = ({
               <EuiFlexItem>
                 <EuiEmptyPrompt
                   actions={
-                    visibleErrorMessage ? (
+                    visibleErrorMessage && !localState.expandError ? (
                       <EuiButtonEmpty
                         onClick={() => {
                           setLocalState((prevState: WorkspaceState) => ({