Merge pull request #735 from yaacov/unhide-new-vm-list-columns

Unhide vm list columns
kubev2v · Sep 20, 2023 · 7e48ea8 · 7e48ea8
2 parents f0b22cf + 08da0cd
commit 7e48ea8
Show file tree

Hide file tree

Showing 5 changed files with 199 additions and 0 deletions.
diff --git a/packages/forklift-console-plugin/locales/en/plugin__forklift-console-plugin.json b/packages/forklift-console-plugin/locales/en/plugin__forklift-console-plugin.json
@@ -39,6 +39,7 @@
   "Clear all filters": "Clear all filters",
   "Click the update credentials button to save your changes, button is disabled until a change is detected.": "Click the update credentials button to save your changes, button is disabled until a change is detected.",
   "Close": "Close",
+  "Cluster": "Cluster",
   "Clusters": "Clusters",
   "Concerns": "Concerns",
   "Conditions": "Conditions",
@@ -118,17 +119,27 @@
   "Error: VDDK init image must be valid.": "Error: VDDK init image must be valid.",
   "Failed": "Failed",
   "False": "False",
+  "Filter by cluster": "Filter by cluster",
   "Filter by endpoint": "Filter by endpoint",
+  "Filter by flavor": "Filter by flavor",
+  "Filter by host": "Filter by host",
+  "Filter by image": "Filter by image",
   "Filter by name": "Filter by name",
   "Filter by namespace": "Filter by namespace",
   "Filter by network": "Filter by network",
+  "Filter by path": "Filter by path",
+  "Filter by status": "Filter by status",
+  "Filter by tenant": "Filter by tenant",
+  "Flavor": "Flavor",
   "From": "From",
   "Hide values": "Hide values",
   "Hooks for virtualization": "Hooks for virtualization",
+  "Host": "Host",
   "Host cluster": "Host cluster",
   "Hosts": "Hosts",
   "If true, the provider's REST API TLS certificate won't be validated.": "If true, the provider's REST API TLS certificate won't be validated.",
   "If true, the provider's TLS certificate won't be validated.": "If true, the provider's TLS certificate won't be validated.",
+  "Image": "Image",
   "Information concerns": "Information concerns",
   "Invalid application credential ID.": "Invalid application credential ID.",
   "Invalid application credential name.": "Invalid application credential name.",
@@ -240,9 +251,11 @@
   "OpenStack REST API user name.": "OpenStack REST API user name.",
   "Operator": "Operator",
   "Operator conditions define the current state of the controller": "Operator conditions define the current state of the controller",
+  "OvaPath": "OvaPath",
   "Overview": "Overview",
   "Owner": "Owner",
   "Password": "Password",
+  "Path": "Path",
   "Plans": "Plans",
   "Plans for virtualization": "Plans for virtualization",
   "Please choose a NetworkAttachmentDefinition for default data transfer.": "Please choose a NetworkAttachmentDefinition for default data transfer.",
@@ -326,6 +339,8 @@
   "Succeeded": "Succeeded",
   "Target and Source": "Target and Source",
   "Target provider": "Target provider",
+  "Template": "Template",
+  "Tenant": "Tenant",
   "The CA certificate is the /etc/pki/ovirt-engine/apache-ca.pem file on the Manager machine.": "The CA certificate is the /etc/pki/ovirt-engine/apache-ca.pem file on the Manager machine.",
   "The interval in minutes for precopy. Default value is 60.": "The interval in minutes for precopy. Default value is 60.",
   "The interval in seconds for snapshot pooling. Default value is 10.": "The interval in seconds for snapshot pooling. Default value is 10.",

diff --git a/...gin/src/modules/Providers/views/details/tabs/VirtualMachines/OVirtVirtualMachinesList.tsx b/...gin/src/modules/Providers/views/details/tabs/VirtualMachines/OVirtVirtualMachinesList.tsx
@@ -32,6 +32,62 @@ export const oVirtVmFieldsMetadataFactory: ResourceFieldFactory = (t) => [
       values: EnumToTuple({ Critical: 'Critical', Warning: 'Warning', Information: 'Information' }),
     },
   },
