add changes requested

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

Author: Philip-Carneiro

frontend/src/concepts/k8s/K8sNameDescriptionField/utils.ts

@@ -33,11 +33,14 @@ export enum LimitNameResourceType {
   /** Model deployments create routes */
   MODEL_DEPLOYMENT,
   PVC,
+  /** Model Registry names are capped at 40 characters */
+  MODEL_REGISTRY,
 }
 /** K8s max DNS subdomain name length */
 const MAX_RESOURCE_NAME_LENGTH = 253;
 
 const MAX_PVC_NAME_LENGTH = 63;
+const MAX_MODEL_REGISTRY_NAME_LENGTH = 40;
 
 /** KServe InferenceService names must start with a lowercase letter */
 export const INFERENCE_SERVICE_NAME_REGEX = /^[a-z]([-a-z0-9]*[a-z0-9])?$/;
@@ -49,6 +52,7 @@ export const resourceTypeLimits: Record<LimitNameResourceType, number> = {
   [LimitNameResourceType.WORKBENCH]: ROUTE_BASED_NAME_LENGTH,
   [LimitNameResourceType.MODEL_DEPLOYMENT]: ROUTE_BASED_NAME_LENGTH,
   [LimitNameResourceType.PVC]: MAX_PVC_NAME_LENGTH,
+  [LimitNameResourceType.MODEL_REGISTRY]: MAX_MODEL_REGISTRY_NAME_LENGTH,
 };
 
 export const isK8sNameDescriptionType = (

frontend/src/pages/modelRegistrySettings/CreateModal.tsx

@@ -20,13 +20,17 @@ import {
   createModelRegistryBackend,
   updateModelRegistryBackend,
 } from '#~/services/modelRegistrySettingsService';
-import { isValidK8sName, kindApiVersion, translateDisplayNameForK8s } from '#~/concepts/k8s/utils';
+import { kindApiVersion } from '#~/concepts/k8s/utils';
 import FormSection from '#~/components/pf-overrides/FormSection';
 import { AreaContext } from '#~/concepts/areas/AreaContext';
 import { SupportedArea, useIsAreaAvailable } from '#~/concepts/areas';
 import K8sNameDescriptionField, {
   useK8sNameDescriptionFieldData,
 } from '#~/concepts/k8s/K8sNameDescriptionField/K8sNameDescriptionField';
+import {
+  isK8sNameDescriptionDataValid,
+  LimitNameResourceType,
+} from '#~/concepts/k8s/K8sNameDescriptionField/utils';
 import useModelRegistryCertificateNames from '#~/concepts/modelRegistrySettings/useModelRegistryCertificateNames';
 import {
   buildDatabaseSpec,
@@ -68,6 +72,7 @@ const CreateModal: React.FC<CreateModalProps> = ({ onClose, refresh, modelRegist
   const [error, setError] = React.useState<Error>();
   const { data: nameDesc, onDataChange: setNameDesc } = useK8sNameDescriptionFieldData({
     initialData: mr,
+    limitNameResourceType: LimitNameResourceType.MODEL_REGISTRY,
   });
   const [databaseSource, setDatabaseSource] = React.useState<DatabaseSource>(
     DatabaseSource.DEFAULT,
@@ -231,8 +236,6 @@ const CreateModal: React.FC<CreateModalProps> = ({ onClose, refresh, modelRegist
     setDatabaseType(newType);
   };
 
-  const effectiveK8sName = nameDesc.k8sName.value || translateDisplayNameForK8s(nameDesc.name);
-
   const onSubmit = async () => {
     setIsSubmitting(true);
     setError(undefined);
@@ -322,7 +325,7 @@ const CreateModal: React.FC<CreateModalProps> = ({ onClose, refresh, modelRegist
         apiVersion: kindApiVersion(ModelRegistryModel),
         kind: 'ModelRegistry',
         metadata: {
-          name: effectiveK8sName,
+          name: nameDesc.k8sName.value,
           namespace: modelRegistryNamespace,
           annotations: {
             'openshift.io/description': nameDesc.description,
@@ -389,15 +392,12 @@ const CreateModal: React.FC<CreateModalProps> = ({ onClose, refresh, modelRegist
   const hasContent = (value: string): boolean => !!value.trim().length;
 
   const canSubmit = () => {
-    const isValidName =
-      isValidK8sName(effectiveK8sName) && effectiveK8sName.length <= MAX_MODEL_REGISTRY_NAME_LENGTH;
+    const isValidName = isK8sNameDescriptionDataValid(nameDesc);
 
     if (databaseSource === DatabaseSource.DEFAULT) {
-      // For default database, only name is required
       return !isSubmitting && isValidName;
     }
 
-    // For external database, all connection fields are required
     return (
       !isSubmitting &&
       isValidName &&

packages/cypress/cypress/pages/modelRegistrySettings.ts

@@ -3,6 +3,8 @@ import { Contextual } from './components/Contextual';
 import { K8sNameDescriptionField } from './components/subComponents/K8sNameDescriptionField';
 import { SearchSelector } from './components/subComponents/SearchSelector';
 
+export const MAX_MODEL_REGISTRY_NAME_LENGTH = 40;
+
 export enum FormFieldSelector {
   NAME = '#mr-name',
   DESCRIPTION = '#mr-description',

packages/cypress/cypress/tests/mocked/modelRegistrySettings/modelRegistrySettings.cy.ts

@@ -12,6 +12,7 @@ import { mockRoleBindingK8sResource } from '@odh-dashboard/internal/__mocks__/mo
 import {
   DatabaseType,
   FormFieldSelector,
+  MAX_MODEL_REGISTRY_NAME_LENGTH,
   modelRegistrySettings,
 } from '../../../pages/modelRegistrySettings';
 import { pageNotfound } from '../../../pages/pageNotFound';
@@ -336,51 +337,57 @@ describe('CreateModal', () => {
     modelRegistrySettings.shouldHaveAllErrors();
   });
 
-  it('should enforce maxLength of 40 on the name input field', () => {
+  it('should enforce maxLength on the name input field', () => {
     modelRegistrySettings.visit(true);
     modelRegistrySettings.findCreateButton().click();
     modelRegistrySettings
       .findFormField(FormFieldSelector.NAME)
-      .should('have.attr', 'maxLength', '40');
+      .should('have.attr', 'maxLength', String(MAX_MODEL_REGISTRY_NAME_LENGTH));
   });
 
-  it('should disable submit when resource name exceeds 40 characters', () => {
+  it('should disable submit when resource name exceeds the character limit', () => {
     modelRegistrySettings.visit(true);
     modelRegistrySettings.findCreateButton().click();
     modelRegistrySettings.findDatabaseSourceDefaultRadio().should('be.checked');
 
-    modelRegistrySettings.findFormField(FormFieldSelector.NAME).type('a'.repeat(40));
+    modelRegistrySettings
+      .findFormField(FormFieldSelector.NAME)
+      .type('a'.repeat(MAX_MODEL_REGISTRY_NAME_LENGTH));
     modelRegistrySettings.findSubmitButton().should('be.enabled');
 
     modelRegistrySettings.k8sNameDescription.findResourceEditLink().click();
-    modelRegistrySettings.k8sNameDescription.findResourceNameInput().clear().type('a'.repeat(41));
+    modelRegistrySettings.k8sNameDescription
+      .findResourceNameInput()
+      .clear()
+      .type('a'.repeat(MAX_MODEL_REGISTRY_NAME_LENGTH + 1));
     modelRegistrySettings.findSubmitButton().should('be.disabled');
   });
 
-  it('should show character count warning when name approaches 40 limit', () => {
+  it('should show character count warning when name approaches the limit', () => {
     modelRegistrySettings.visit(true);
     modelRegistrySettings.findCreateButton().click();
 
-    const nearLimitName = 'a'.repeat(31);
+    const nearLimitName = 'a'.repeat(MAX_MODEL_REGISTRY_NAME_LENGTH - 9);
     modelRegistrySettings.findFormField(FormFieldSelector.NAME).type(nearLimitName);
-    cy.contains('Cannot exceed 40 characters').should('be.visible');
+    cy.contains(`Cannot exceed ${MAX_MODEL_REGISTRY_NAME_LENGTH} characters`).should('be.visible');
     cy.contains('remaining').should('be.visible');
   });
 
-  it('should allow creation with name at exactly 40 characters using default database', () => {
+  it('should allow creation with name at exactly the character limit using default database', () => {
     modelRegistrySettings.visit(true);
     modelRegistrySettings.findCreateButton().click();
     modelRegistrySettings.findDatabaseSourceDefaultRadio().should('be.checked');
 
-    const exactName = 'a'.repeat(40);
+    const exactName = 'a'.repeat(MAX_MODEL_REGISTRY_NAME_LENGTH);
     modelRegistrySettings.findFormField(FormFieldSelector.NAME).type(exactName);
     modelRegistrySettings.findSubmitButton().should('be.enabled');
     modelRegistrySettings.findSubmitButton().click();
 
     cy.wait('@createModelRegistry').then((interception) => {
-      const expectedName = 'a'.repeat(40);
-      expect(interception.request.body.modelRegistry.metadata.name).to.equal(expectedName);
-      expect(interception.request.body.modelRegistry.metadata.name).to.have.length.at.most(40);
+      expect(interception.request.body.modelRegistry.metadata.name).to.equal(exactName);
+      expect(interception.request.body.modelRegistry.metadata.name).to.have.length.at.most(
+        MAX_MODEL_REGISTRY_NAME_LENGTH,
+      );
     });
   });