Retrieve VM template via jsonpath and accessor method

Signed-off-by: Radoslaw Szwajkowski <[email protected]>
kubev2v · Sep 29, 2023 · 703b6f4 · 703b6f4
1 parent 8483bbf
commit 703b6f4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/...src/modules/Providers/views/details/tabs/VirtualMachines/OpenShiftVirtualMachinesList.tsx b/...src/modules/Providers/views/details/tabs/VirtualMachines/OpenShiftVirtualMachinesList.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 
 import { EnumToTuple, ResourceFieldFactory } from '@kubev2v/common';
-import { OpenshiftVM } from '@kubev2v/types';
 
 import { ProviderVirtualMachinesList } from './components/ProviderVirtualMachinesList';
 import { VmData } from './components';
@@ -37,8 +36,7 @@ const openShiftVmFieldsMetadataFactory: ResourceFieldFactory = (t) => [
   },
   {
     resourceFieldId: 'template',
-    jsonPath: (data: VmData) =>
-      (data?.vm as OpenshiftVM)?.object?.metadata?.labels?.['vm.kubevirt.io/template'] ?? '',
+    jsonPath: "$.vm.object.metadata.labels['vm.kubevirt.io/template']",
     label: t('Template'),
     isVisible: true,
     isIdentity: false,

diff --git a/.../src/modules/Providers/views/details/tabs/VirtualMachines/OpenShiftVirtualMachinesRow.tsx b/.../src/modules/Providers/views/details/tabs/VirtualMachines/OpenShiftVirtualMachinesRow.tsx
@@ -2,20 +2,16 @@ import React from 'react';
 import { TableCell } from 'src/modules/Providers/utils';
 
 import { ResourceField, RowProps } from '@kubev2v/common';
-import { OpenshiftVM } from '@kubev2v/types';
 import { Td, Tr } from '@patternfly/react-table';
 
 import { PowerStateCellRenderer } from './components/PowerStateCellRenderer';
+import { getVmTemplate } from './utils/helpers/vmProps';
 import { VMCellProps, VmData, VMNameCellRenderer } from './components';
 
 const cellRenderers: Record<string, React.FC<VMCellProps>> = {
   name: VMNameCellRenderer,
   status: PowerStateCellRenderer,
-  template: ({ data }) => (
-    <TableCell>
-      {(data?.vm as OpenshiftVM)?.object?.metadata?.labels?.['vm.kubevirt.io/template'] ?? ''}
-    </TableCell>
-  ),
+  template: ({ data }) => <TableCell>{getVmTemplate(data?.vm)}</TableCell>,
 };
 
 const renderTd = ({ resourceData, resourceFieldId, resourceFields }: RenderTdProps) => {

diff --git a/...-plugin/src/modules/Providers/views/details/tabs/VirtualMachines/utils/helpers/vmProps.ts b/...-plugin/src/modules/Providers/views/details/tabs/VirtualMachines/utils/helpers/vmProps.ts
@@ -0,0 +1,6 @@
+import { ProviderVirtualMachine } from '@kubev2v/types';
+
+export const getVmTemplate = (vm: ProviderVirtualMachine): string | undefined =>
+  vm?.providerType === 'openshift'
+    ? vm.object?.metadata?.labels?.['vm.kubevirt.io/template']
+    : undefined;