From 843295c75b10a8b4260e99e5928048d094254120 Mon Sep 17 00:00:00 2001
From: Olga Lavtar <olavtar@redhat.com>
Date: Tue, 8 Oct 2024 13:57:18 -0700
Subject: [PATCH 1/2] fix: added validation for model names and disabled the
 NIM models metrics hyperlink on the Models tab

Signed-off-by: Olga Lavtar <olavtar@redhat.com>
---
 .../screens/global/InferenceServiceTableRow.tsx   | 15 +++------------
 .../InferenceServiceModal/ProjectSection.tsx      | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/frontend/src/pages/modelServing/screens/global/InferenceServiceTableRow.tsx b/frontend/src/pages/modelServing/screens/global/InferenceServiceTableRow.tsx
index 85ff77398f..640dc78031 100644
--- a/frontend/src/pages/modelServing/screens/global/InferenceServiceTableRow.tsx
+++ b/frontend/src/pages/modelServing/screens/global/InferenceServiceTableRow.tsx
@@ -51,18 +51,9 @@ const InferenceServiceTableRow: React.FC<InferenceServiceTableRowProps> = ({
     <>
       <Td dataLabel="Name">
         <ResourceNameTooltip resource={inferenceService}>
-          {modelMeshMetricsSupported ? (
-            <Link
-              data-testid={`metrics-link-${displayName}`}
-              to={
-                isGlobal
-                  ? `/modelServing/${inferenceService.metadata.namespace}/metrics/${inferenceService.metadata.name}`
-                  : `/projects/${inferenceService.metadata.namespace}/metrics/model/${inferenceService.metadata.name}`
-              }
-            >
-              {displayName}
-            </Link>
-          ) : kserveMetricsSupported ? (
+          {isKServeNIMEnabled ? (
+            displayName
+          ) : modelMeshMetricsSupported || kserveMetricsSupported ? (
             <Link
               data-testid={`metrics-link-${displayName}`}
               to={
diff --git a/frontend/src/pages/modelServing/screens/projects/InferenceServiceModal/ProjectSection.tsx b/frontend/src/pages/modelServing/screens/projects/InferenceServiceModal/ProjectSection.tsx
index 72e51c85f6..eca0d20465 100644
--- a/frontend/src/pages/modelServing/screens/projects/InferenceServiceModal/ProjectSection.tsx
+++ b/frontend/src/pages/modelServing/screens/projects/InferenceServiceModal/ProjectSection.tsx
@@ -1,14 +1,19 @@
 import * as React from 'react';
 import { FormGroup, Text } from '@patternfly/react-core';
+import { translateDisplayNameForK8sAndReport } from '~/concepts/k8s/utils';
 
 type ProjectSectionType = {
   projectName: string;
 };
 
-const ProjectSection: React.FC<ProjectSectionType> = ({ projectName }) => (
-  <FormGroup label="Project">
-    <Text>{projectName}</Text>
-  </FormGroup>
-);
+const ProjectSection: React.FC<ProjectSectionType> = ({ projectName }) => {
+  const [translatedName] = translateDisplayNameForK8sAndReport(projectName);
+
+  return (
+    <FormGroup label="Project">
+      <Text>{translatedName}</Text>
+    </FormGroup>
+  );
+};
 
 export default ProjectSection;

From e1e8c6f77b99f1a6e80f0bd79c3af3f39fbd61d6 Mon Sep 17 00:00:00 2001
From: Olga Lavtar <olavtar@redhat.com>
Date: Fri, 11 Oct 2024 14:53:08 -0700
Subject: [PATCH 2/2] fix: RHOAIENG-13881 - model deployment name allowed
 illegal chars

Signed-off-by: Olga Lavtar <olavtar@redhat.com>
---
 .../InferenceServiceModal/ProjectSection.tsx      | 15 +++++----------
 .../NIMModelDeploymentNameSection.tsx             |  5 +++++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/src/pages/modelServing/screens/projects/InferenceServiceModal/ProjectSection.tsx b/frontend/src/pages/modelServing/screens/projects/InferenceServiceModal/ProjectSection.tsx
index eca0d20465..72e51c85f6 100644
--- a/frontend/src/pages/modelServing/screens/projects/InferenceServiceModal/ProjectSection.tsx
+++ b/frontend/src/pages/modelServing/screens/projects/InferenceServiceModal/ProjectSection.tsx
@@ -1,19 +1,14 @@
 import * as React from 'react';
 import { FormGroup, Text } from '@patternfly/react-core';
-import { translateDisplayNameForK8sAndReport } from '~/concepts/k8s/utils';
 
 type ProjectSectionType = {
   projectName: string;
 };
 
-const ProjectSection: React.FC<ProjectSectionType> = ({ projectName }) => {
-  const [translatedName] = translateDisplayNameForK8sAndReport(projectName);
-
-  return (
-    <FormGroup label="Project">
-      <Text>{translatedName}</Text>
-    </FormGroup>
-  );
-};
+const ProjectSection: React.FC<ProjectSectionType> = ({ projectName }) => (
+  <FormGroup label="Project">
+    <Text>{projectName}</Text>
+  </FormGroup>
+);
 
 export default ProjectSection;
diff --git a/frontend/src/pages/modelServing/screens/projects/NIMServiceModal/NIMModelDeploymentNameSection.tsx b/frontend/src/pages/modelServing/screens/projects/NIMServiceModal/NIMModelDeploymentNameSection.tsx
index 20f894ec1e..2c2ff018fa 100644
--- a/frontend/src/pages/modelServing/screens/projects/NIMServiceModal/NIMModelDeploymentNameSection.tsx
+++ b/frontend/src/pages/modelServing/screens/projects/NIMServiceModal/NIMModelDeploymentNameSection.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { FormGroup, TextInput } from '@patternfly/react-core';
 import { UpdateObjectAtPropAndValue } from '~/pages/projects/types';
 import { CreatingInferenceServiceObject } from '~/pages/modelServing/screens/types';
+import { translateDisplayNameForK8sAndReport } from '~/concepts/k8s/utils';
 
 type NIMModelDeploymentNameSectionProps = {
   data: CreatingInferenceServiceObject;
@@ -19,6 +20,10 @@ const NIMModelDeploymentNameSection: React.FC<NIMModelDeploymentNameSectionProps
       data-testid="model-deployment-name-section"
       value={data.name}
       onChange={(e, name) => setData('name', name)}
+      onBlur={() => {
+        const [translatedName] = translateDisplayNameForK8sAndReport(data.name);
+        setData('name', translatedName);
+      }}
     />
   </FormGroup>
 );