fix(e2e): handle other catalog sources when verifying disable in testSourceEnableDisable (#6734) (#7383)

* fix(e2e): handle other catalog sources when verifying disable in testSourceEnableDisable

* fix(e2e): serialize catalog source toggles and handle remaining source

* fix(bff): add retry logic for configmap conflicts on catalog source update

* Revert "fix(bff): add retry logic for configmap conflicts on catalog source update"

This reverts commit 97d2a3d33ab7495ca90ff22b60d8ad76dc2495b6.

* fix(e2e): ensure catalog sources are enabled before testSourceEnableDisable runs

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

* fix(e2e): handle other catalog sources when verifying disable behavior

Revert unnecessary changes (switch selector, intercept serialization,
retryableBefore setup, configmap precedence, types cleanup) and keep
only the fix for environments with additional catalog sources: use
waitForModelCatalogAfterDisable to detect whether to expect cards or
empty state after disabling the test sources.

Made-with: Cursor

* fix(e2e): serialize toggle clicks and ensure sources enabled on retry

Two fixes for testSourceEnableDisable reliability:

1. Serialize disable toggles: verify each source is disabled in the
   configmap before clicking the next toggle. Back-to-back clicks
   cause a PATCH race condition in the BFF, leaving the second source
   still enabled and the catalog never reaching empty state.

2. Ensure sources are enabled in retryableBefore: on test retry, the
   sources may still be disabled from the previous run. Enable and
   verify both sources before the test starts.

Made-with: Cursor

* fix(e2e): disable 'Other' catalog source in testSourceEnableDisable

The test was timing out because only two of three default sources
(redhat_ai_models, redhat_ai_validated_models) were being disabled.
The third default source (other_models) remained enabled, preventing
the empty state from appearing in the catalog.


Made-with: Cursor

* fix(e2e): enable and verify Other source in retryableBefore setup

Add redhatAiSourceId3 (other_models) to retryableBefore so all three
sources are enabled and verified before the test runs, matching the
after() teardown. Addresses review comments from FedeAlonso and
ConorOM1.


Made-with: Cursor

---------

Co-authored-by: Conor O'Malley <97108400+ConorOM1@users.noreply.github.com>

Author: manaswinidas

packages/cypress/cypress/fixtures/e2e/modelCatalog/testSourceEnableDisable.yaml

@@ -2,3 +2,5 @@ sourceName: 'Red Hat AI'
 redhatAiSourceId: 'redhat_ai_models'
 sourceName2: 'Red Hat AI validated'
 redhatAiSourceId2: 'redhat_ai_validated_models'
+sourceName3: 'Other'
+redhatAiSourceId3: 'other_models'

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

@@ -5,7 +5,7 @@ import { modelCatalog } from '../../../pages/modelCatalog/modelCatalog';
 import {
   verifyModelCatalogSourceEnabled,
   waitForModelCatalogCards,
-  waitForModelCatalogEmptyState,
+  waitForModelCatalogAfterDisable,
   enableModelCatalogSource,
 } from '../../../utils/oc_commands/modelCatalog';
 import { retryableBefore } from '../../../utils/retryableHooks';
@@ -19,13 +19,22 @@ describe('Verify Model Catalog Source Enable/Disable', () => {
       .fixture('e2e/modelCatalog/testSourceEnableDisable.yaml', 'utf8')
       .then((yamlContent: string) => {
         testData = yaml.load(yamlContent) as ModelCatalogSourceTestData;
+      })
+      .then(() => {
+        enableModelCatalogSource(testData.redhatAiSourceId);
+        enableModelCatalogSource(testData.redhatAiSourceId2);
+        enableModelCatalogSource(testData.redhatAiSourceId3);
+        verifyModelCatalogSourceEnabled(testData.redhatAiSourceId, true);
+        verifyModelCatalogSourceEnabled(testData.redhatAiSourceId2, true);
+        verifyModelCatalogSourceEnabled(testData.redhatAiSourceId3, true);
       });
   });
 
   after(() => {
     cy.step('Re-enable model catalog sources via configmap');
     enableModelCatalogSource(testData.redhatAiSourceId);
     enableModelCatalogSource(testData.redhatAiSourceId2);
+    enableModelCatalogSource(testData.redhatAiSourceId3);
   });
 
   it(
@@ -56,20 +65,30 @@ describe('Verify Model Catalog Source Enable/Disable', () => {
       cy.step(`Disable the ${testData.sourceName} source`);
       modelCatalogSettings.findEnableToggle(testData.redhatAiSourceId).click({ force: true });
 
+      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 });
 
-      cy.step('Verify configmap shows source as disabled');
-      verifyModelCatalogSourceEnabled(testData.redhatAiSourceId, false);
+      cy.step(`Disable the ${testData.sourceName3} source`);
+      modelCatalogSettings.findEnableToggle(testData.redhatAiSourceId3).click({ force: true });
+
+      cy.step('Verify second source is disabled in configmap');
+      verifyModelCatalogSourceEnabled(testData.redhatAiSourceId2, false);
+
+      cy.step('Verify third source is disabled in configmap');
+      verifyModelCatalogSourceEnabled(testData.redhatAiSourceId3, false);
 
       cy.step('Navigate to catalog');
       modelCatalog.visit();
 
-      cy.step('Wait for model catalog to show empty state');
-      waitForModelCatalogEmptyState();
-
-      cy.step('Verify model catalog shows empty state');
-      modelCatalog.findModelCatalogEmptyState().should('exist');
+      cy.step('Wait for catalog to reflect disabled sources');
+      waitForModelCatalogAfterDisable([
+        testData.redhatAiSourceId,
+        testData.redhatAiSourceId2,
+        testData.redhatAiSourceId3,
+      ]);
     },
   );
 });

