fix changes requested in tests

Signed-off-by: Philip Colares Carneiro <philip.colares@gmail.com>

Author: Philip-Carneiro

clients/ui/frontend/src/__mocks__/mockCatalogSourceList.ts

@@ -56,6 +56,25 @@ export const mockCatalogSourceActive = (): CatalogSource => ({
   status: 'available',
 });
 
+export const mockTwoProviderSources = (): CatalogSource[] => [
+  mockCatalogSource({ labels: ['Provider one'] }),
+  mockCatalogSource({
+    id: 'source-2',
+    name: 'Provider Two Source',
+    labels: ['Provider two'],
+  }),
+];
+
+export const mockProviderAndCustomSources = (): CatalogSource[] => [
+  mockCatalogSource({ labels: ['Provider one'] }),
+  mockCatalogSource({ id: 'custom-source', name: 'Custom Source', labels: [] }),
+];
+
+export const mockDefaultSources = (): CatalogSource[] => [
+  mockCatalogSource({}),
+  mockCatalogSource({ id: 'source-2', name: 'source 2' }),
+];
+
 export const mockCatalogSourceList = (partial?: Partial<CatalogSourceList>): CatalogSourceList => ({
   items: [
     mockCatalogSourceActive(),

clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelCatalog/modelCatalog.cy.ts

@@ -10,11 +10,13 @@ import {
   mockCatalogPerformanceMetricsArtifact,
   mockCatalogSource,
   mockCatalogSourceList,
+  mockDefaultSources,
+  mockProviderAndCustomSources,
+  mockTwoProviderSources,
 } from '~/__mocks__';
-import type { CatalogSource } from '~/app/modelCatalogTypes';
 import { MODEL_CATALOG_API_VERSION } from '~/__tests__/cypress/cypress/support/commands/api';
 import { mockCatalogFilterOptionsList } from '~/__mocks__/mockCatalogFilterOptionsList';
-import { SourceLabel } from '~/app/modelCatalogTypes';
+import { SourceLabel, type CatalogSource } from '~/app/modelCatalogTypes';
 import { ModelRegistryMetadataType } from '~/app/types';
 
 type FilteredModelsInterceptConfig = {
@@ -90,7 +92,7 @@ const calculateExpectedCategoryCount = (sources: CatalogSource[]): number => {
 };
 
 const initIntercepts = ({
-  sources = [mockCatalogSource({}), mockCatalogSource({ id: 'source-2', name: 'source 2' })],
+  sources = mockDefaultSources(),
   modelsPerCategory = 4,
   hasValidatedModels = false,
   includeAllModelsIntercept = true,
@@ -269,15 +271,9 @@ describe('Model Catalog Page', () => {
   });
 
   it('checkbox should work', () => {
-    // Calculate expected category count based on sources
-    const defaultSources = [
-      mockCatalogSource({}),
-      mockCatalogSource({ id: 'source-2', name: 'source 2' }),
-    ];
-
-    const expectedCategoryCount = calculateExpectedCategoryCount(defaultSources);
+    const expectedCategoryCount = calculateExpectedCategoryCount(mockDefaultSources());
 
-    initIntercepts({ sources: defaultSources, includeAllModelsIntercept: false });
+    initIntercepts({ sources: mockDefaultSources(), includeAllModelsIntercept: false });
 
     setupFilteredModelsIntercept({
       returnModelsForFilters: true,
@@ -322,14 +318,9 @@ describe('Model Catalog Page', () => {
   });
 
   it('tensor type filter combined with other filters should work', () => {
-    const defaultSources = [
-      mockCatalogSource({}),
-      mockCatalogSource({ id: 'source-2', name: 'source 2' }),
-    ];
+    const expectedCategoryCount = calculateExpectedCategoryCount(mockDefaultSources());
 
-    const expectedCategoryCount = calculateExpectedCategoryCount(defaultSources);
-
-    initIntercepts({ sources: defaultSources, includeAllModelsIntercept: false });
+    initIntercepts({ sources: mockDefaultSources(), includeAllModelsIntercept: false });
 
     setupFilteredModelsIntercept({
       returnModelsForFilters: true,
@@ -357,10 +348,7 @@ describe('Performance Empty State', () => {
   describe('Community & Custom Section', () => {
     it('should show performance empty state when toggle is ON', () => {
       initIntercepts({
-        sources: [
-          mockCatalogSource({ labels: ['Provider one'] }),
-          mockCatalogSource({ id: 'custom-source', name: 'Custom Source', labels: [] }),
-        ],
+        sources: mockProviderAndCustomSources(),
         hasValidatedModels: true,
       });
       setupFilteredModelsIntercept({ returnModelsForFilters: false });
@@ -380,10 +368,7 @@ describe('Performance Empty State', () => {
 
     it('should show models when toggle is OFF', () => {
       initIntercepts({
-        sources: [
-          mockCatalogSource({ labels: ['Provider one'] }),
-          mockCatalogSource({ id: 'custom-source', name: 'Custom Source', labels: [] }),
-        ],
+        sources: mockProviderAndCustomSources(),
       });
       modelCatalog.visit();
 
@@ -397,14 +382,7 @@ describe('Performance Empty State', () => {
   describe('Labeled Section Without Validated Models', () => {
     it('should show performance empty state when toggle is ON and no validated models', () => {
       initIntercepts({
-        sources: [
-          mockCatalogSource({ labels: ['Provider one'] }),
-          mockCatalogSource({
-            id: 'source-2',
-            name: 'Provider Two Source',
-            labels: ['Provider two'],
-          }),
-        ],
+        sources: mockTwoProviderSources(),
         hasValidatedModels: false,
       });
       // No user filters/search; this scenario should hit the special "No performance data" state.
@@ -421,14 +399,7 @@ describe('Performance Empty State', () => {
 
     it('should show models when toggle is OFF', () => {
       initIntercepts({
-        sources: [
-          mockCatalogSource({ labels: ['Provider one'] }),
-          mockCatalogSource({
-            id: 'source-2',
-            name: 'Provider Two Source',
-            labels: ['Provider two'],
-          }),
-        ],
+        sources: mockTwoProviderSources(),
         hasValidatedModels: false,
       });
       modelCatalog.visit();
@@ -442,14 +413,7 @@ describe('Performance Empty State', () => {
   describe('Labeled Section With Validated Models', () => {
     it('should show models when toggle is ON and section has validated models', () => {
       initIntercepts({
-        sources: [
-          mockCatalogSource({ labels: ['Provider one'] }),
-          mockCatalogSource({
-            id: 'source-2',
-            name: 'Provider Two Source',
-            labels: ['Provider two'],
-          }),
-        ],
+        sources: mockTwoProviderSources(),
         hasValidatedModels: true,
       });
       modelCatalog.visit();
@@ -465,10 +429,7 @@ describe('Performance Empty State', () => {
   describe('Empty State Actions', () => {
     it('should turn off toggle when clicking "Turn Model performance view off"', () => {
       initIntercepts({
-        sources: [
-          mockCatalogSource({ labels: ['Provider one'] }),
-          mockCatalogSource({ id: 'custom-source', name: 'Custom Source', labels: [] }),
-        ],
+        sources: mockProviderAndCustomSources(),
         hasValidatedModels: true,
       });
       setupFilteredModelsIntercept({ returnModelsForFilters: false });
@@ -486,10 +447,7 @@ describe('Performance Empty State', () => {
 
     it('should navigate to All models when clicking "View all models with performance data"', () => {
       initIntercepts({
-        sources: [
-          mockCatalogSource({ labels: ['Provider one'] }),
-          mockCatalogSource({ id: 'custom-source', name: 'Custom Source', labels: [] }),
-        ],
+        sources: mockProviderAndCustomSources(),
         hasValidatedModels: true,
       });
       setupFilteredModelsIntercept({ returnModelsForFilters: false });
@@ -506,14 +464,7 @@ describe('Performance Empty State', () => {
 
     it('should show performance empty state after clicking Reset filters when toggle is ON', () => {
       initIntercepts({
-        sources: [
-          mockCatalogSource({ labels: ['Provider one'] }),
-          mockCatalogSource({
-            id: 'source-2',
-            name: 'Provider Two Source',
-            labels: ['Provider two'],
-          }),
-        ],
+        sources: mockTwoProviderSources(),
         hasValidatedModels: false,
       });
       setupFilteredModelsIntercept({ returnModelsForFilters: false });
@@ -536,10 +487,7 @@ describe('Performance Empty State', () => {
 
   it('should work correctly when toggling performance view', () => {
     initIntercepts({
-      sources: [
-        mockCatalogSource({ labels: ['Provider one'] }),
-        mockCatalogSource({ id: 'custom-source', name: 'Custom Source', labels: [] }),
-      ],
+      sources: mockProviderAndCustomSources(),
       hasValidatedModels: true,
     });
     setupFilteredModelsIntercept({ returnModelsForFilters: false });
@@ -563,14 +511,7 @@ describe('Performance Empty State', () => {
 
   it('should show "No results found" when toggle is ON and user applies filter that returns 0 results', () => {
     initIntercepts({
-      sources: [
-        mockCatalogSource({ labels: ['Provider one'] }),
-        mockCatalogSource({
-          id: 'source-2',
-          name: 'Provider Two Source',
-          labels: ['Provider two'],
-        }),
-      ],
+      sources: mockTwoProviderSources(),
       hasValidatedModels: true,
     });
     setupFilteredModelsIntercept({ returnModelsForFilters: false });
@@ -591,14 +532,7 @@ describe('Performance Empty State', () => {
 describe('All Models Section', () => {
   it('should show models in All models section even when toggle is ON', () => {
     initIntercepts({
-      sources: [
-        mockCatalogSource({ labels: ['Provider one'] }),
-        mockCatalogSource({
-          id: 'source-2',
-          name: 'Provider Two Source',
-          labels: ['Provider two'],
-        }),
-      ],
+      sources: mockTwoProviderSources(),
       hasValidatedModels: true,
     });
     modelCatalog.visit();