fix(e2e): improve catalog source toggle reliability with API waits and correct configmap precedence

Author: manaswinidas

packages/cypress/cypress/pages/modelCatalogSettings.ts

@@ -50,6 +50,10 @@ class ModelCatalogSettings {
   findEnableToggle(sourceId: string) {
     return cy.findByTestId(`enable-toggle-${sourceId}`);
   }
+
+  findToggleAlert() {
+    return cy.findByTestId('toggle-alert');
+  }
 }
 
 export const modelCatalogSettings = new ModelCatalogSettings();

packages/cypress/cypress/tests/e2e/modelCatalog/testSourceEnableDisable.cy.ts

@@ -7,7 +7,6 @@ import {
   waitForModelCatalogCards,
   waitForModelCatalogAfterDisable,
   enableModelCatalogSource,
-  ensureModelCatalogSourceEnabled,
 } from '../../../utils/oc_commands/modelCatalog';
 import { retryableBefore } from '../../../utils/retryableHooks';
 import type { ModelCatalogSourceTestData } from '../../../types';
@@ -22,8 +21,10 @@ describe('[product bug: RHOAIENG-53704] Verify Model Catalog Source Enable/Disab
         testData = yaml.load(yamlContent) as ModelCatalogSourceTestData;
       })
       .then(() => {
-        ensureModelCatalogSourceEnabled(testData.redhatAiSourceId);
-        ensureModelCatalogSourceEnabled(testData.redhatAiSourceId2);
+        enableModelCatalogSource(testData.redhatAiSourceId);
+        enableModelCatalogSource(testData.redhatAiSourceId2);
+        verifyModelCatalogSourceEnabled(testData.redhatAiSourceId, true);
+        verifyModelCatalogSourceEnabled(testData.redhatAiSourceId2, true);
       });
   });
 
@@ -58,14 +59,20 @@ describe('[product bug: RHOAIENG-53704] Verify Model Catalog Source Enable/Disab
       cy.step('Navigate back to AI catalog sources');
       modelCatalogSettings.visit();
 
+      cy.intercept('PATCH', '**/source_configs/*').as('toggleSource');
+
       cy.step(`Disable the ${testData.sourceName} source`);
-      modelCatalogSettings.findEnableToggle(testData.redhatAiSourceId).click({ force: true });
+      modelCatalogSettings.findEnableToggle(testData.redhatAiSourceId).click();
+      cy.wait('@toggleSource').its('response.statusCode').should('eq', 200);
+      modelCatalogSettings.findToggleAlert().should('not.exist');
 
       cy.step('Verify first source is disabled in configmap');
       verifyModelCatalogSourceEnabled(testData.redhatAiSourceId, false);
 
       cy.step(`Disable the ${testData.sourceName2} source`);
-      modelCatalogSettings.findEnableToggle(testData.redhatAiSourceId2).click({ force: true });
+      modelCatalogSettings.findEnableToggle(testData.redhatAiSourceId2).click();
+      cy.wait('@toggleSource').its('response.statusCode').should('eq', 200);
+      modelCatalogSettings.findToggleAlert().should('not.exist');
 
       cy.step('Verify second source is disabled in configmap');
       verifyModelCatalogSourceEnabled(testData.redhatAiSourceId2, false);

packages/cypress/cypress/utils/oc_commands/modelCatalog.ts

@@ -240,25 +240,39 @@ export const verifyModelCatalogSourceEnabled = (
 
 /**
  * Check if a specific model catalog source is currently enabled.
- * Checks the model-catalog-default-sources ConfigMap for the source's enabled status.
+ * Checks model-catalog-sources (user overrides) first, then falls back to
+ * model-catalog-default-sources. This mirrors the precedence used by
+ * verifyModelCatalogSourceEnabled and the BFF itself.
  * @param sourceId The ID of the source to check (e.g., 'redhat_ai_models')
  * @returns A Cypress chainable that resolves with true if enabled, false otherwise.
  */
 export const isModelCatalogSourceEnabled = (sourceId: string): Cypress.Chainable<boolean> => {
   const namespace = getModelRegistryNamespace();
   const parseCmd = getYamlParseCommand(sourceId);
-  const command = `oc get configmap model-catalog-default-sources -n ${namespace} -o jsonpath='{.data.sources\\.yaml}' | ${parseCmd}`;
+  const userCommand = `oc get configmap model-catalog-sources -n ${namespace} -o jsonpath='{.data.sources\\.yaml}' 2>/dev/null | ${parseCmd}`;
+  const defaultCommand = `oc get configmap model-catalog-default-sources -n ${namespace} -o jsonpath='{.data.sources\\.yaml}' | ${parseCmd}`;
 
-  return execWithOutput(command, 30).then((result: CommandLineResult) => {
-    if (result.code !== 0) {
-      const maskedStderr = maskSensitiveInfo(result.stderr);
-      cy.log(`ERROR: Failed to check source enabled status`);
-      cy.log(`stderr: ${maskedStderr}`);
-      return cy.wrap(false);
+  return execWithOutput(userCommand, 30).then((userResult: CommandLineResult) => {
+    const userValue = userResult.stdout.trim();
+
+    if (userResult.code === 0 && (userValue === 'true' || userValue === 'false')) {
+      const isEnabled = userValue === 'true';
+      cy.log(`Source ${sourceId} is currently enabled: ${isEnabled} (from user configmap)`);
+      return cy.wrap(isEnabled);
     }
-    const isEnabled = result.stdout.trim() === 'true';
-    cy.log(`Source ${sourceId} is currently enabled: ${isEnabled}`);
-    return cy.wrap(isEnabled);
+
+    return execWithOutput(defaultCommand, 30).then((defaultResult: CommandLineResult) => {
+      if (defaultResult.code !== 0) {
+        const maskedStderr = maskSensitiveInfo(defaultResult.stderr);
+        cy.log(`ERROR: Failed to check source enabled status`);
+        cy.log(`stderr: ${maskedStderr}`);
+        return cy.wrap(false);
+      }
+      const defaultValue = defaultResult.stdout.trim();
+      const isEnabled = defaultValue === '' ? true : defaultValue === 'true';
+      cy.log(`Source ${sourceId} is currently enabled: ${isEnabled} (from default configmap)`);
+      return cy.wrap(isEnabled);
+    });
   });
 };