Revert "[Discover] toggle for legacy mode (#1148)" (#1153) (#1154)

This reverts commit 861f8b2. Signed-off-by: Kawika Avilla <avillk@amazon.com> Co-authored-by: Kawika Avilla <avillk@amazon.com> (cherry picked from commit e36352b) Co-authored-by: Kawika Avilla <kavilla414@gmail.com>
opensearch-project · Mar 19, 2024 · 764344f · 764344f
1 parent 7a1858a
commit 764344f
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 21 deletions.
diff --git a/...on/core-opensearch-dashboards/opensearch-dashboards/apps/data_explorer/date_nanos.spec.js b/...on/core-opensearch-dashboards/opensearch-dashboards/apps/data_explorer/date_nanos.spec.js
@@ -34,10 +34,10 @@ describe('date_nanos', () => {
     });
     miscUtils.visitPage('app/data-explorer/discover#/');
     cy.waitForLoader();
+    cy.switchDiscoverTable('new');
 
     cy.setTopNavDate(fromTime, toTime);
     cy.waitForSearch();
-    cy.switchDiscoverTable('new');
   });
 
   after(() => {

diff --git a/...e-opensearch-dashboards/opensearch-dashboards/apps/data_explorer/date_nanos_mixed.spec.js b/...e-opensearch-dashboards/opensearch-dashboards/apps/data_explorer/date_nanos_mixed.spec.js
@@ -31,12 +31,12 @@ describe('date_nanos_mixed', () => {
     });
     miscUtils.visitPage('app/data-explorer/discover#/');
     cy.waitForLoader();
+    cy.switchDiscoverTable('new');
 
     const fromTime = 'Jan 1, 2019 @ 00:00:00.000';
     const toTime = 'Jan 1, 2019 @ 23:59:59.999';
     cy.setTopNavDate(fromTime, toTime);
     cy.waitForSearch();
-    cy.switchDiscoverTable('new');
   });
 
   after(() => {

diff --git a/...tion/core-opensearch-dashboards/opensearch-dashboards/apps/data_explorer/discover.spec.js b/...tion/core-opensearch-dashboards/opensearch-dashboards/apps/data_explorer/discover.spec.js
@@ -62,15 +62,18 @@ describe('discover app', { scrollBehavior: false }, () => {
       `app/data-explorer/discover#/?_g=(filters:!(),time:(from:'2015-09-19T13:31:44.000Z',to:'2015-09-24T01:31:44.000Z'))`
     );
     cy.waitForLoader();
-    cy.waitForSearch();
     cy.switchDiscoverTable('new');
+    cy.waitForSearch();
   });
 
   after(() => {});
 
   describe('save search', () => {
     const saveSearch1 = 'Save Search # 1';
     const saveSearch2 = 'Modified Save Search # 1';
+    beforeEach(() => {
+      cy.switchDiscoverTable('new');
+    });
 
     it('should show correct time range string by timepicker', function () {
       cy.verifyTimeConfig(DE_DEFAULT_START_TIME, DE_DEFAULT_END_TIME);

diff --git a/...on/core-opensearch-dashboards/opensearch-dashboards/apps/data_explorer/field_data.spec.js b/...on/core-opensearch-dashboards/opensearch-dashboards/apps/data_explorer/field_data.spec.js
@@ -46,8 +46,8 @@ describe('discover tab', () => {
       `app/data-explorer/discover#/?_g=(filters:!(),time:(from:'2015-09-19T13:31:44.000Z',to:'2015-09-24T01:31:44.000Z'))`
     );
     cy.waitForLoader();
-    cy.waitForSearch();
     cy.switchDiscoverTable('new');
+    cy.waitForSearch();
   });
 
   after(() => {});

diff --git a/...dashboards/opensearch-dashboards/apps/data_explorer/index_pattern_with_encoded_id.spec.js b/...dashboards/opensearch-dashboards/apps/data_explorer/index_pattern_with_encoded_id.spec.js
@@ -36,8 +36,8 @@ describe('index pattern with encoded id', () => {
 
     // Go to the Discover page
     miscUtils.visitPage('app/data-explorer/discover#/');
-    cy.setTopNavDate(DE_DEFAULT_START_TIME, DE_DEFAULT_END_TIME);
     cy.switchDiscoverTable('new');
+    cy.setTopNavDate(DE_DEFAULT_START_TIME, DE_DEFAULT_END_TIME);
     cy.waitForLoader();
   });
 

diff --git a/...h-dashboards/opensearch-dashboards/apps/data_explorer/index_pattern_without_field.spec.js b/...h-dashboards/opensearch-dashboards/apps/data_explorer/index_pattern_without_field.spec.js
@@ -33,6 +33,7 @@ describe('index pattern without field spec', () => {
     // Go to the Discover page
     miscUtils.visitPage('app/data-explorer/discover#/');
     cy.waitForLoader();
+    cy.switchDiscoverTable('new');
   });
 
   after(() => {
@@ -49,6 +50,7 @@ describe('index pattern without field spec', () => {
 
   it('should display a timepicker after switching to an index pattern with timefield', () => {
     const indexName = 'with-timefield';
+    cy.switchDiscoverTable('new');
     cy.getElementByTestId('comboBoxToggleListButton')
       .should('be.visible')
       .click();

diff --git a/...core-opensearch-dashboards/opensearch-dashboards/apps/data_explorer/saved_queries.spec.js b/...core-opensearch-dashboards/opensearch-dashboards/apps/data_explorer/saved_queries.spec.js
@@ -51,10 +51,10 @@ describe.skip('saved queries saved objects', () => {
     // Go to the Discover page
     miscUtils.visitPage('app/data-explorer/discover#/');
     cy.waitForLoader();
+    cy.switchDiscoverTable('new');
 
     // Set time filter
     cy.setTopNavDate(fromTime, toTime);
-    cy.switchDiscoverTable('new');
 
     // Set up query and filter
     cy.setTopNavQuery('response:200');

diff --git a/cypress/utils/dashboards/data_explorer/commands.js b/cypress/utils/dashboards/data_explorer/commands.js
@@ -135,22 +135,17 @@ Cypress.Commands.add('deleteSaveQuery', (name) => {
 });
 
 Cypress.Commands.add('switchDiscoverTable', (name) => {
-  cy.getElementByTestId('discoverOptionsButton')
+  cy.getElementByTestId('datagridTableButton')
     .then(($button) => {
-      cy.wrap($button).click();
-
-      cy.getElementByTestId('discoverOptionsLegacySwitch').then(
-        ($switchButton) => {
-          const isLegacyChecked = $switchButton.checked;
-          if (name === 'new' && !isLegacyChecked) {
-            cy.wrap($switchButton).click();
-          }
-          if (name === 'legacy' && isLegacyChecked) {
-            cy.wrap($switchButton).click();
-          }
-          cy.waitForLoader();
-        }
-      );
+      const buttonText = $button.text();
+
+      if (name === 'new' && buttonText.includes('Try new Discover')) {
+        cy.wrap($button).click();
+      }
+      if (name === 'legacy' && buttonText.includes('Use legacy Discover')) {
+        cy.wrap($button).click();
+      }
+      cy.waitForLoader();
     })
     .then(() => {
       checkForElementVisibility();