packages/cypress/cypress/types.ts

@@ -611,6 +611,8 @@ export type ModelCatalogSourceTestData = {
   redhatAiSourceId: string;
   sourceName2: string;
   redhatAiSourceId2: string;
+  sourceName3: string;
+  redhatAiSourceId3: string;
 };
 
 export type TrainJobTestData = {

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

@@ -1,3 +1,4 @@
+import * as yaml from 'js-yaml';
 import { execWithOutput } from './baseCommands';
 import { getModelRegistryNamespace } from './modelRegistry';
 import type { CommandLineResult } from '../../types';
@@ -421,6 +422,69 @@ export const waitForModelCatalogCards = (
   return cy.then(() => checkForCards(1));
 };
 
+/**
+ * Check whether any catalog sources other than the specified ones are enabled.
+ * Reads the model-catalog-sources (user overrides) ConfigMap, falling back to
+ * model-catalog-default-sources. Parses YAML in TypeScript via js-yaml so there
+ * is no dependency on yq, python3 or jq being available in CI.
+ * Sources without an explicit `.enabled` field are treated as enabled by default.
+ * @param excludeSourceIds Source IDs to exclude from the check
+ * @returns A Cypress chainable that resolves with true if at least one other source is enabled.
+ */
+export const hasOtherEnabledCatalogSources = (
+  excludeSourceIds: string[],
+): Cypress.Chainable<boolean> => {
+  const namespace = getModelRegistryNamespace();
+
+  const parseAndCount = (yamlContent: string): boolean => {
+    const parsed = yaml.load(yamlContent) as {
+      catalogs: Array<{ id: string; enabled?: boolean }>;
+    };
+    const otherEnabled = parsed.catalogs.filter(
+      (c) => c.enabled !== false && !excludeSourceIds.includes(c.id),
+    );
+    cy.log(`Other enabled sources found: ${otherEnabled.length}`);
+    return otherEnabled.length > 0;
+  };
+
+  const userCmd = `oc get configmap model-catalog-sources -n ${namespace} -o jsonpath='{.data.sources\\.yaml}'`;
+  const defaultCmd = `oc get configmap model-catalog-default-sources -n ${namespace} -o jsonpath='{.data.sources\\.yaml}'`;
+
+  return execWithOutput(userCmd, 30).then((userResult: CommandLineResult) => {
+    if (userResult.code === 0 && userResult.stdout.trim()) {
+      return cy.wrap(parseAndCount(userResult.stdout));
+    }
+    return execWithOutput(defaultCmd, 30).then((defaultResult: CommandLineResult) => {
+      if (defaultResult.code !== 0 || !defaultResult.stdout.trim()) {
+        const maskedStderr = maskSensitiveInfo(
+          [userResult.stderr, defaultResult.stderr].filter(Boolean).join('\n'),
+        );
+        throw new Error(`Failed to read catalog sources configmaps: ${maskedStderr}`);
+      }
+      return cy.wrap(parseAndCount(defaultResult.stdout));
+    });
+  });
+};
+
+/**
+ * Poll until the model catalog UI has stabilized after disabling sources.
+ * If other sources are still enabled, waits for cards to be present (no empty state).
+ * If no other sources remain, waits for the empty state to appear.
+ * @param disabledSourceIds The source IDs that were just disabled
+ * @returns A Cypress chainable that resolves when the UI has stabilized.
+ */
+export const waitForModelCatalogAfterDisable = (
+  disabledSourceIds: string[],
+): Cypress.Chainable<undefined> =>
+  hasOtherEnabledCatalogSources(disabledSourceIds).then((hasOthers) => {
+    if (hasOthers) {
+      cy.step('Other catalog sources are enabled — waiting for catalog cards');
+      return waitForModelCatalogCards();
+    }
+    cy.step('No other catalog sources — waiting for empty state');
+    return waitForModelCatalogEmptyState();
+  });
+
 /**
  * Poll until at least one model catalog card with validated performance data is visible,
  * reloading the page between attempts.