From 2cc9597581a0b61b3a675a8a6a294371dee16166 Mon Sep 17 00:00:00 2001
From: Olga Lavtar <olavtar@redhat.com>
Date: Tue, 8 Oct 2024 13:57:18 -0700
Subject: [PATCH] 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;