From d21a82ce55fe1b1b08c0574e2cf40333b950c17e Mon Sep 17 00:00:00 2001
From: Aviv Turgeman <aturgema@redhat.com>
Date: Thu, 19 Sep 2024 13:53:46 +0300
Subject: [PATCH] CNV-45815: No volumes found for nonpriv user in All projects

Signed-off-by: Aviv Turgeman <aturgema@redhat.com>
---
 .../BootableVolumeList/BootableVolumeList.tsx       | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/views/catalog/CreateFromInstanceTypes/components/BootableVolumeList/BootableVolumeList.tsx b/src/views/catalog/CreateFromInstanceTypes/components/BootableVolumeList/BootableVolumeList.tsx
index 3c438a65a..12191d46e 100644
--- a/src/views/catalog/CreateFromInstanceTypes/components/BootableVolumeList/BootableVolumeList.tsx
+++ b/src/views/catalog/CreateFromInstanceTypes/components/BootableVolumeList/BootableVolumeList.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useMemo, useState } from 'react';
+import React, { FC, useEffect, useMemo, useState } from 'react';
 
 import { useInstanceTypeVMStore } from '@catalog/CreateFromInstanceTypes/state/useInstanceTypeVMStore';
 import { UseBootableVolumesValues } from '@catalog/CreateFromInstanceTypes/state/utils/types';
@@ -6,6 +6,9 @@ import { CREATE_VM_TAB } from '@catalog/CreateVMHorizontalNav/constants';
 import { V1beta1VirtualMachineClusterPreference } from '@kubevirt-ui/kubevirt-api/kubevirt';
 import ListPageFilter from '@kubevirt-utils/components/ListPageFilter/ListPageFilter';
 import ProjectDropdown from '@kubevirt-utils/components/ProjectDropdown/ProjectDropdown';
+import { OPENSHIFT_OS_IMAGES_NS } from '@kubevirt-utils/constants/constants';
+import { ALL_PROJECTS } from '@kubevirt-utils/hooks/constants';
+import { useIsAdmin } from '@kubevirt-utils/hooks/useIsAdmin';
 import { useKubevirtTranslation } from '@kubevirt-utils/hooks/useKubevirtTranslation';
 import { UserSettingFavorites } from '@kubevirt-utils/hooks/useKubevirtUserSettings/utils/types';
 import useHideDeprecatedBootableVolumes from '@kubevirt-utils/resources/bootableresources/hooks/useHideDeprecatedBootableVolumes';
@@ -47,6 +50,7 @@ const BootableVolumeList: FC<BootableVolumeListProps> = ({
   selectedBootableVolumeState,
 }) => {
   const { t } = useKubevirtTranslation();
+  const isAdmin = useIsAdmin();
 
   const {
     instanceTypeVMState,
@@ -89,6 +93,12 @@ const BootableVolumeList: FC<BootableVolumeListProps> = ({
     pagination,
   );
 
+  useEffect(() => {
+    if (!isAdmin && volumeListNamespace === ALL_PROJECTS) {
+      setVolumeListNamespace(OPENSHIFT_OS_IMAGES_NS);
+    }
+  }, [isAdmin, volumeListNamespace, setVolumeListNamespace]);
+
   const displayVolumes = !isEmpty(bootableVolumes) && loaded && loadedColumns;
 
   const onModalBootableVolumeSelect = (modalSelectedVolume: BootableVolume) => {
@@ -110,6 +120,7 @@ const BootableVolumeList: FC<BootableVolumeListProps> = ({
             label={t('Volumes project')}
           >
             <ProjectDropdown
+              includeAllProjects={isAdmin}
               onChange={setVolumeListNamespace}
               selectedProject={volumeListNamespace}
             />