Merge pull request #951 from yaacov/nicer-migraion-vm-column

🐾 Nicer migration vm column
kubev2v · Feb 23, 2024 · 8f7b7af · 8f7b7af
2 parents 3918e84 + 0c6e4ff
commit 8f7b7af
Show file tree

Hide file tree

Showing 2 changed files with 104 additions and 9 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
@@ -1,5 +1,6 @@
 {
   "{{Canceled}} canceled": "{{Canceled}} canceled",
+  "{{completed}} of {{total}} VMs migrated, {{canceled}} canceled": "{{completed}} of {{total}} VMs migrated, {{canceled}} canceled",
   "{{dateLabel}} Failed: {{value}}": "{{dateLabel}} Failed: {{value}}",
   "{{dateLabel}} Running: {{value}}": "{{dateLabel}} Running: {{value}}",
   "{{dateLabel}} Succeeded: {{value}}": "{{dateLabel}} Succeeded: {{value}}",

diff --git a/...c/modules/Plans/views/details/components/MigrationsSection/components/MigrationsTable.tsx b/...c/modules/Plans/views/details/components/MigrationsSection/components/MigrationsTable.tsx
@@ -6,10 +6,19 @@ import {
   MigrationModelGroupVersionKind,
   PlanModelGroupVersionKind,
   V1beta1Migration,
-  V1beta1MigrationStatusConditions,
 } from '@kubev2v/types';
 import { ResourceLink, Timestamp } from '@openshift-console/dynamic-plugin-sdk';
-import { HelperText, HelperTextItem, Split, SplitItem } from '@patternfly/react-core';
+import {
+  HelperText,
+  HelperTextItem,
+  Progress,
+  ProgressMeasureLocation,
+  ProgressSize,
+  ProgressVariant,
+  Split,
+  SplitItem,
+} from '@patternfly/react-core';
+import { VirtualMachineIcon } from '@patternfly/react-icons';
 import { TableComposable, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table';
 
 export const MigrationsTable: React.FC<MigrationTableProps> = ({ migrations, showOwner }) => {
@@ -23,16 +32,18 @@ export const MigrationsTable: React.FC<MigrationTableProps> = ({ migrations, sho
     );
   }
 
+  sortMigrationsByStartedAtDate(migrations);
+
   return (
     <TableComposable aria-label="Expandable table" variant="compact">
       <Thead>
         <Tr>
           <Th width={20}>{t('Migration')}</Th>
           {showOwner && <Th width={20}>{t('Owner')}</Th>}
           <Th width={10}>{t('Status')}</Th>
-          <Th width={10}>{t('VMs')}</Th>
-          <Th width={15}>{t('Started at')}</Th>
-          <Th width={15}>{t('Completed at')}</Th>
+          <Th width={15}>{t('VMs')}</Th>
+          <Th width={10}>{t('Started at')}</Th>
+          <Th width={10}>{t('Completed at')}</Th>
         </Tr>
       </Thead>
       <Tbody>
@@ -58,8 +69,12 @@ export const MigrationsTable: React.FC<MigrationTableProps> = ({ migrations, sho
                 )}
               </Td>
             )}
-            <Td>{getStatusLabel(migration?.status?.conditions)}</Td>
-            <Td>{migration?.status?.vms?.length || '-'}</Td>
+            <Td>
+              <StatusLabel migration={migration} />
+            </Td>
+            <Td>
+              <VMsLabel migration={migration} />
+            </Td>
             <Td>
               <Timestamp timestamp={migration?.status?.started} />
             </Td>
@@ -73,8 +88,14 @@ export const MigrationsTable: React.FC<MigrationTableProps> = ({ migrations, sho
   );
 };
 
-const getStatusLabel = (conditions: V1beta1MigrationStatusConditions[]) => {
-  let phase: string;
+const getMigrationPhase = (migration) => {
+  let phase = 'Unknown';
+
+  const conditions = migration?.status?.conditions;
+
+  if (!conditions || conditions.length < 1) {
+    return phase;
+  }
 
   const phases = ['Ready', 'Running', 'Succeeded', 'Failed'];
 
@@ -86,6 +107,31 @@ const getStatusLabel = (conditions: V1beta1MigrationStatusConditions[]) => {
     }
   });
 
+  return phase;
+};
+
+const getMigrationVmsCounts = (migration) => {
+  const vms = migration?.status?.vms;
+
+  if (!vms || vms.length < 1) {
+    return {};
+  }
+
+  const vmsCanceled = vms.filter((vm) =>
+    (vm?.conditions || []).find((c) => c.type === 'Canceled' && c.status === 'True'),
+  );
+  const vmsCompleted = vms.filter((vm) => vm?.completed);
+
+  return {
+    completed: vmsCompleted.length,
+    total: vms.length,
+    canceled: vmsCanceled.length,
+  };
+};
+
+const StatusLabel: React.FC<{ migration: V1beta1Migration }> = ({ migration }) => {
+  const phase = getMigrationPhase(migration);
+
   return (
     <Split>
       <SplitItem className="forklift-overview__controller-card__status-icon">
@@ -96,6 +142,54 @@ const getStatusLabel = (conditions: V1beta1MigrationStatusConditions[]) => {
   );
 };
 
+const VMsLabel: React.FC<{ migration: V1beta1Migration }> = ({ migration }) => {
+  const { t } = useForkliftTranslation();
+
+  const phase = getMigrationPhase(migration);
+  let progressVariant;
+
+  switch (phase) {
+    case 'Failed':
+      progressVariant = ProgressVariant.danger;
+      break;
+    case 'Succeeded':
+      progressVariant = ProgressVariant.success;
+      break;
+  }
+
+  const counters = getMigrationVmsCounts(migration);
+
+  if (!counters?.total || counters.total === 0) {
+    return <>-</>;
+  }
+
+  return (
+    <Split>
+      <SplitItem className="forklift-overview__controller-card__status-icon">
+        <VirtualMachineIcon />
+      </SplitItem>
+      <SplitItem>
+        {t('{{completed}} of {{total}} VMs migrated, {{canceled}} canceled', counters)}
+
+        <Progress
+          value={(100 * counters?.completed) / counters?.total}
+          size={ProgressSize.sm}
+          measureLocation={ProgressMeasureLocation.none}
+          variant={progressVariant}
+        />
+      </SplitItem>
+    </Split>
+  );
+};
+
+const sortMigrationsByStartedAtDate = (migrations: V1beta1Migration[]) => {
+  migrations.sort((a, b) => {
+    const dateA = new Date(a?.status?.started);
+    const dateB = new Date(b?.status?.started);
+    return dateB.getTime() - dateA.getTime();
+  });
+};
+
 export type MigrationTableProps = {
   migrations: V1beta1Migration[];
   showOwner?: boolean;