Merge branch 'master' into alerting/consumer-based-rbac

* master:
  Fix Advanced Settings Panel number editing in Graph (elastic#69672)
  Updates swim lane UI text (elastic#69454)
  [APM] Use asPercent to format breakdown chart (elastic#69384)
  [Discover] Unskip context navigation functional test (elastic#68771)
  [ML] fix ml api services (elastic#69681)
  [Observability]Adding specific Return APIs for each plugin (elastic#69257)
  Migrate dashboard mode (elastic#69305)
  [IM] Move template wizard steps to shared directory + update legacy details panel (elastic#69559)

test/functional/apps/context/_context_navigation.js

@@ -17,52 +17,47 @@
  * under the License.
  */
 
-import expect from '@kbn/expect';
-
-const TEST_COLUMN_NAMES = ['@message'];
 const TEST_FILTER_COLUMN_NAMES = [
   ['extension', 'jpg'],
-  ['geo.src', 'IN'],
   [
     'agent',
     'Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.50 Safari/534.24',
   ],
 ];
 
 export default function ({ getService, getPageObjects }) {
+  const retry = getService('retry');
   const browser = getService('browser');
   const docTable = getService('docTable');
   const PageObjects = getPageObjects(['common', 'context', 'discover', 'timePicker']);
 
-  // FLAKY: https://github.com/elastic/kibana/issues/62866
-  describe.skip('context link in discover', function contextSize() {
+  describe('discover - context - back navigation', function contextSize() {
     before(async function () {
+      await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
       await PageObjects.common.navigateToApp('discover');
-      await PageObjects.timePicker.setDefaultAbsoluteRange();
-      await Promise.all(
-        TEST_COLUMN_NAMES.map((columnName) =>
-          PageObjects.discover.clickFieldListItemAdd(columnName)
-        )
-      );
       for (const [columnName, value] of TEST_FILTER_COLUMN_NAMES) {
         await PageObjects.discover.clickFieldListItem(columnName);
         await PageObjects.discover.clickFieldListPlusFilter(columnName, value);
       }
     });
 
     it('should go back after loading', async function () {
-      // navigate to the context view
-      await docTable.clickRowToggle({ rowIndex: 0 });
-      await (await docTable.getRowActions({ rowIndex: 0 }))[0].click();
-      await PageObjects.context.waitUntilContextLoadingHasFinished();
-      await PageObjects.context.clickSuccessorLoadMoreButton();
-      await PageObjects.context.clickSuccessorLoadMoreButton();
-      await PageObjects.context.clickSuccessorLoadMoreButton();
-      await PageObjects.context.waitUntilContextLoadingHasFinished();
-      await browser.goBack();
-      await PageObjects.discover.waitForDocTableLoadingComplete();
-      const hitCount = await PageObjects.discover.getHitCount();
-      expect(hitCount).to.be('522');
+      await retry.waitFor('user navigating to context and returning to discover', async () => {
+        // navigate to the context view
+        const initialHitCount = await PageObjects.discover.getHitCount();
+        await docTable.clickRowToggle({ rowIndex: 0 });
+        const rowActions = await docTable.getRowActions({ rowIndex: 0 });
+        await rowActions[0].click();
+        await PageObjects.context.waitUntilContextLoadingHasFinished();
+        await PageObjects.context.clickSuccessorLoadMoreButton();
+        await PageObjects.context.clickSuccessorLoadMoreButton();
+        await PageObjects.context.clickSuccessorLoadMoreButton();
+        await PageObjects.context.waitUntilContextLoadingHasFinished();
+        await browser.goBack();
+        await PageObjects.discover.waitForDocTableLoadingComplete();
+        const hitCount = await PageObjects.discover.getHitCount();
+        return initialHitCount === hitCount;
+      });
     });
   });
 }

x-pack/.i18nrc.json

@@ -11,7 +11,7 @@
     "xpack.dashboard": "plugins/dashboard_enhanced",
     "xpack.discover": "plugins/discover_enhanced",
     "xpack.crossClusterReplication": "plugins/cross_cluster_replication",
-    "xpack.dashboardMode": "legacy/plugins/dashboard_mode",
+    "xpack.dashboardMode": "plugins/dashboard_mode",
     "xpack.data": "plugins/data_enhanced",
     "xpack.embeddableEnhanced": "plugins/embeddable_enhanced",
     "xpack.endpoint": "plugins/endpoint",

x-pack/index.js

@@ -7,7 +7,6 @@
 import { xpackMain } from './legacy/plugins/xpack_main';
 import { monitoring } from './legacy/plugins/monitoring';
 import { security } from './legacy/plugins/security';
-import { dashboardMode } from './legacy/plugins/dashboard_mode';
 import { beats } from './legacy/plugins/beats_management';
 import { spaces } from './legacy/plugins/spaces';
 import { ingestManager } from './legacy/plugins/ingest_manager';
@@ -18,8 +17,7 @@ module.exports = function (kibana) {
     monitoring(kibana),
     spaces(kibana),
     security(kibana),
-    dashboardMode(kibana),
-    beats(kibana),
     ingestManager(kibana),
+    beats(kibana),
   ];
 };