cleaning

Author: katieperry4

frontend/src/pages/modelServing/screens/projects/DeployPrefilledModelModal.tsx

@@ -25,7 +25,6 @@ import { getKServeTemplates } from '#~/pages/modelServing/customServingRuntimes/
 import { isRedHatRegistryUri } from '#~/pages/modelRegistry/screens/utils';
 import useServingConnections from '#~/pages/projects/screens/detail/connections/useServingConnections';
 import { isOciModelUri } from '#~/pages/modelServing/utils';
-import { ProjectDetailsContext } from '#~/pages/projects/ProjectDetailsContext';
 import { ModelDeployPrefillInfo } from './usePrefillModelDeployModal';
 
 interface DeployPrefilledModelModalProps {
@@ -73,7 +72,6 @@ const DeployPrefilledModelModalContents: React.FC<
       loaded: templateDisablementLoaded,
     },
   } = React.useContext(ModelServingContext);
-  const { pvcs } = React.useContext(ProjectDetailsContext);
   const servingContextLoaded = templatesLoaded && templateOrderLoaded && templateDisablementLoaded;
 
   const servingPlatformStatuses = useServingPlatformStatuses();
@@ -181,7 +179,6 @@ const DeployPrefilledModelModalContents: React.FC<
           currentProject: selectedProject,
           connections,
         }}
