CNV-42021: fix vm list for search page

kubevirt-ui · May 22, 2024 · c38e965 · c38e965
1 parent ae4c3ff
commit c38e965
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/src/utils/utils/types.ts b/src/utils/utils/types.ts
@@ -10,7 +10,9 @@ export type ListPageProps = {
   hideColumnManagement?: boolean;
   hideNameLabelFilters?: boolean;
   hideTextFilter?: boolean;
+  kind?: string;
   nameFilter?: string;
   namespace?: string;
   selector?: Selector;
+  showTitle?: string;
 };
diff --git a/src/views/virtualmachines/list/VirtualMachinesList.tsx b/src/views/virtualmachines/list/VirtualMachinesList.tsx
@@ -23,6 +23,7 @@ import {
   paginationInitialState,
 } from '@kubevirt-utils/hooks/usePagination/utils/constants';
 import useSingleNodeCluster from '@kubevirt-utils/hooks/useSingleNodeCluster';
+import { ListPageProps } from '@kubevirt-utils/utils/types';
 import { isEmpty } from '@kubevirt-utils/utils/utils';
 import {
   K8sResourceCommon,
@@ -45,24 +46,32 @@ import useVirtualMachineColumns from './hooks/useVirtualMachineColumns';
 import '@kubevirt-utils/styles/list-managment-group.scss';
 import './VirtualMachinesList.scss';
 
-type VirtualMachinesListProps = {
-  kind: string;
-  namespace: string;
-};
-
-const VirtualMachinesList: FC<VirtualMachinesListProps> = ({ kind, namespace }) => {
+const VirtualMachinesList: FC<ListPageProps> = ({
+  fieldSelector,
+  hideColumnManagement,
+  hideNameLabelFilters,
+  hideTextFilter,
+  kind,
+  nameFilter,
+  namespace,
+  selector,
+  showTitle,
+}) => {
   const { t } = useKubevirtTranslation();
   const catalogURL = `/k8s/ns/${namespace || DEFAULT_NAMESPACE}/catalog`;
   const { featureEnabled, loading: loadingFeatureProxy } = useFeatures(KUBEVIRT_APISERVER_PROXY);
   const isProxyPodAlive = useKubevirtDataPodHealth();
   const query = useQuery();
+
   const [vms, vmLoaded, loadError] = useKubevirtWatchResource<V1VirtualMachine[]>(
     {
+      fieldSelector,
       groupVersionKind: VirtualMachineModelGroupVersionKind,
       isList: true,
       limit: OBJECTS_FETCHING_LIMIT,
       namespace,
       namespaced: true,
+      selector,
     },
     {
       labels: 'metadata.labels',
@@ -106,7 +115,9 @@ const VirtualMachinesList: FC<VirtualMachinesListProps> = ({ kind, namespace })
   const [unfilterData, dataFilters, onFilterChange] = useListPageFilter<
     V1VirtualMachine,
     V1VirtualMachine
-  >(vms, [...filters, ...searchFilters]);
+  >(vms, [...filters, ...searchFilters], {
+    name: { selected: [nameFilter] },
+  });
 
   const [unfilteredData, data] = useMemo(() => {
     if (!featureEnabled || isProxyPodAlive === false) return [unfilterData, dataFilters];
@@ -152,7 +163,7 @@ const VirtualMachinesList: FC<VirtualMachinesListProps> = ({ kind, namespace })
   return (
     <>
       {/* All of this table and components should be replaced to our own fitted components */}
-      <ListPageHeader title={t('VirtualMachines')}>
+      <ListPageHeader title={showTitle && t('VirtualMachines')}>
         <VirtualMachinesCreateButton namespace={namespace} />
       </ListPageHeader>
       <ListPageBody>
@@ -178,6 +189,9 @@ const VirtualMachinesList: FC<VirtualMachinesListProps> = ({ kind, namespace })
               }));
             }}
             data={unfilteredData}
+            hideColumnManagement={hideColumnManagement}
+            hideLabelFilter={hideTextFilter}
+            hideNameLabelFilters={hideNameLabelFilters}
             loaded={loaded}
             rowFilters={filters}
             searchFilters={searchFilters}