Add swith to datagrid table and fix ciGroup1 (#5816)

* add swith to datagrid table and fix ciGroup1 Signed-off-by: Anan <ananzh@amazon.com> * fix ciGroup7 Signed-off-by: Anan Z <ananzh@amazon.com> * fix ciGroup6 Signed-off-by: Anan Z <ananzh@amazon.com> --------- Signed-off-by: Anan <ananzh@amazon.com> Signed-off-by: Anan Z <ananzh@amazon.com>
opensearch-project · Feb 6, 2024 · 55b7756 · 55b7756
1 parent cea4d2f
commit 55b7756
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 4 deletions.
diff --git a/test/functional/apps/context/_context_navigation.js b/test/functional/apps/context/_context_navigation.js
@@ -46,6 +46,7 @@ export default function ({ getService, getPageObjects }) {
     before(async function () {
       await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
       await PageObjects.common.navigateToApp('discover');
+      await PageObjects.discover.switchDiscoverTable('new');
       for (const [columnName, value] of TEST_FILTER_COLUMN_NAMES) {
         await PageObjects.discover.clickFieldListItemDetails(columnName);
         await PageObjects.discover.clickFieldListPlusFilter(columnName, value);

diff --git a/test/functional/apps/context/_date_nanos.js b/test/functional/apps/context/_date_nanos.js
@@ -43,6 +43,8 @@ export default function ({ getService, getPageObjects }) {
 
   describe('context view for date_nanos', () => {
     before(async function () {
+      await PageObjects.common.navigateToApp('discover');
+      await PageObjects.discover.switchDiscoverTable('new');
       await security.testUser.setRoles([
         'opensearch_dashboards_admin',
         'opensearch_dashboards_date_nanos',

diff --git a/test/functional/apps/context/_discover_navigation.js b/test/functional/apps/context/_discover_navigation.js
@@ -47,6 +47,7 @@ export default function ({ getService, getPageObjects }) {
     before(async () => {
       await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
       await PageObjects.common.navigateToApp('discover');
+      await PageObjects.discover.switchDiscoverTable('new');
 
       for (const columnName of TEST_COLUMN_NAMES) {
         await PageObjects.discover.clickFieldListItemAdd(columnName);

diff --git a/test/functional/apps/context/_filters.js b/test/functional/apps/context/_filters.js
@@ -41,11 +41,13 @@ export default function ({ getService, getPageObjects }) {
   const browser = getService('browser');
   const testSubjects = getService('testSubjects');
 
-  const PageObjects = getPageObjects(['common', 'context']);
+  const PageObjects = getPageObjects(['common', 'context', 'discover']);
 
   describe('context filters', function contextSize() {
     beforeEach(async function () {
       await browser.refresh();
+      await PageObjects.common.navigateToApp('discover');
+      await PageObjects.discover.switchDiscoverTable('new');
       await PageObjects.context.navigateTo(TEST_INDEX_PATTERN, TEST_ANCHOR_ID, {
         columns: TEST_COLUMN_NAMES,
       });

diff --git a/test/functional/apps/context/_size.js b/test/functional/apps/context/_size.js
@@ -37,11 +37,13 @@ export default function ({ getService, getPageObjects }) {
   const opensearchDashboardsServer = getService('opensearchDashboardsServer');
   const retry = getService('retry');
   const dataGrid = getService('dataGrid');
-  const PageObjects = getPageObjects(['context']);
+  const PageObjects = getPageObjects(['common', 'context', 'discover']);
   let expectedRowLength = 2 * TEST_DEFAULT_CONTEXT_SIZE + 1;
 
   describe('context size', function contextSize() {
     before(async function () {
+      await PageObjects.common.navigateToApp('discover');
+      await PageObjects.discover.switchDiscoverTable('new');
       await opensearchDashboardsServer.uiSettings.update({
         'context:defaultSize': `${TEST_DEFAULT_CONTEXT_SIZE}`,
         'context:step': `${TEST_STEP_SIZE}`,

diff --git a/test/functional/apps/home/_sample_data.ts b/test/functional/apps/home/_sample_data.ts
@@ -125,9 +125,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await pieChart.expectPieSliceCount(4);
         log.debug('Checking area, bar and heatmap charts rendered');
         await dashboardExpect.seriesElementCount(15);
-        // The saved search of data explorer now renders 100 lines max
         log.debug('Checking saved searches rendered');
-        await dashboardExpect.savedSearchRowCount(100);
+        await dashboardExpect.savedSearchRowCountFromLegacyTable(100);
         log.debug('Checking input controls rendered');
         await dashboardExpect.inputControlItemCount(3);
         log.debug('Checking tag cloud rendered');

diff --git a/test/functional/apps/management/_scripted_fields.js b/test/functional/apps/management/_scripted_fields.js
@@ -161,6 +161,7 @@ export default function ({ getService, getPageObjects }) {
         const fromTime = 'Sep 17, 2015 @ 06:31:44.000';
         const toTime = 'Sep 18, 2015 @ 18:31:44.000';
         await PageObjects.common.navigateToApp('discover');
+        await PageObjects.discover.switchDiscoverTable('new');
         await PageObjects.discover.selectIndexPattern('logstash-*');
         await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
 
@@ -279,6 +280,7 @@ export default function ({ getService, getPageObjects }) {
         const fromTime = 'Sep 17, 2015 @ 06:31:44.000';
         const toTime = 'Sep 18, 2015 @ 18:31:44.000';
         await PageObjects.common.navigateToApp('discover');
+        await PageObjects.discover.switchDiscoverTable('new');
         await PageObjects.discover.selectIndexPattern('logstash-*');
         await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
 
@@ -375,6 +377,7 @@ export default function ({ getService, getPageObjects }) {
         const fromTime = 'Sep 17, 2015 @ 06:31:44.000';
         const toTime = 'Sep 18, 2015 @ 18:31:44.000';
         await PageObjects.common.navigateToApp('discover');
+        await PageObjects.discover.switchDiscoverTable('new');
         await PageObjects.discover.selectIndexPattern('logstash-*');
         await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
 
@@ -473,6 +476,7 @@ export default function ({ getService, getPageObjects }) {
         const fromTime = 'Sep 17, 2015 @ 19:22:00.000';
         const toTime = 'Sep 18, 2015 @ 07:00:00.000';
         await PageObjects.common.navigateToApp('discover');
+        await PageObjects.discover.switchDiscoverTable('new');
         await PageObjects.discover.selectIndexPattern('logstash-*');
         await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
 

diff --git a/test/functional/page_objects/discover_page.ts b/test/functional/page_objects/discover_page.ts
@@ -516,6 +516,32 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider
         `Could not find a clickable list item for column "${columnName}" with list item "${title}".`
       );
     }
+
+    public async switchDiscoverTable(tableType: string) {
+      await retry.try(async () => {
+        const switchButton = await testSubjects.find('datagridTableButton');
+        const buttonText = await switchButton.getVisibleText();
+
+        if (tableType === 'new' && buttonText.includes('Try new Discover')) {
+          await switchButton.click();
+        } else if (tableType === 'legacy' && buttonText.includes('Use legacy Discover')) {
+          await switchButton.click();
+        }
+      });
+
+      // Wait for the query input to be visible
+      await this.waitForQueryInput();
+    }
+
+    async waitForQueryInput() {
+      // Wait for the query input to be visible
+      await retry.try(async () => {
+        const queryInputVisible = await testSubjects.exists('queryInput');
+        if (!queryInputVisible) {
+          throw new Error('Query input not yet visible');
+        }
+      });
+    }
   }
 
   return new DiscoverPage();

diff --git a/test/functional/services/dashboard/expectations.ts b/test/functional/services/dashboard/expectations.ts
@@ -240,6 +240,17 @@ export function DashboardExpectProvider({ getService, getPageObjects }: FtrProvi
       });
     }
 
+    async savedSearchRowCountFromLegacyTable(expectedCount: number) {
+      log.debug(`DashboardExpect.savedSearchRowCount(${expectedCount})`);
+      await retry.try(async () => {
+        const savedSearchRows = await testSubjects.findAll(
+          'docTableExpandToggleColumn',
+          findTimeout
+        );
+        expect(savedSearchRows.length).to.be(expectedCount);
+      });
+    }
+
     async seriesElementCount(expectedCount: number) {
       log.debug(`DashboardExpect.seriesElementCount(${expectedCount})`);
       await retry.try(async () => {