Merge pull request #3224 from galkremer1/CNV-61658-self-validation-part-1

CNV-61658: Self validation checkup feature - part 1

Author: openshift-merge-bot[bot]

locales/en/plugin__kubevirt-plugin.json

@@ -504,6 +504,7 @@
   "Delete VirtualMachineInstancetype?": "Delete VirtualMachineInstancetype?",
   "Delete VirtualMachinePreference?": "Delete VirtualMachinePreference?",
   "Delete VirtualMachineSnapshot?": "Delete VirtualMachineSnapshot?",
+  "Deleting": "Deleting",
   "Deleting a network interface is supported only on VirtualMachines that were created in versions greater than 4.13.": "Deleting a network interface is supported only on VirtualMachines that were created in versions greater than 4.13.",
   "Deletion protection": "Deletion protection",
   "Deprecated": "Deprecated",

locales/es/plugin__kubevirt-plugin.json

@@ -509,6 +509,7 @@
   "Delete VirtualMachineInstancetype?": "¿Desea eliminar VirtualMachineInstancetype?",
   "Delete VirtualMachinePreference?": "¿Desea eliminar VirtualMachinePreference?",
   "Delete VirtualMachineSnapshot?": "¿Desea eliminar VirtualMachineSnapshot?",
+  "Deleting": "Deleting",
   "Deleting a network interface is supported only on VirtualMachines that were created in versions greater than 4.13.": "La eliminación de una interfaz de red solo se admite en VirtualMachines creadas en versiones posteriores a la versión 4.13.",
   "Deletion protection": "Protección contra eliminación",
   "Deprecated": "Obsoleto",

locales/fr/plugin__kubevirt-plugin.json

@@ -509,6 +509,7 @@
   "Delete VirtualMachineInstancetype?": "Supprimer VirtualMachineInstancetype\u00a0?",
   "Delete VirtualMachinePreference?": "Supprimer VirtualMachinePreference\u00a0?",
   "Delete VirtualMachineSnapshot?": "Supprimer VirtualMachineSnapshot\u00a0?",
+  "Deleting": "Deleting",
   "Deleting a network interface is supported only on VirtualMachines that were created in versions greater than 4.13.": "La suppression d'une interface réseau est prise en charge uniquement sur les machines virtuelles créées dans des versions supérieures à 4.13.",
   "Deletion protection": "Protection contre la suppression",
   "Deprecated": "Obsolète",

locales/ja/plugin__kubevirt-plugin.json

@@ -504,6 +504,7 @@
   "Delete VirtualMachineInstancetype?": "VirtualMachineInstancetype を削除しますか?",
   "Delete VirtualMachinePreference?": "VirtualMachinePreference を削除しますか?",
   "Delete VirtualMachineSnapshot?": "VirtualMachineSnapshot を削除しますか?",
+  "Deleting": "Deleting",
   "Deleting a network interface is supported only on VirtualMachines that were created in versions greater than 4.13.": "ネットワークインターフェイスの削除は、バージョン 4.13 以降で作成された VirtualMachine でのみサポートされています。",
   "Deletion protection": "削除保護",
   "Deprecated": "非推奨機能",

locales/ko/plugin__kubevirt-plugin.json

@@ -504,6 +504,7 @@
   "Delete VirtualMachineInstancetype?": "VirtualMachineInstancetype을 삭제하시겠습니까?",
   "Delete VirtualMachinePreference?": "VirtualMachinePreference를 삭제하시겠습니까?",
   "Delete VirtualMachineSnapshot?": "VirtualMachineSnapshot을 삭제하시겠습니까?",
+  "Deleting": "Deleting",
   "Deleting a network interface is supported only on VirtualMachines that were created in versions greater than 4.13.": "네트워크 인터페이스 삭제는 4.13 이상 버전에서 생성된 VirtualMachines에서만 지원됩니다.",
   "Deletion protection": "삭제 보호",
   "Deprecated": "더 이상 사용되지 않음",

locales/zh/plugin__kubevirt-plugin.json

@@ -504,6 +504,7 @@
   "Delete VirtualMachineInstancetype?": "删除 VirtualMachineInstancetype?",
   "Delete VirtualMachinePreference?": "删除 VirtualMachinePreference?",
   "Delete VirtualMachineSnapshot?": "删除 VirtualMachineSnapshot?",