+  {
+    resourceFieldId: 'cluster',
+    jsonPath: '$.vm.cluster',
+    label: t('Cluster'),
+    isVisible: true,
+    isIdentity: false,
+    filter: {
+      type: 'freetext',
+      placeholderLabel: t('Filter by cluster'),
+    },
+    sortable: true,
+  },
+  {
+    resourceFieldId: 'host',
+    jsonPath: '$.vm.host',
+    label: t('Host'),
+    isVisible: true,
+    isIdentity: false,
+    filter: {
+      type: 'freetext',
+      placeholderLabel: t('Filter by host'),
+    },
+    sortable: true,
+  },
+  {
+    resourceFieldId: 'path',
+    jsonPath: '$.vm.path',
+    label: t('Path'),
+    isVisible: true,
+    isIdentity: false,
+    filter: {
+      type: 'freetext',
+      placeholderLabel: t('Filter by path'),
+    },
+    sortable: true,
+  },
+  {
+    resourceFieldId: 'status',
+    jsonPath: '$.vm.status',
+    label: t('Status'),
+    isVisible: true,
+    isIdentity: false,
+    filter: {
+      type: 'freetext',
+      placeholderLabel: t('Filter by status'),
+    },
+    sortable: true,
+  },
+  {
+    resourceFieldId: 'description',
+    jsonPath: '$.vm.description',
+    label: t('Description'),
+    isVisible: true,
+    isIdentity: false,
+    sortable: false,
+  },
 ];
 
 export const OVirtVirtualMachinesList: React.FC<ProviderVirtualMachinesProps> = ({

diff --git a/...src/modules/Providers/views/details/tabs/VirtualMachines/OpenStackVirtualMachinesList.tsx b/...src/modules/Providers/views/details/tabs/VirtualMachines/OpenStackVirtualMachinesList.tsx
@@ -32,6 +32,78 @@ export const openStackVmFieldsMetadataFactory: ResourceFieldFactory = (t) => [
       values: EnumToTuple({ Critical: 'Critical', Warning: 'Warning', Information: 'Information' }),
     },
   },
+  {
+    resourceFieldId: 'hostID',
+    jsonPath: '$.vm.hostID',
+    label: t('Host'),
+    isVisible: true,
+    isIdentity: false,
+    filter: {
+      type: 'freetext',
+      placeholderLabel: t('Filter by host'),
+    },
+    sortable: true,
+  },
+  {
+    resourceFieldId: 'path',
+    jsonPath: '$.vm.path',
+    label: t('Path'),
+    isVisible: true,
+    isIdentity: false,
+    filter: {
+      type: 'freetext',
+      placeholderLabel: t('Filter by path'),
+    },
+    sortable: true,
+  },
+  {
+    resourceFieldId: 'status',
+    jsonPath: '$.vm.status',
+    label: t('Status'),
+    isVisible: true,
+    isIdentity: false,
+    filter: {
+      type: 'freetext',
+      placeholderLabel: t('Filter by status'),
+    },
+    sortable: true,
+  },
+  {
+    resourceFieldId: 'tenantID',
+    jsonPath: '$.vm.tenantID',
+    label: t('Tenant'),
+    isVisible: true,
+    isIdentity: false,
+    filter: {
+      type: 'freetext',
+      placeholderLabel: t('Filter by tenant'),
+    },
+    sortable: true,
+  },
+  {
+    resourceFieldId: 'imageID',
+    jsonPath: '$.vm.imageID',
+    label: t('Image'),
+    isVisible: true,
+    isIdentity: false,
+    filter: {
+      type: 'freetext',
+      placeholderLabel: t('Filter by image'),
+    },
+    sortable: true,
+  },
+  {
+    resourceFieldId: 'flavorID',
+    jsonPath: '$.vm.flavorID',
+    label: t('Flavor'),
+    isVisible: true,
+    isIdentity: false,
+    filter: {
+      type: 'freetext',
+      placeholderLabel: t('Filter by flavor'),
+    },
+    sortable: true,
+  },
 ];
 
 export const OpenStackVirtualMachinesList: React.FC<ProviderVirtualMachinesProps> = ({

diff --git a/...lugin/src/modules/Providers/views/details/tabs/VirtualMachines/OvaVirtualMachinesList.tsx b/...lugin/src/modules/Providers/views/details/tabs/VirtualMachines/OvaVirtualMachinesList.tsx
@@ -32,6 +32,18 @@ export const ovaVmFieldsMetadataFactory: ResourceFieldFactory = (t) => [
       values: EnumToTuple({ Critical: 'Critical', Warning: 'Warning', Information: 'Information' }),
     },
   },
+  {
+    resourceFieldId: 'ovaPath',
+    jsonPath: '$.vm.OvaPath',
+    label: t('OvaPath'),
+    isVisible: true,
+    isIdentity: false,
+    filter: {
+      type: 'freetext',
+      placeholderLabel: t('Filter by path'),
+    },
+    sortable: true,
+  },
 ];
 
 export const OvaVirtualMachinesList: React.FC<ProviderVirtualMachinesProps> = ({

diff --git a/...n/src/modules/Providers/views/details/tabs/VirtualMachines/VSphereVirtualMachinesList.tsx b/...n/src/modules/Providers/views/details/tabs/VirtualMachines/VSphereVirtualMachinesList.tsx
@@ -32,6 +32,50 @@ export const vSphereVmFieldsMetadataFactory: ResourceFieldFactory = (t) => [
       values: EnumToTuple({ Critical: 'Critical', Warning: 'Warning', Information: 'Information' }),
     },
   },
+  {
+    resourceFieldId: 'isTemplate',
+    jsonPath: '$.vm.isTemplate',
+    label: t('Template'),
+    isVisible: true,
+    isIdentity: false,
+    sortable: true,
+  },
+  {
+    resourceFieldId: 'host',
+    jsonPath: '$.vm.host',
+    label: t('Host'),
+    isVisible: true,
+    isIdentity: false,
+    filter: {
+      type: 'freetext',
+      placeholderLabel: t('Filter by host'),
+    },
+    sortable: true,
+  },
+  {
+    resourceFieldId: 'path',
+    jsonPath: '$.vm.path',
+    label: t('Path'),
+    isVisible: true,
+    isIdentity: false,
+    filter: {
+      type: 'freetext',
+      placeholderLabel: t('Filter by path'),
+    },
+    sortable: true,
+  },
+  {
+    resourceFieldId: 'status',
+    jsonPath: '$.vm.powerState',
+    label: t('Status'),
+    isVisible: true,
+    isIdentity: false,
+    filter: {
+      type: 'freetext',
+      placeholderLabel: t('Filter by status'),
+    },
+    sortable: true,
+  },
 ];
 
 export const VSphereVirtualMachinesList: React.FC<ProviderVirtualMachinesProps> = ({