Merge branch 'master' into alerting/use-resolve-in-rule-details

elastic · Aug 18, 2021 · 56d320c · 56d320c
2 parents dbb8ad5 + 8f7e10a
commit 56d320c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/...plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.tsx b/...plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 
 import { EuiIconTip, EuiInMemoryTable, EuiBasicTableColumn, EuiLink } from '@elastic/eui';
 import type { EuiSearchBarOnChangeArgs } from '@elastic/eui';
@@ -71,7 +71,11 @@ export const RoleMappingsTable: React.FC<Props> = ({
     return _rm;
   }) as SharedRoleMapping[];
 
-  const [items, setItems] = useState(standardizedRoleMappings);
+  const [items, setItems] = useState([] as SharedRoleMapping[]);
+
+  useEffect(() => {
+    setItems(standardizedRoleMappings);
+  }, [roleMappings]);
 
   const attributeNameCol: EuiBasicTableColumn<SharedRoleMapping> = {
     field: 'attribute',

diff --git a/x-pack/plugins/reporting/server/export_types/png/create_job/index.ts b/x-pack/plugins/reporting/server/export_types/png/create_job/index.ts
@@ -22,11 +22,10 @@ export const createJobFnFactory: CreateJobFnFactory<
     validateUrls([jobParams.relativeUrl]);
 
     return {
-      isDeprecated: true,
+      ...jobParams,
       headers: serializedEncryptedHeaders,
       spaceId: reporting.getSpaceId(req, logger),
       forceNow: new Date().toISOString(),
-      ...jobParams,
     };
   };
 };
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf/create_job/index.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf/create_job/index.ts
@@ -34,7 +34,6 @@ export const createJobFnFactory: CreateJobFnFactory<
     // return the payload
     return {
       ...jobParams,
-      isDeprecated: true,
       headers: serializedEncryptedHeaders,
       spaceId: reporting.getSpaceId(req, logger),
       forceNow: new Date().toISOString(),

diff --git a/x-pack/test/functional/apps/lens/drag_and_drop.ts b/x-pack/test/functional/apps/lens/drag_and_drop.ts
@@ -10,16 +10,18 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects(['visualize', 'lens', 'common', 'header']);
+  const retry = getService('retry');
 
   describe('lens drag and drop tests', () => {
-    // FLAKY: https://github.com/elastic/kibana/issues/108352
-    describe.skip('basic drag and drop', () => {
+    describe('basic drag and drop', () => {
       it('should construct the basic split xy chart', async () => {
         await PageObjects.visualize.navigateToNewVisualization();
         await PageObjects.visualize.clickVisType('lens');
         await PageObjects.lens.goToTimeRange();
         await PageObjects.header.waitUntilLoadingHasFinished();
-        await PageObjects.lens.dragFieldToWorkspace('@timestamp');
+        await retry.try(async () => {
+          await PageObjects.lens.dragFieldToWorkspace('@timestamp');
+        });
 
         expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_xDimensionPanel')).to.eql(
           '@timestamp'