+  "Deleting": "Deleting",
   "Deleting a network interface is supported only on VirtualMachines that were created in versions greater than 4.13.": "只有在版本高于 4.13 中创建的 VirtualMachines 上才支持删除网络接口。",
   "Deletion protection": "删除保护",
   "Deprecated": "已弃用",

src/views/checkups/CheckupsDetailsPageHistoryRow.tsx

@@ -1,20 +1,23 @@
-import React, { FC } from 'react';
+import React, { FC, ReactNode } from 'react';
 
 import { JobModel, modelToGroupVersionKind } from '@kubevirt-ui/kubevirt-api/console';
 import { IoK8sApiBatchV1Job } from '@kubevirt-ui/kubevirt-api/kubernetes';
-import { NO_DATA_DASH } from '@kubevirt-utils/resources/vm/utils/constants';
 import {
   ResourceLink,
   RowProps,
   TableData,
   Timestamp,
 } from '@openshift-console/dynamic-plugin-sdk';
 
-import CheckupsNetworkStatusIcon from './CheckupsNetworkStatusIcon';
+import CheckupsStatusIcon from './CheckupsStatusIcon';
 
-const CheckupsNetworkDetailsPageHistoryRow: FC<
-  RowProps<IoK8sApiBatchV1Job, { job: IoK8sApiBatchV1Job }>
-> = ({ activeColumnIDs, obj: job }) => {
+export type CheckupsDetailsPageHistoryRowData = {
+  customActions?: (job: IoK8sApiBatchV1Job) => ReactNode;
+};
+
+const CheckupsDetailsPageHistoryRow: FC<
+  RowProps<IoK8sApiBatchV1Job, CheckupsDetailsPageHistoryRowData>
+> = ({ activeColumnIDs, obj: job, rowData }) => {
   return (
     <>
       <TableData activeColumnIDs={activeColumnIDs} id="job">
@@ -25,13 +28,19 @@ const CheckupsNetworkDetailsPageHistoryRow: FC<
         />
       </TableData>
       <TableData activeColumnIDs={activeColumnIDs} id="status">
-        <CheckupsNetworkStatusIcon job={job} onlyJob={true} />
+        <CheckupsStatusIcon job={job} onlyJob={true} />
+      </TableData>
+      <TableData activeColumnIDs={activeColumnIDs} id="start-time">
+        <Timestamp timestamp={job?.status?.startTime} />
       </TableData>
       <TableData activeColumnIDs={activeColumnIDs} id="complete-time">
-        <Timestamp timestamp={job?.status?.completionTime || NO_DATA_DASH} />
+        <Timestamp timestamp={job?.status?.completionTime} />
+      </TableData>
+      <TableData activeColumnIDs={activeColumnIDs} className="pf-v6-c-table__action" id="">
+        {rowData?.customActions?.(job) || null}
       </TableData>
     </>
   );
 };
 
-export default CheckupsNetworkDetailsPageHistoryRow;
+export default CheckupsDetailsPageHistoryRow;

src/views/checkups/CheckupsNetworkStatusIcon.tsx renamed to src/views/checkups/CheckupsStatusIcon.tsx

@@ -3,46 +3,50 @@ import React, { FC } from 'react';
 import { IoK8sApiBatchV1Job, IoK8sApiCoreV1ConfigMap } from '@kubevirt-ui/kubevirt-api/kubernetes';
 import { useKubevirtTranslation } from '@kubevirt-utils/hooks/useKubevirtTranslation';
 import { NO_DATA_DASH } from '@kubevirt-utils/resources/vm/utils/constants';
-import { Icon as PFIcon } from '@patternfly/react-core';
+import { Icon as PFIcon, Spinner } from '@patternfly/react-core';
 import { CheckCircleIcon, ExclamationCircleIcon, SyncAltIcon } from '@patternfly/react-icons';
 
-import { getConfigMapStatus, getJobStatus, NetworkCheckupsStatus } from './utils/utils';
+import { CheckupsStatus, getConfigMapStatus, getJobStatus } from './utils/utils';
 
 import './checkups.scss';
 
-type CheckupsNetworkStatusIconProps = {
+type CheckupsStatusIconProps = {
   configMap?: IoK8sApiCoreV1ConfigMap;
-  job: IoK8sApiBatchV1Job;
+  job?: IoK8sApiBatchV1Job;
   onlyJob?: boolean;
 };
 
-const CheckupsNetworkStatusIcon: FC<CheckupsNetworkStatusIconProps> = ({
-  configMap,
-  job,
-  onlyJob = false,
-}) => {
+const CheckupsStatusIcon: FC<CheckupsStatusIconProps> = ({ configMap, job, onlyJob = false }) => {
   const { t } = useKubevirtTranslation();
-  const statusJob = getJobStatus(job);
-  const statusConfigMap = getConfigMapStatus(configMap, statusJob);
+  const jobStatus = getJobStatus(job);
+  const configMapStatus = getConfigMapStatus(configMap, jobStatus);
 
   const Icon = {
-    [NetworkCheckupsStatus.Done]: (
+    [CheckupsStatus.Deleting]: (
+      <>
+        <PFIcon>
+          <Spinner size="sm" />
+        </PFIcon>
+        {t('Deleting')}
+      </>
+    ),
+    [CheckupsStatus.Done]: (
       <>
         <PFIcon status="success">
           <CheckCircleIcon />
         </PFIcon>
         {t('Succeeded')}
       </>
     ),
-    [NetworkCheckupsStatus.Failed]: (
+    [CheckupsStatus.Failed]: (
       <>
         <PFIcon status="danger">
           <ExclamationCircleIcon />
         </PFIcon>
         {t('Failed')}
       </>
     ),
-    [NetworkCheckupsStatus.Running]: (
+    [CheckupsStatus.Running]: (
       <>
         <PFIcon>
           <SyncAltIcon />
@@ -55,10 +59,8 @@ const CheckupsNetworkStatusIcon: FC<CheckupsNetworkStatusIconProps> = ({
   if (!configMap && !job) return <>{NO_DATA_DASH}</>;
 
   return (
-    <div className="CheckupsNetworkStatusIcon--main">
-      {Icon[onlyJob ? statusJob : statusConfigMap]}
-    </div>
+    <span className="CheckupsStatusIcon--main">{Icon[onlyJob ? jobStatus : configMapStatus]}</span>
   );
 };
 
-export default CheckupsNetworkStatusIcon;
+export default CheckupsStatusIcon;

src/views/checkups/checkups.scss

@@ -13,10 +13,18 @@
   }
 }
 
-.CheckupsNetworkStatusIcon {
+.CheckupsStatusIcon {
   &--main {
+    display: inline-flex;
+    align-items: center;
+
     .pf-v6-c-icon {
       margin-right: var(--pf-t--global--spacer--xs);
     }
   }
 }
+// Make tab content scrollable when there are many checkups
+.pf-v6-c-tab-content {
+  max-height: calc(100vh - 200px);
+  overflow-y: auto;
+}

src/views/checkups/network/details/tabs/details/CheckupsNetworkDetailsPageSection.tsx

@@ -14,9 +14,9 @@ import { NO_DATA_DASH } from '@kubevirt-utils/resources/vm/utils/constants';
 import { ResourceLink } from '@openshift-console/dynamic-plugin-sdk';
 import { DescriptionList, Grid, GridItem, PageSection, Title } from '@patternfly/react-core';
 
-import CheckupsNetworkStatusIcon from '../../../../CheckupsNetworkStatusIcon';
+import CheckupsStatusIcon from '../../../../CheckupsStatusIcon';
 import {
-  STATUS_COMPILATION_TIME_STAMP,
+  STATUS_COMPLETION_TIME_STAMP,
   STATUS_FAILURE_REASON,
   STATUS_START_TIME_STAMP,
 } from '../../../../utils/utils';
@@ -62,7 +62,7 @@ const CheckupsNetworkDetailsPageSection: FC<CheckupsNetworkDetailsPageSectionPro
               descriptionHeader={t('Name')}
             />
             <DescriptionItem
-              descriptionData={<CheckupsNetworkStatusIcon configMap={configMap} job={job} />}
+              descriptionData={<CheckupsStatusIcon configMap={configMap} job={job} />}
               descriptionHeader={t('Status')}
             />
             <DescriptionItem
@@ -99,7 +99,7 @@ const CheckupsNetworkDetailsPageSection: FC<CheckupsNetworkDetailsPageSectionPro
               descriptionHeader={t('Start time')}
             />
             <DescriptionItem
-              descriptionData={configMap?.data?.[STATUS_COMPILATION_TIME_STAMP] || NO_DATA_DASH}
+              descriptionData={configMap?.data?.[STATUS_COMPLETION_TIME_STAMP] || NO_DATA_DASH}
               descriptionHeader={t('Complete time')}
             />
           </DescriptionList>