addressed comments

Signed-off-by: Yulia Krimerman <juliapiterova@hotmail.com>

Author: YuliaKrimerman

clients/ui/bff/internal/mocks/static_data_mock.go

@@ -1333,14 +1333,17 @@ func CreateSampleCatalogSource(id string, name string, catalogType string) model
 	defaultCatalog := id == "catalog-1"
 
 	sourceConfig := models.CatalogSourceConfig{
-		Name:           name,
-		Id:             id,
-		Type:           catalogType,
-		Enabled:        BoolPtr(true),
-		Labels:         []string{"source-1"},
-		IsDefault:      &defaultCatalog,
-		IncludedModels: []string{"rhelai1/modelcar-granite-7b-starter"},
-		ExcludedModels: []string{"model-a:1.0", "model-b:*"},
+		Name:      name,
+		Id:        id,
+		Type:      catalogType,
+		Enabled:   BoolPtr(true),
+		Labels:    []string{"source-1"},
+		IsDefault: &defaultCatalog,
+	}
+
+	if !defaultCatalog {
+		sourceConfig.IncludedModels = []string{"rhelai1/modelcar-granite-7b-starter"}
+		sourceConfig.ExcludedModels = []string{"model-a:1.0", "model-b:*"}
 	}
 
 	switch catalogType {

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

@@ -3,8 +3,8 @@ import {
   CatalogSourceConfigList,
   YamlCatalogSourceConfig,
   HuggingFaceCatalogSourceConfig,
+  CatalogSourceType,
 } from '~/app/modelCatalogTypes';
-import { CatalogSourceType } from '~/concepts/modelCatalogSettings/const';
 
 export const mockYamlCatalogSourceConfig = (
   partial?: Partial<YamlCatalogSourceConfig>,

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

@@ -192,14 +192,22 @@ describe('Catalog Source Configs Table', () => {
   });
 
   describe('Enable toggle functionality', () => {
-    it('should show notification when enable toggle is clicked', () => {
+    it('should show alert when enable toggle is clicked', () => {
       modelCatalogSettings.visit();
       const row = modelCatalogSettings.getRow('HuggingFace Google');
       row.findName().should('be.visible');
       row.findEnableToggle().should('exist').and('be.checked');
+
+      cy.window().then((win) => {
+        cy.stub(win, 'alert').as('windowAlert');
+      });
+
       row.toggleEnable();
-      cy.get('.pf-v6-c-alert-group', { timeout: 5000 }).should('be.visible');
-      cy.get('.pf-v6-c-alert').should('be.visible').and('contain', 'Toggle disabled');
+
+      cy.get('@windowAlert').should(
+        'have.been.calledWith',
+        'Toggle clicked! "HuggingFace Google" will be disabled when functionality is implemented.',
+      );
     });
 
     it('should not show toggle for default sources', () => {

clients/ui/frontend/src/app/modelCatalogTypes.ts

@@ -70,6 +70,11 @@ export enum SourceLabel {
   other = 'null',
 }
 
+export enum CatalogSourceType {
+  YAML = 'yaml',
+  HUGGING_FACE = 'huggingface',
+}
+
 export type CatalogArtifactBase = {
   createTimeSinceEpoch: string;
   lastUpdateTimeSinceEpoch: string;
@@ -243,12 +248,12 @@ export type CatalogSourceConfigCommon = {
 };
 
 export type YamlCatalogSourceConfig = CatalogSourceConfigCommon & {
-  type: 'yaml';
+  type: CatalogSourceType.YAML;
   yaml?: string;
 };
 
 export type HuggingFaceCatalogSourceConfig = CatalogSourceConfigCommon & {
-  type: 'huggingface';
+  type: CatalogSourceType.HUGGING_FACE;
   allowedOrganization?: string;
   apiKey?: string;
 };

…eens/CatalogSourceConfigsTableColumns.ts …ens/CatalogSourceConfigsTableColumns.tsxclients/ui/frontend/src/app/pages/modelCatalogSettings/screens/CatalogSourceConfigsTableColumns.ts renamed to clients/ui/frontend/src/app/pages/modelCatalogSettings/screens/CatalogSourceConfigsTableColumns.tsx clients/ui/frontend/src/app/pages/modelCatalogSettings/screens/CatalogSourceConfigsTableColumns.ts renamed to clients/ui/frontend/src/app/pages/modelCatalogSettings/screens/CatalogSourceConfigsTableColumns.tsx

@@ -1,3 +1,5 @@
+import * as React from 'react';
+import { List, ListItem } from '@patternfly/react-core';
 import { kebabTableColumn, SortableData } from 'mod-arch-shared';
 import { CatalogSourceConfig } from '~/app/modelCatalogTypes';
 
@@ -23,8 +25,23 @@ export const catalogSourceConfigsColumns: SortableData<CatalogSourceConfig>[] =
     label: 'Model visibility',
     sortable: false,
     info: {
-      popover:
-        'Shows whether all models from a source appear in the model catalog or if visibility is filtered.\n\nAll models: Every model from the source appears in the catalog.\n\nFiltered: Only specific models appear, based on the visibility settings for that source.',
+      popover: (
+        <div>
+          <p>
+            Shows whether all models from a source appear in the model catalog or if visibility is
+            filtered.
+          </p>
+          <List>
+            <ListItem>
+              <strong>All models:</strong> Every model from the source appears in the catalog.
+            </ListItem>
+            <ListItem>
+              <strong>Filtered:</strong> Only specific models appear, based on the visibility
+              settings for that source.
+            </ListItem>
+          </List>
+        </div>
+      ),
     },
     width: 15,
   },

clients/ui/frontend/src/app/pages/modelCatalogSettings/screens/CatalogSourceConfigsTableRow.tsx

@@ -4,7 +4,6 @@ import { Button, Label, Switch } from '@patternfly/react-core';
 import { useNavigate } from 'react-router-dom';
 import { CatalogSourceConfig } from '~/app/modelCatalogTypes';
 import { manageSourceUrl } from '~/app/routes/modelCatalogSettings/modelCatalogSettings';
-import { useNotification } from '~/app/hooks/useNotification';
 import {
   CATALOG_SOURCE_TYPE_LABELS,
   ModelVisibilityBadgeColor,
@@ -21,7 +20,6 @@ const CatalogSourceConfigsTableRow: React.FC<CatalogSourceConfigsTableRowProps>
   onDelete,
 }) => {
   const navigate = useNavigate();
-  const notification = useNotification();
   const isDefault = catalogSourceConfig.isDefault ?? false;
   const isEnabled = catalogSourceConfig.enabled ?? true;
 
@@ -31,11 +29,9 @@ const CatalogSourceConfigsTableRow: React.FC<CatalogSourceConfigsTableRowProps>
   );
 
   const handleEnableToggle = (checked: boolean) => {
-    // For now, just show a notification as per requirements
-    // TODO: RHOAIENG-38347 - Implement actual enable/disable functionality
-    notification.info(
-      `Toggle ${checked ? 'enabled' : 'disabled'}`,
-      `"${catalogSourceConfig.name}" will be ${checked ? 'enabled' : 'disabled'} when functionality is implemented.`,
+    // TODO: Implement actual enable/disable functionality
+    window.alert(
+      `Toggle clicked! "${catalogSourceConfig.name}" will be ${checked ? 'enabled' : 'disabled'} when functionality is implemented.`,
     );
   };
 

clients/ui/frontend/src/concepts/modelCatalogSettings/const.ts

@@ -1,9 +1,8 @@
-import { CatalogSourceConfig, HuggingFaceCatalogSourceConfig } from '~/app/modelCatalogTypes';
-
-export enum CatalogSourceType {
-  YAML = 'yaml',
-  HUGGING_FACE = 'huggingface',
-}
+import {
+  CatalogSourceConfig,
+  HuggingFaceCatalogSourceConfig,
+  CatalogSourceType,
+} from '~/app/modelCatalogTypes';
 
 export const CATALOG_SOURCE_TYPE_LABELS: Record<CatalogSourceType, string> = {
   [CatalogSourceType.YAML]: 'YAML file',