Merge pull request #1562 from hstastna/Menu_button_flickering

CNV-33133: Make buttons in VMs and MigrationPolicies pages not blink
kubevirt-ui · Sep 22, 2023 · 2fa1ad8 · 2fa1ad8
2 parents a477473 + 7c35726
commit 2fa1ad8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/views/migrationpolicies/list/MigrationPoliciesList.tsx b/src/views/migrationpolicies/list/MigrationPoliciesList.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { FC } from 'react';
 
 import { V1alpha1MigrationPolicy } from '@kubevirt-ui/kubevirt-api/kubevirt';
 import { useKubevirtTranslation } from '@kubevirt-utils/hooks/useKubevirtTranslation';
@@ -21,7 +21,7 @@ type MigrationPoliciesListProps = {
   kind: string;
 };
 
-const MigrationPoliciesList: React.FC<MigrationPoliciesListProps> = ({ kind }) => {
+const MigrationPoliciesList: FC<MigrationPoliciesListProps> = ({ kind }) => {
   const { t } = useKubevirtTranslation();
   const [mps, loaded, loadError] = useK8sWatchResource<V1alpha1MigrationPolicy[]>({
     isList: true,
@@ -54,10 +54,11 @@ const MigrationPoliciesList: React.FC<MigrationPoliciesListProps> = ({ kind }) =
           loaded={loaded}
           onFilterChange={onFilterChange}
         />
+        {isEmpty(mps) && <MigrationPoliciesEmptyState kind={kind} />}
         <VirtualizedTable<V1alpha1MigrationPolicy>
           columns={activeColumns}
           data={data}
-          EmptyMsg={() => <MigrationPoliciesEmptyState kind={kind} />}
+          EmptyMsg={() => <></>}
           loaded={loaded}
           loadError={loadError}
           Row={MigrationPoliciesRow}

diff --git a/src/views/virtualmachines/list/VirtualMachinesList.tsx b/src/views/virtualmachines/list/VirtualMachinesList.tsx
@@ -181,10 +181,8 @@ const VirtualMachinesList: FC<VirtualMachinesListProps> = ({ kind, namespace })
             />
           )}
         </div>
+        {isEmpty(vms) && <VirtualMachineEmptyState catalogURL={catalogURL} namespace={namespace} />}
         <VirtualizedTable<K8sResourceCommon>
-          NoDataEmptyMsg={() => (
-            <VirtualMachineEmptyState catalogURL={catalogURL} namespace={namespace} />
-          )}
           rowData={{
             getVmi: (ns: string, name: string) => vmiMapper?.mapper?.[ns]?.[name],
             getVmim: (ns: string, name: string) => vmimMapper?.[ns]?.[name],
@@ -195,6 +193,7 @@ const VirtualMachinesList: FC<VirtualMachinesListProps> = ({ kind, namespace })
           data={data}
           loaded={loaded && vmiLoaded && vmimsLoaded && isSingleNodeLoaded && !loadingFeatureProxy}
           loadError={loadError}
+          NoDataEmptyMsg={() => <></>}
           Row={VirtualMachineRow}
           unfilteredData={unfilteredData}
         />