Filter by all concerns present in the VM

Before only the most severe concern was used for filtering.

Signed-off-by: Radoslaw Szwajkowski <[email protected]>

packages/forklift-console-plugin/src/modules/Providers/views/details/tabs/VirtualMachines/OVirtVirtualMachinesList.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 
 import { EnumToTuple, ResourceFieldFactory } from '@kubev2v/common';
 
-import { ProviderVirtualMachinesList, VmData } from './components/ProviderVirtualMachinesList';
+import { ProviderVirtualMachinesList, VmData } from './components';
 import { OVirtVirtualMachinesRow } from './OVirtVirtualMachinesRow';
 import { ProviderVirtualMachinesProps } from './ProviderVirtualMachines';
 import { getVmPowerState } from './utils';
@@ -22,12 +22,12 @@ export const oVirtVmFieldsMetadataFactory: ResourceFieldFactory = (t) => [
   },
   {
     resourceFieldId: 'concerns',
-    jsonPath: '$.concerns',
+    jsonPath: (data: VmData) => (data.vm.providerType === 'ovirt' ? data?.vm?.concerns : []),
     label: t('Concerns'),
     isVisible: true,
     sortable: true,
     filter: {
-      type: 'enum',
+      type: 'concerns',
       primary: true,
       placeholderLabel: t('Concerns'),
       values: EnumToTuple({ Critical: 'Critical', Warning: 'Warning', Information: 'Information' }),

packages/forklift-console-plugin/src/modules/Providers/views/details/tabs/VirtualMachines/OpenShiftVirtualMachinesList.tsx

@@ -3,8 +3,7 @@ import React from 'react';
 import { EnumToTuple, ResourceFieldFactory } from '@kubev2v/common';
 import { OpenshiftVM } from '@kubev2v/types';
 
-import { ProviderVirtualMachinesList } from './components/ProviderVirtualMachinesList';
-import { VmData } from './components';
+import { ProviderVirtualMachinesList, VmData } from './components';
 import { OpenShiftVirtualMachinesRow } from './OpenShiftVirtualMachinesRow';
 import { ProviderVirtualMachinesProps } from './ProviderVirtualMachines';
 import { getVmPowerState } from './utils';

packages/forklift-console-plugin/src/modules/Providers/views/details/tabs/VirtualMachines/OpenStackVirtualMachinesList.tsx

@@ -2,8 +2,8 @@ import React from 'react';
 
 import { EnumToTuple, ResourceFieldFactory } from '@kubev2v/common';
 
-import { ProviderVirtualMachinesList, VmData } from './components/ProviderVirtualMachinesList';
 import { getVmPowerState } from './utils/helpers/getVmPowerState';
+import { ProviderVirtualMachinesList, VmData } from './components';
 import { OpenStackVirtualMachinesRow } from './OpenStackVirtualMachinesRow';
 import { ProviderVirtualMachinesProps } from './ProviderVirtualMachines';
 
@@ -22,12 +22,12 @@ export const openStackVmFieldsMetadataFactory: ResourceFieldFactory = (t) => [
   },
   {
     resourceFieldId: 'concerns',
-    jsonPath: '$.concerns',
+    jsonPath: (data: VmData) => (data.vm.providerType === 'openstack' ? data?.vm?.concerns : []),
     label: t('Concerns'),
     isVisible: true,
     sortable: true,
     filter: {
-      type: 'enum',
+      type: 'concerns',
       primary: true,
       placeholderLabel: t('Concerns'),
       values: EnumToTuple({ Critical: 'Critical', Warning: 'Warning', Information: 'Information' }),

packages/forklift-console-plugin/src/modules/Providers/views/details/tabs/VirtualMachines/OvaVirtualMachinesList.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 
 import { EnumToTuple, ResourceFieldFactory } from '@kubev2v/common';
 
-import { ProviderVirtualMachinesList } from './components/ProviderVirtualMachinesList';
+import { ProviderVirtualMachinesList, VmData } from './components';
 import { OvaVirtualMachinesRow } from './OvaVirtualMachinesRow';
 import { ProviderVirtualMachinesProps } from './ProviderVirtualMachines';
 
@@ -21,12 +21,12 @@ export const ovaVmFieldsMetadataFactory: ResourceFieldFactory = (t) => [
   },
   {
     resourceFieldId: 'concerns',
-    jsonPath: '$.concerns',
+    jsonPath: (data: VmData) => (data.vm.providerType === 'ova' ? data?.vm?.concerns : []),
     label: t('Concerns'),
     isVisible: true,
     sortable: true,
     filter: {
-      type: 'enum',
+      type: 'concerns',
       primary: true,
       placeholderLabel: t('Concerns'),
       values: EnumToTuple({ Critical: 'Critical', Warning: 'Warning', Information: 'Information' }),

packages/forklift-console-plugin/src/modules/Providers/views/details/tabs/VirtualMachines/VSphereVirtualMachinesList.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 
 import { EnumToTuple, ResourceFieldFactory } from '@kubev2v/common';
 
-import { ProviderVirtualMachinesList, VmData } from './components/ProviderVirtualMachinesList';
+import { ProviderVirtualMachinesList, VmData } from './components';
 import { ProviderVirtualMachinesProps } from './ProviderVirtualMachines';
 import { getVmPowerState } from './utils';
 import { VSphereVirtualMachinesRow } from './VSphereVirtualMachinesRow';
@@ -22,12 +22,12 @@ export const vSphereVmFieldsMetadataFactory: ResourceFieldFactory = (t) => [
   },
   {
     resourceFieldId: 'concerns',
-    jsonPath: '$.concerns',
+    jsonPath: (data: VmData) => (data.vm.providerType === 'vsphere' ? data?.vm?.concerns : []),
     label: t('Concerns'),
     isVisible: true,
     sortable: true,
     filter: {
-      type: 'enum',
+      type: 'concerns',
       primary: true,
       placeholderLabel: t('Concerns'),
       values: EnumToTuple({ Critical: 'Critical', Warning: 'Warning', Information: 'Information' }),

packages/forklift-console-plugin/src/modules/Providers/views/details/tabs/VirtualMachines/components/ProviderVirtualMachinesList.tsx

@@ -4,16 +4,18 @@ import StandardPage from 'src/components/page/StandardPage';
 import { ProviderData } from 'src/modules/Providers/utils';
 import { useForkliftTranslation } from 'src/utils/i18n';
 
-import { loadUserSettings, ResourceFieldFactory, RowProps } from '@kubev2v/common';
-import { ProviderVirtualMachine } from '@kubev2v/types';
+import {
+  EnumFilter,
+  loadUserSettings,
+  ResourceFieldFactory,
+  RowProps,
+  ValueMatcher,
+} from '@kubev2v/common';
+import { Concern } from '@kubev2v/types';
 
 import { useInventoryVms } from '../utils/useInventoryVms';
 
-export interface VmData {
-  vm: ProviderVirtualMachine;
-  name: string;
-  concerns: string;
-}
+import { VmData } from './VMCellProps';
 
 export interface ProviderVirtualMachinesListProps extends RouteComponentProps {
   obj: ProviderData;
@@ -49,6 +51,16 @@ export const ProviderVirtualMachinesList: React.FC<ProviderVirtualMachinesListPr
       namespace={obj?.provider?.metadata?.namespace}
       title={t('Virtual Machines')}
       userSettings={userSettings}
+      extraSupportedFilters={{
+        concerns: EnumFilter,
+      }}
+      extraSupportedMatchers={[concernsMatcher]}
     />
   );
 };
+
+const concernsMatcher: ValueMatcher = {
+  filterType: 'concerns',
+  matchValue: (concerns: Concern[]) => (filter: string) =>
+    concerns.some(({ category }) => category === filter),
+};

packages/forklift-console-plugin/src/modules/Providers/views/details/tabs/VirtualMachines/components/VMCellProps.ts

@@ -4,7 +4,6 @@ import { ProviderVirtualMachine } from '@kubev2v/types';
 export interface VmData {
   vm: ProviderVirtualMachine;
   name: string;
-  concerns: string;
 }
 
 export interface VMCellProps {

packages/forklift-console-plugin/src/modules/Providers/views/details/tabs/VirtualMachines/components/index.ts

@@ -1,5 +1,6 @@
 // @index(['./*', /style/g], f => `export * from '${f.path}';`)
 export * from './PowerStateCellRenderer';
+export * from './ProviderVirtualMachinesList';
 export * from './VMCellProps';
 export * from './VMConcernsCellRenderer';
 export * from './VMNameCellRenderer';

packages/forklift-console-plugin/src/modules/Providers/views/details/tabs/VirtualMachines/utils/helpers/index.ts

@@ -1,4 +1,3 @@
 // @index(['./*', /style/g], f => `export * from '${f.path}';`)
-export * from './getHighestPriorityConcern';
 export * from './getVmPowerState';
 // @endindex

packages/forklift-console-plugin/src/modules/Providers/views/details/tabs/VirtualMachines/utils/useInventoryVms.tsx

@@ -5,8 +5,6 @@ import { ProviderVirtualMachine } from '@kubev2v/types';
 
 import { VmData } from '../components';
 
-import { getHighestPriorityConcern } from './helpers';
-
 /**
  * A hook for retrieving VMs from the inventory.
  * Adds providerType property to each VM.
@@ -46,7 +44,6 @@ export const useInventoryVms = (
             providerType: provider?.spec?.type,
           } as ProviderVirtualMachine,
           name: vm.name,
-          concerns: getHighestPriorityConcern(vm),
         }))
       : [];