-        pvcs={pvcs.data}
         projectSection={projectSection}
         existingUriOption={
           modelDeployPrefillInfo.modelArtifactUri &&

frontend/src/pages/modelServing/screens/projects/InferenceServiceModal/ConnectionSection.tsx

@@ -307,7 +307,6 @@ export const ConnectionSection: React.FC<Props> = ({
   if (!loaded) {
     return <Skeleton />;
   }
-  //console.log(platform);
   return (
     <>
       {pvcServingEnabled && platform === ServingRuntimePlatform.SINGLE && (

frontend/src/pages/modelServing/screens/projects/KServeSection/KServeInferenceServiceTable.tsx

@@ -42,7 +42,6 @@ const KServeInferenceServiceTable: React.FC = () => {
     },
     serverSecrets: { refresh: refreshServerSecrets },
     filterTokens,
-    pvcs: { data: pvcs },
   } = React.useContext(ProjectDetailsContext);
   const columns = getKServeInferenceServiceColumns();
 
@@ -97,7 +96,6 @@ const KServeInferenceServiceTable: React.FC = () => {
               editKserveResources.inferenceService.spec.predictor.model?.runtime,
             ),
           }}
-          pvcs={pvcs}
           onClose={(submit: boolean) => {
             setEditKServeResources(undefined);
             if (submit) {

frontend/src/pages/modelServing/screens/projects/ModelServingPlatform.tsx

@@ -80,7 +80,6 @@ const ModelServingPlatform: React.FC = () => {
     servingRuntimeTemplateOrder: { data: templateOrder },
     servingRuntimeTemplateDisablement: { data: templateDisablement },
     connections: { data: connections },
-    pvcs: { data: pvcs },
     serverSecrets: { refresh: refreshTokens },
     inferenceServices: {
       data: { items: inferenceServices },
@@ -211,7 +210,6 @@ const ModelServingPlatform: React.FC = () => {
     return (
       <ManageKServeModal
         projectContext={{ currentProject, connections }}
-        pvcs={pvcs}
         servingRuntimeTemplates={templatesEnabled.filter((template) =>
           getTemplateEnabledForPlatform(template, ServingRuntimePlatform.SINGLE),
         )}

frontend/src/pages/modelServing/screens/projects/kServeModal/ManageKServeModal.tsx

@@ -24,7 +24,6 @@ import {
   InferenceServiceKind,
   AccessReviewResourceAttributes,
   SecretKind,
-  PersistentVolumeClaimKind,
 } from '#~/k8sTypes';
 import {
   getKServeContainerArgs,
@@ -69,9 +68,9 @@ import usePrefillModelDeployModal, {
 import { useKServeDeploymentMode } from '#~/pages/modelServing/useKServeDeploymentMode';
 import { SERVING_RUNTIME_SCOPE } from '#~/pages/modelServing/screens/const';
 import { useModelDeploymentNotification } from '#~/pages/modelServing/screens/projects/useModelDeploymentNotification';
-import { getDashboardPvcs } from '#~/api/k8s/pvcs';
 import useServingPlatformStatuses from '#~/pages/modelServing/useServingPlatformStatuses';
 import { ServingRuntimePlatform } from '#~/types.ts';
+import usePvcs from '#~/pages/modelServing/usePvcs';
 import KServeAutoscalerReplicaSection from './KServeAutoscalerReplicaSection';
 import EnvironmentVariablesSection from './EnvironmentVariablesSection';
 import ServingRuntimeArgsSection from './ServingRuntimeArgsSection';
@@ -91,7 +90,6 @@ type ManageKServeModalProps = {
   shouldFormHidden?: boolean;
   projectSection?: React.ReactNode;
   existingUriOption?: string;
-  pvcs?: PersistentVolumeClaimKind[] | [];
 } & EitherOrNone<
   {
     projectContext?: {
@@ -111,7 +109,6 @@ type ManageKServeModalProps = {
 const ManageKServeModal: React.FC<ManageKServeModalProps> = ({
   onClose,
   servingRuntimeTemplates,
-  pvcs,
   projectContext,
   editInfo,
   projectSection,
@@ -161,33 +158,15 @@ const ManageKServeModal: React.FC<ManageKServeModalProps> = ({
   const isAuthAvailable =
     useIsAreaAvailable(SupportedArea.K_SERVE_AUTH).status ||
     createDataInferenceService.isKServeRawDeployment;
-
   const currentProjectName = projectContext?.currentProject.metadata.name;
   const namespace = currentProjectName || createDataInferenceService.project;
   const currentProject = projectContext?.currentProject;
   const platformStatuses = useServingPlatformStatuses();
   const platform = getPlatform(platformStatuses, currentProject, editInfo);
 
-  const projectTemplates = useTemplates(namespace);
-  const [fallbackPvcs, setFallbackPvcs] = React.useState<PersistentVolumeClaimKind[]>([]);
+  const utilPvcs = usePvcs(namespace);
 
-  React.useEffect(() => {
-    let isCurrent = true;
-    getDashboardPvcs(namespace)
-      .then((data) => {
-        if (isCurrent) {
-          setFallbackPvcs(data);
-        }
-      })
-      .catch(() => {
-        if (isCurrent) {
-          setFallbackPvcs([]);
-        }
-      });
-    return () => {
-      isCurrent = false;
-    };
-  }, [namespace]);
+  const projectTemplates = useTemplates(namespace);
 
   const customServingRuntimesEnabled = useCustomServingRuntimesEnabled();
   const [allowCreate] = useAccessReview({
@@ -522,7 +501,7 @@ const ManageKServeModal: React.FC<ManageKServeModalProps> = ({
                 setConnection={setConnection}
                 setIsConnectionValid={setIsConnectionValid}
                 connections={connections}
-                pvcs={pvcs?.length && pvcs.length > 0 ? pvcs : fallbackPvcs}
+                pvcs={utilPvcs.data}
                 platform={platform}
               />
             </FormSection>

frontend/src/pages/modelServing/usePvcs.ts

@@ -0,0 +1,57 @@
+import * as React from 'react';
+import { PersistentVolumeClaimKind } from '#~/k8sTypes';
+import { FetchStateObject } from '#~/utilities/useFetch';
+import { getDashboardPvcs } from '#~/api/k8s/pvcs';
+
+const DEFAULT_LIST_FETCH_STATE: FetchStateObject<PersistentVolumeClaimKind[]> = {
+  data: [],
+  loaded: false,
+  error: undefined,
+  refresh: () => Promise.resolve([]),
+};
+
+export default function usePvcs(namespace: string): FetchStateObject<PersistentVolumeClaimKind[]> {
+  const [state, setState] =
+    React.useState<FetchStateObject<PersistentVolumeClaimKind[]>>(DEFAULT_LIST_FETCH_STATE);
+
+  const fetchPvcs = React.useCallback((): Promise<PersistentVolumeClaimKind[]> => {
+    setState((prev) => ({ ...prev, loaded: false, error: undefined }));
+    return getDashboardPvcs(namespace)
+      .then((pvcs) => {
+        setState({
+          data: pvcs,
+          loaded: true,
+          error: undefined,
+          refresh: fetchPvcs,
+        });
+        return pvcs;
+      })
+      .catch((error) => {
+        setState({
+          data: [],
+          loaded: true,
+          error,
+          refresh: fetchPvcs,
+        });
+        return [];
+      });
+  }, [namespace]);
+
+  React.useEffect(() => {
+    if (namespace) {
+      fetchPvcs();
+    } else {
+      setState(DEFAULT_LIST_FETCH_STATE);
+    }
+    // Only re-fetch when namespace changes
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [namespace]);
+
+  return React.useMemo(
+    () => ({
+      ...state,
+      refresh: fetchPvcs,
+    }),
+    [state, fetchPvcs],
+  );
+}

frontend/src/pages/projects/screens/detail/overview/serverModels/AddModelFooter.tsx

@@ -36,7 +36,6 @@ const AddModelFooter: React.FC<AddModelFooterProps> = ({ selectedPlatform, isNIM
     serverSecrets: { refresh: refreshTokens },
     inferenceServices: { refresh: refreshInferenceServices },
     currentProject,
-    pvcs,
   } = React.useContext(ProjectDetailsContext);
 
   const templatesSorted = getSortedTemplates(templates, templateOrder);
@@ -107,7 +106,6 @@ const AddModelFooter: React.FC<AddModelFooterProps> = ({ selectedPlatform, isNIM
       {modalShown && !isProjectModelMesh && !isNIM ? (
         <ManageKServeModal
           projectContext={{ currentProject, connections }}
-          pvcs={pvcs.data}
           servingRuntimeTemplates={templatesEnabled.filter((template) =>
             getTemplateEnabledForPlatform(template, ServingRuntimePlatform.SINGLE),
           )}