Merge pull request #1858 from metalice/CNV-38270-changing-snapshot-st…

…atus CNV-38270: Changing snapshot status
kubevirt-ui · Apr 3, 2024 · 5ff8db8 · 5ff8db8
2 parents 090ad90 + 8c6dc08
commit 5ff8db8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/...rtualmachines/details/tabs/snapshots/components/SnapshotStatusIcon/SnapshotStatusIcon.tsx b/...rtualmachines/details/tabs/snapshots/components/SnapshotStatusIcon/SnapshotStatusIcon.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React, { FC } from 'react';
 
 import { ColoredIconProps, StatusIconAndText } from '@openshift-console/dynamic-plugin-sdk';
 
@@ -8,14 +8,10 @@ type SnapshotStatusIconProps = {
   phase: string;
 };
 
-const SnapshotStatusIcon: React.FC<SnapshotStatusIconProps> = ({ phase }) => {
-  const StatusIcon: React.FC<ColoredIconProps> = iconMapper[phase];
+const SnapshotStatusIcon: FC<SnapshotStatusIconProps> = ({ phase }) => {
+  const StatusIcon: FC<ColoredIconProps> = iconMapper?.[phase] || iconMapper.default;
 
-  return (
-    <>
-      <StatusIconAndText icon={<StatusIcon />} title={phase} />
-    </>
-  );
+  return <StatusIconAndText icon={<StatusIcon />} title={phase} />;
 };
 
 export default SnapshotStatusIcon;
diff --git a/src/views/virtualmachines/details/tabs/snapshots/components/list/SnapshotRow.tsx b/src/views/virtualmachines/details/tabs/snapshots/components/list/SnapshotRow.tsx
@@ -22,6 +22,7 @@ const SnapshotRow: React.FC<
 > = ({ activeColumnIDs, obj: snapshot, rowData: { isVMRunning, restores } }) => {
   const relevantRestore: V1alpha1VirtualMachineRestore = restores?.[snapshot?.metadata?.name];
   const isRestoreDisabled = isVMRunning || snapshot?.status?.phase !== snapshotStatuses.Succeeded;
+  const readyCondition = snapshot?.status?.conditions?.find(({ type }) => type === 'Ready');
   return (
     <>
       <TableData activeColumnIDs={activeColumnIDs} id="name">
@@ -35,7 +36,7 @@ const SnapshotRow: React.FC<
         <Timestamp timestamp={snapshot?.metadata?.creationTimestamp} />
       </TableData>
       <TableData activeColumnIDs={activeColumnIDs} id="status">
-        <SnapshotStatusIcon phase={snapshot?.status?.phase} />
+        <SnapshotStatusIcon phase={readyCondition?.reason || readyCondition?.status} />
       </TableData>
       <TableData activeColumnIDs={activeColumnIDs} id="last-restored">
         <Timestamp timestamp={relevantRestore?.status?.restoreTime} />

diff --git a/src/views/virtualmachines/details/tabs/snapshots/utils/consts.ts b/src/views/virtualmachines/details/tabs/snapshots/utils/consts.ts
@@ -11,8 +11,11 @@ export const snapshotStatuses = {
 };
 
 export const iconMapper = {
+  default: GreenCheckCircleIcon,
+  Error: RedExclamationCircleIcon,
   Failed: RedExclamationCircleIcon,
   InProgress: YellowExclamationTriangleIcon,
+  'Not ready': YellowExclamationTriangleIcon,
   Succeeded: GreenCheckCircleIcon,
 };