refactor(ml): revert ComboBoxService option retrieval

Author: KodeRad

src/platform/test/functional/services/combo_box.ts

@@ -87,10 +87,7 @@ export class ComboBoxService extends FtrService {
   public async getOptions(comboBoxSelector: string) {
     const comboBoxElement = await this.testSubjects.find(comboBoxSelector);
     await this.openOptionsList(comboBoxElement);
-    return await this.find.allByCssSelector(
-      '.euiComboBoxOption, .euiFilterSelectItem',
-      this.WAIT_FOR_EXISTS_TIME
-    );
+    return await this.find.allByCssSelector('.euiComboBoxOption', this.WAIT_FOR_EXISTS_TIME);
   }
 
   /**
@@ -119,7 +116,7 @@ export class ComboBoxService extends FtrService {
 
     if (trimmedValue !== undefined) {
       const selectOptions = await this.find.allByCssSelector(
-        `.euiComboBoxOption[title="${trimmedValue}"], .euiFilterSelectItem[title="${trimmedValue}"]`,
+        `.euiComboBoxOption[title="${trimmedValue}"]`,
         this.WAIT_FOR_EXISTS_TIME
       );
 
@@ -130,10 +127,7 @@ export class ComboBoxService extends FtrService {
         const alternateTitle = (
           await Promise.all(
             (
-              await this.find.allByCssSelector(
-                `.euiComboBoxOption, .euiFilterSelectItem`,
-                this.WAIT_FOR_EXISTS_TIME
-              )
+              await this.find.allByCssSelector(`.euiComboBoxOption`, this.WAIT_FOR_EXISTS_TIME)
             ).map(async (e) => {
               const title = (await e.getAttribute('title')) ?? '';
               return { title, formattedTitle: title.toLowerCase().trim() };
@@ -145,7 +139,7 @@ export class ComboBoxService extends FtrService {
 
         const [alternate] = alternateTitle
           ? await this.find.allByCssSelector(
-              `.euiComboBoxOption[title="${alternateTitle}" i], .euiFilterSelectItem[title="${alternateTitle}" i]`,
+              `.euiComboBoxOption[title="${alternateTitle}" i]`,
               this.WAIT_FOR_EXISTS_TIME
             )
           : [];
@@ -160,15 +154,12 @@ export class ComboBoxService extends FtrService {
           this.log.warning(
             `comboBox.setElement - Could not find option [${trimmedValue}], using first`
           );
-          const firstOption = await this.find.byCssSelector(
-            '.euiComboBoxOption, .euiFilterSelectItem',
-            5000
-          );
+          const firstOption = await this.find.byCssSelector('.euiComboBoxOption', 5000);
           await this.clickOption(options.clickWithMouse, firstOption);
         }
       }
     } else {
-      const firstOption = await this.find.byCssSelector('.euiComboBoxOption, .euiFilterSelectItem');
+      const firstOption = await this.find.byCssSelector('.euiComboBoxOption');
       await this.clickOption(options.clickWithMouse, firstOption);
     }
     await this.closeOptionsList(comboBoxElement);

x-pack/performance/journeys_e2e/tsdb_logs_data_visualizer.ts

@@ -23,7 +23,7 @@ export const journey = new Journey({
   .step('Go to Index data visualizer', async ({ page }) => {
     const createButtons = page.locator(subj('mlDataVisualizerSelectIndexButton'));
     await createButtons.first().click();
-    await page.waitForSelector(subj('dataVisualizerIndexPage'));
+    await page.waitForSelector(subj('mlDataSourceSelectorButton'));
   })
   .step('Go to Data View selection', async ({ page, kibanaPage }) => {
     await page.click(subj('mlDataSourceSelectorButton'));
@@ -33,6 +33,7 @@ export const journey = new Journey({
       .locator(subj('indexPattern-switcher'))
       .locator(`[title="${DATA_VIEW_NAME}"]`)
       .click();
+    await page.waitForSelector(subj('dataVisualizerIndexPage'), { timeout: 60000 });
     await page.click(subj('mlDatePickerButtonUseFullData'));
     await kibanaPage.waitForHeader();
     await page.waitForSelector(subj('dataVisualizerTable-loaded'), { timeout: 60000 });