fix

frontend/src/pages/projects/screens/detail/notebooks/useNotebookImageData.ts

@@ -44,8 +44,7 @@ export const getNotebookImageData = (
     notebook,
     images,
     lastImageSelectionName,
-    versionName,
-    imageName,
+    container.image,
   );
   if (
     notebookImageNoInternalRegistry &&
@@ -57,8 +56,7 @@ export const getNotebookImageData = (
     notebook,
     images,
     lastImageSelectionTag,
-    versionName,
-    imageName,
+    container.image,
   );
   if (
     notebookImageNoInternalRegistryNoSHA &&
@@ -101,40 +99,13 @@ const getNotebookImageInternalRegistry = (
 ): NotebookImageData[0] => {
   const imageStream = images.find((image) => image.metadata.name === imageName);
 
-  if (!imageStream) {
-    // Get the image display name from the notebook metadata if we can't find the image stream. (this is a fallback and could still be undefined)
-    const imageDisplayName = notebook.metadata.annotations?.['opendatahub.io/image-display-name'];
-
-    return {
-      imageAvailability: NotebookImageAvailability.DELETED,
-      imageDisplayName,
-    };
-  }
-  const versions = imageStream.spec.tags || [];
-  const imageVersion = versions.find((version) => version.name === versionName);
-  const imageDisplayName = getImageStreamDisplayName(imageStream);
-  if (!imageVersion) {
-    return {
-      imageAvailability: NotebookImageAvailability.DELETED,
-      imageDisplayName,
-    };
-  }
-  return {
-    imageStream,
-    imageVersion,
-    imageAvailability:
-      imageStream.metadata.labels?.['opendatahub.io/notebook-image'] === 'true'
-        ? NotebookImageAvailability.ENABLED
-        : NotebookImageAvailability.DISABLED,
-    imageDisplayName,
-  };
+  return processImageStream(imageStream, notebook, versionName);
 };
 
 const getNotebookImageNoInternalRegistry = (
   notebook: NotebookKind,
   images: ImageStreamKind[],
   lastImageSelectionName: string,
-  versionName: string,
   containerImage: string,
 ): NotebookImageData[0] => {
   const imageStream = images.find(
@@ -143,40 +114,13 @@ const getNotebookImageNoInternalRegistry = (
       image.spec.tags?.find((version) => version.from?.name === containerImage),
   );
 
-  if (!imageStream) {
-    // Get the image display name from the notebook metadata if we can't find the image stream. (this is a fallback and could still be undefined)
-    const imageDisplayName = notebook.metadata.annotations?.['opendatahub.io/image-display-name'];
-
-    return {
-      imageAvailability: NotebookImageAvailability.DELETED,
-      imageDisplayName,
-    };
-  }
-  const versions = imageStream.spec.tags || [];
-  const imageVersion = versions.find((version) => version.from?.name === containerImage);
-  const imageDisplayName = getImageStreamDisplayName(imageStream);
-  if (!imageVersion) {
-    return {
-      imageAvailability: NotebookImageAvailability.DELETED,
-      imageDisplayName,
-    };
-  }
-  return {
-    imageStream,
-    imageVersion,
-    imageAvailability:
-      imageStream.metadata.labels?.['opendatahub.io/notebook-image'] === 'true'
-        ? NotebookImageAvailability.ENABLED
-        : NotebookImageAvailability.DISABLED,
-    imageDisplayName,
-  };
+  return processImageStream(imageStream, notebook, containerImage);
 };
 
 const getNotebookImageNoInternalRegistryNoSHA = (
   notebook: NotebookKind,
   images: ImageStreamKind[],
   lastImageSelectionTag: string,
-  versionName: string,
   containerImage: string,
 ): NotebookImageData[0] => {
   const imageStream = images.find((image) =>
@@ -187,6 +131,14 @@ const getNotebookImageNoInternalRegistryNoSHA = (
     ),
   );
 
+  return processImageStream(imageStream, notebook, lastImageSelectionTag);
+};
+
+const processImageStream = (
+  imageStream: ImageStreamKind | undefined,
+  notebook: NotebookKind,
+  versionName: string,
+): NotebookImageData[0] => {
   if (!imageStream) {
     // Get the image display name from the notebook metadata if we can't find the image stream. (this is a fallback and could still be undefined)
     const imageDisplayName = notebook.metadata.annotations?.['opendatahub.io/image-display-name'];
@@ -197,14 +149,23 @@ const getNotebookImageNoInternalRegistryNoSHA = (
     };
   }
   const versions = imageStream.spec.tags || [];
-  const imageVersion = versions.find((version) => version.name === lastImageSelectionTag);
+  const imageVersion = versions.find((version) => version.name === versionName);
   const imageDisplayName = getImageStreamDisplayName(imageStream);
   if (!imageVersion) {
     return {
       imageAvailability: NotebookImageAvailability.DELETED,
       imageDisplayName,
     };
   }
+
+  return getImageStreamData(imageStream, imageVersion, imageDisplayName);
+};
+
+const getImageStreamData = (
+  imageStream: ImageStreamKind,
+  imageVersion: any,
+  imageDisplayName: string,
+): NotebookImageData[0] => {
   return {
     imageStream,
     imageVersion,