Fixes mds cypress test

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

Author: DarshitChanpura

test/cypress/e2e/multi-datasources/multi_datasources_enabled.spec.js

@@ -25,7 +25,7 @@ const createDataSource = () => {
         title: Cypress.env('externalDataSourceLabel'),
         endpoint: Cypress.env('externalDataSourceEndpoint'),
         installedPlugins: ['opensearch-security'],
-        dataSourceVersion: '2.15.0',
+        dataSourceVersion: '3.4.0',
         auth: {
           type: 'username_password',
           credentials: {
@@ -232,7 +232,9 @@ describe('Multi-datasources enabled', () => {
   });
 
   it('Checks Resource Access Management with external data source', () => {
-    // Visit resource access management with external data source
+    // Set up intercept BEFORE visiting the page since the API call happens on page load
+    cy.intercept('GET', '/api/resource/types*').as('getResourceTypes');
+
     cy.visit(`http://localhost:5601/app/resource_access_management${externalDataSourceUrl}`);
 
     // Verify page title
@@ -247,49 +249,35 @@ describe('Multi-datasources enabled', () => {
     // Verify the resource type selector is present
     cy.contains('h3', 'Resources').should('be.visible');
 
-    // Intercept API calls to verify dataSourceId is passed
-    cy.intercept('GET', '/api/resource/types*', (req) => {
-      // Verify dataSourceId query parameter is included
-      expect(req.url).to.include(`dataSourceId=${externalDataSourceId}`);
+    // Wait for the API call and verify dataSourceId is passed
+    cy.wait('@getResourceTypes', { timeout: 10_000 }).then((interception) => {
+      expect(interception.request.url).to.include(`dataSourceId=${externalDataSourceId}`);
       cy.log(`API call includes correct dataSourceId: ${externalDataSourceId}`);
-    }).as('getResourceTypes');
-
-    // Trigger API call by clicking the resource type selector
-    cy.get('button.euiSuperSelectControl').click();
-
-    // Wait for the API call to complete
-    cy.wait('@getResourceTypes', { timeout: 10_000 });
+    });
   });
 
   it('Checks Resource Access Management with local cluster', () => {
-    // Visit resource access management with local cluster
+    // Set up intercept BEFORE visiting the page since the API call happens on page load
+    cy.intercept('GET', '/api/resource/types*').as('getResourceTypesLocal');
+
     cy.visit(`http://localhost:5601/app/resource_access_management${localDataSourceUrl}`);
 
     // Verify page title
     cy.contains('h1', 'Resource Access Management', { timeout: 20_000 }).should('be.visible');
 
     // Verify data source picker shows local cluster
-    cy.get('[data-test-subj="dataSourceViewButton"]', { timeout: 10_000 }).should(
+    cy.get('[data-test-subj="dataSourceSelectableButton"]', { timeout: 10_000 }).should(
       'contain',
       'Local cluster'
     );
 
     // Verify the resource type selector is present
     cy.contains('h3', 'Resources').should('be.visible');
 
-    // Intercept API calls to verify dataSourceId is NOT passed for local cluster
-    cy.intercept('GET', '/api/resource/types*', (req) => {
-      // For local cluster, dataSourceId should not be in the URL or should be empty
-      if (req.url.includes('dataSourceId=')) {
-        expect(req.url).to.include('dataSourceId=');
-      }
+    // Wait for the API call - for local cluster, dataSourceId may or may not be present
+    cy.wait('@getResourceTypesLocal', { timeout: 10_000 }).then((interception) => {
       cy.log('API call for local cluster completed');
-    }).as('getResourceTypesLocal');
-
-    // Trigger API call by clicking the resource type selector
-    cy.get('button.euiSuperSelectControl').click();
-
-    // Wait for the API call to complete
-    cy.wait('@getResourceTypesLocal', { timeout: 10_000 });
+      cy.log(`Request URL: ${interception.request.url}`);
+    });
   });
 });