CNV-89816: Cancel all pending uploads when VM creation is canceled or VM is deleted

Author: galkremer1

locales/en/plugin__kubevirt-plugin.json

@@ -33,6 +33,8 @@
   "{{count}} Node Field_other": "{{count}} Node Fields",
   "{{count}} successful checks_one": "{{count}} successful check",
   "{{count}} successful checks_other": "{{count}} successful checks",
+  "{{count}} uploads were aborted_one": "{{count}} uploads were aborted",
+  "{{count}} uploads were aborted_other": "{{count}} uploads were aborteds",
   "{{count}} VirtualMachine_one": "{{count}} VirtualMachine",
   "{{count}} VirtualMachine_other": "{{count}} VirtualMachines",
   "{{count}} Volumes_one": "{{count}} Volume",
@@ -2210,6 +2212,7 @@
   "Upload of {{fileName}} aborted": "Upload of {{fileName}} aborted",
   "Upload of {{fileName}} completed": "Upload of {{fileName}} completed",
   "Upload of {{fileName}} failed": "Upload of {{fileName}} failed",
+  "Upload of {{fileName}} was aborted": "Upload of {{fileName}} was aborted",
   "Upload progress for {{fileName}}": "Upload progress for {{fileName}}",
   "Upload PVC image": "Upload PVC image",
   "Upload to registry": "Upload to registry",

locales/es/plugin__kubevirt-plugin.json

@@ -41,6 +41,9 @@
   "{{count}} successful checks_one": "{{count}} comprobaciones exitosas_one",
   "{{count}} successful checks_many": "{{count}} successful checks",
   "{{count}} successful checks_other": "{{count}} comprobaciones exitosas_other",
+  "{{count}} uploads were aborted_one": "{{count}} uploads were aborted",
+  "{{count}} uploads were aborted_many": "{{count}} uploads were aborted",
+  "{{count}} uploads were aborted_other": "{{count}} uploads were aborted",
   "{{count}} VirtualMachine_one": "{{count}} VirtualMachine_one",
   "{{count}} VirtualMachine_many": "{{count}} VirtualMachine",
   "{{count}} VirtualMachine_other": "{{count}} VirtualMachine_other",
@@ -2231,6 +2234,7 @@
   "Upload of {{fileName}} aborted": "Upload of {{fileName}} aborted",
   "Upload of {{fileName}} completed": "Upload of {{fileName}} completed",
   "Upload of {{fileName}} failed": "Upload of {{fileName}} failed",
+  "Upload of {{fileName}} was aborted": "Upload of {{fileName}} was aborted",
   "Upload progress for {{fileName}}": "Upload progress for {{fileName}}",
   "Upload PVC image": "Cargar imagen de PVC",
   "Upload to registry": "Cargar al registro",

locales/fr/plugin__kubevirt-plugin.json

@@ -41,6 +41,9 @@
   "{{count}} successful checks_one": "{{count}} vérifications réussies_une",
   "{{count}} successful checks_many": "{{count}} successful checks",
   "{{count}} successful checks_other": "{{count}} vérifications réussies_autres",
+  "{{count}} uploads were aborted_one": "{{count}} uploads were aborted",
+  "{{count}} uploads were aborted_many": "{{count}} uploads were aborted",
+  "{{count}} uploads were aborted_other": "{{count}} uploads were aborted",
   "{{count}} VirtualMachine_one": "{{count}} Machine virtuelle_une",
   "{{count}} VirtualMachine_many": "{{count}} VirtualMachine",
   "{{count}} VirtualMachine_other": "{{count}} Machine virtuelle_autre",
@@ -2231,6 +2234,7 @@
   "Upload of {{fileName}} aborted": "Upload of {{fileName}} aborted",
   "Upload of {{fileName}} completed": "Upload of {{fileName}} completed",
   "Upload of {{fileName}} failed": "Upload of {{fileName}} failed",
+  "Upload of {{fileName}} was aborted": "Upload of {{fileName}} was aborted",
   "Upload progress for {{fileName}}": "Upload progress for {{fileName}}",
   "Upload PVC image": "Télécharger l'image PVC",
   "Upload to registry": "Télécharger dans le registre",

locales/ja/plugin__kubevirt-plugin.json

@@ -33,6 +33,7 @@
   "{{count}} Node Field_other": "{{count}} ノードフィールド",
   "{{count}} successful checks_one": "{{count}} 件のチェックが成功しました",
   "{{count}} successful checks_other": "{{count}} 件のチェックが成功しました",
+  "{{count}} uploads were aborted_other": "{{count}} uploads were aborted",
   "{{count}} VirtualMachine_one": "{{count}} VirtualMachine",
   "{{count}} VirtualMachine_other": "{{count}} VirtualMachine",
   "{{count}} Volumes_one": "{{count}} 台のボリューム",
@@ -2209,6 +2210,7 @@
   "Upload of {{fileName}} aborted": "Upload of {{fileName}} aborted",
   "Upload of {{fileName}} completed": "Upload of {{fileName}} completed",
   "Upload of {{fileName}} failed": "Upload of {{fileName}} failed",
+  "Upload of {{fileName}} was aborted": "Upload of {{fileName}} was aborted",
   "Upload progress for {{fileName}}": "Upload progress for {{fileName}}",
   "Upload PVC image": "PVC イメージのアップロード",
   "Upload to registry": "レジストリーへのアップロード",

locales/ko/plugin__kubevirt-plugin.json

@@ -33,6 +33,7 @@
   "{{count}} Node Field_other": "{{count}} 노드 필드",
   "{{count}} successful checks_one": "{{count}} 검사 성공",
   "{{count}} successful checks_other": "{{count}} 검사 성공",
+  "{{count}} uploads were aborted_other": "{{count}} uploads were aborted",
   "{{count}} VirtualMachine_one": "{{count}} VirtualMachine",
   "{{count}} VirtualMachine_other": "{{count}} VirtualMachine",
   "{{count}} Volumes_one": "{{count}} 볼륨",
@@ -2209,6 +2210,7 @@
   "Upload of {{fileName}} aborted": "Upload of {{fileName}} aborted",
   "Upload of {{fileName}} completed": "Upload of {{fileName}} completed",
   "Upload of {{fileName}} failed": "Upload of {{fileName}} failed",
+  "Upload of {{fileName}} was aborted": "Upload of {{fileName}} was aborted",
   "Upload progress for {{fileName}}": "Upload progress for {{fileName}}",
   "Upload PVC image": "PVC 이미지 업로드",
   "Upload to registry": "레지스트리에 업로드",

locales/zh/plugin__kubevirt-plugin.json

@@ -33,6 +33,7 @@
   "{{count}} Node Field_other": "{{count}} 节点字段",
   "{{count}} successful checks_one": "{{count}} 个成功的检查",
   "{{count}} successful checks_other": "{{count}} 个成功的检查",
+  "{{count}} uploads were aborted_other": "{{count}} uploads were aborted",
   "{{count}} VirtualMachine_one": "{{count}} 个虚拟机",
   "{{count}} VirtualMachine_other": "{{count}} 个虚拟机",
   "{{count}} Volumes_one": "{{count}} 个卷_one",
@@ -2209,6 +2210,7 @@
   "Upload of {{fileName}} aborted": "Upload of {{fileName}} aborted",
   "Upload of {{fileName}} completed": "Upload of {{fileName}} completed",
   "Upload of {{fileName}} failed": "Upload of {{fileName}} failed",
+  "Upload of {{fileName}} was aborted": "Upload of {{fileName}} was aborted",
   "Upload progress for {{fileName}}": "Upload progress for {{fileName}}",
   "Upload PVC image": "上传 PVC 镜像",
   "Upload to registry": "上传到 registry",

src/utils/components/DiskModal/UploadDiskModal.tsx

@@ -6,7 +6,10 @@ import { useCDIUpload } from '@kubevirt-utils/hooks/useCDIUpload/useCDIUpload';
 import { useKubevirtTranslation } from '@kubevirt-utils/hooks/useKubevirtTranslation';
 import { cancelTrackedUploadOnModalClose } from '@kubevirt-utils/hooks/useUploadProgressToast/utils/modalUploadCancel';
 import { completeVmDiskUpload } from '@kubevirt-utils/hooks/useUploadProgressToast/utils/uploadCompletion';
-import { getVmDiskUploadKey } from '@kubevirt-utils/hooks/useUploadProgressToast/utils/uploadKeys';
+import {
+  getUploadClusterForVm,
+  getVmDiskUploadKey,
+} from '@kubevirt-utils/hooks/useUploadProgressToast/utils/uploadKeys';
 import { getName, getNamespace } from '@kubevirt-utils/resources/shared';
 import { getCluster } from '@multicluster/helpers/selectors';
 import { isRunning } from '@virtualmachines/utils';
@@ -57,7 +60,7 @@ const UploadDiskModal: FC<V1SubDiskModalProps> = ({
         onClose={() => {
           const diskName = getValues('disk.name');
           const uploadKey = diskName
-            ? getVmDiskUploadKey(getCluster(vm), getNamespace(vm), getName(vm), diskName)
+            ? getVmDiskUploadKey(getUploadClusterForVm(vm), getNamespace(vm), getName(vm), diskName)
             : undefined;
 
           cancelTrackedUploadOnModalClose({ upload, uploadKey });
@@ -66,7 +69,7 @@ const UploadDiskModal: FC<V1SubDiskModalProps> = ({
         onSubmit={() =>
           handleSubmit(async (data) => {
             const uploadKey = getVmDiskUploadKey(
-              getCluster(vm),
+              getUploadClusterForVm(vm),
               getNamespace(vm),
               getName(vm),
               data.disk.name,

src/utils/components/DiskModal/utils/submit.ts

@@ -11,7 +11,7 @@ import {
 import { UploadDataProps } from '@kubevirt-utils/hooks/useCDIUpload/types';
 import { getVmDiskUploadSuccessLinks } from '@kubevirt-utils/hooks/useUploadProgressToast/utils/uploadLinks';
 import { PersistentVolumeClaimModel } from '@kubevirt-utils/models';
-import { getName, getNamespace } from '@kubevirt-utils/resources/shared';
+import { getName, getNamespace, getUID } from '@kubevirt-utils/resources/shared';
 import {
   getBootDisk,
   getDataVolumeTemplates,
@@ -63,15 +63,16 @@ export const uploadDataVolume = async (
       uploadKey && file
         ? {
             abortTooltip,
-            contextLinks: t
-              ? getVmDiskUploadSuccessLinks(
-                  t,
-                  vm,
-                  data.disk?.name,
-                  dataVolume.metadata.name,
-                  isCDROM,
-                )
-              : undefined,
+            contextLinks:
+              t && getUID(vm)
+                ? getVmDiskUploadSuccessLinks(
+                    t,
+                    vm,
+                    data.disk?.name,
+                    dataVolume.metadata.name,
+                    isCDROM,
+                  )
+                : undefined,
             dvCluster: getCluster(vm),
             dvName: dataVolume.metadata.name,
             dvNamespace: getNamespace(dataVolume),

src/utils/hooks/useUploadProgressToast/UploadProgressToastListener.tsx

@@ -1,9 +1,10 @@
-import { FC, useEffect } from 'react';
+import { FC, useEffect, useRef } from 'react';
 import { useNavigate } from 'react-router';
 
 import useKubevirtToast from '@kubevirt-utils/hooks/useKubevirtToast';
 import { useKubevirtTranslation } from '@kubevirt-utils/hooks/useKubevirtTranslation';
 
+import { cleanupRemovedUploads } from './utils/cleanupRemovedUploads';
 import { useUploadProgressStore } from './uploadProgressStore';
 import { syncUploadToasts } from './uploadToastSync';
 
@@ -18,8 +19,17 @@ const UploadProgressToastListener: FC = () => {
   );
   const trySetToastId = useUploadProgressStore((state) => state.trySetToastId);
   const removeUpload = useUploadProgressStore((state) => state.removeUpload);
+  const prevUploadsRef = useRef(useUploadProgressStore.getState().uploads);
 
   useEffect(() => {
+    cleanupRemovedUploads({
+      addWarningToast,
+      currentUploads: uploads,
+      previousUploads: prevUploadsRef.current,
+      removeToast,
+      t,
+    });
+
     syncUploadToasts(uploads, {
       addDangerToast,
       addInfoToast,
@@ -32,6 +42,8 @@ const UploadProgressToastListener: FC = () => {
       tryMarkTerminalToastShown,
       trySetToastId,
     });
+
+    prevUploadsRef.current = uploads;
   }, [
     addDangerToast,
     addInfoToast,

src/utils/hooks/useUploadProgressToast/uploadProgressStore.test.ts

@@ -1,6 +1,11 @@
 import { cancelUploadPVC } from '@kubevirt-utils/hooks/useCDIUpload/utils';
 
 import { UPLOAD_PROGRESS_STATUS } from './utils/constants';
+import {
+  getBootableVolumeUploadKey,
+  getVmCdromUploadKey,
+  getVmDiskUploadKey,
+} from './utils/uploadKeys';
 import { useUploadProgressStore } from './uploadProgressStore';
 
 jest.mock('@kubevirt-utils/hooks/useCDIUpload/utils', () => ({
@@ -18,6 +23,12 @@ const ERROR_CANCEL_FAILED = 'cancel failed';
 const DV_NAME = 'upload-dv';
 const NAMESPACE = 'default';
 const CLUSTER = 'local-cluster';
+const VM_NAME = 'test-vm';
+const VM_DISK_NAME = 'rootdisk';
+const CDROM_NAME = 'cdrom-1';
+const OTHER_VM_NAME = 'other-vm';
+const BOOTABLE_VOLUME_NAMESPACE = 'openshift-virtualization-os-images';
+const BOOTABLE_VOLUME_NAME = 'fedora-40';
 const LINK_LABEL_VIEW_DISK = 'View disk';
 const LINK_URL_DISK = '/disk';
 const LINK_LABEL_EXISTING = 'Existing link';
@@ -249,4 +260,127 @@ describe('useUploadProgressStore', () => {
       expect(cancelUploadPVC).not.toHaveBeenCalled();
     });
   });
+
+  describe('cancelUploadsForVm', () => {
+    it('should cancel all vm-disk and vm-cdrom uploads for the VM', async () => {
+      const diskUploadKey = getVmDiskUploadKey(CLUSTER, NAMESPACE, VM_NAME, VM_DISK_NAME);
+      const cdromUploadKey = getVmCdromUploadKey(CLUSTER, NAMESPACE, VM_NAME, CDROM_NAME);
+      const bootableVolumeUploadKey = getBootableVolumeUploadKey(
+        BOOTABLE_VOLUME_NAMESPACE,
+        BOOTABLE_VOLUME_NAME,
+      );
+      const otherVmUploadKey = getVmDiskUploadKey(CLUSTER, NAMESPACE, OTHER_VM_NAME, VM_DISK_NAME);
+      const diskCancelUpload = jest.fn(async () => undefined);
+      const cdromCancelUpload = jest.fn(async () => undefined);
+      const bootableCancelUpload = jest.fn(async () => undefined);
+      const otherVmCancelUpload = jest.fn(async () => undefined);
+
+      useUploadProgressStore.getState().startUpload(diskUploadKey, {
+        cancelUpload: diskCancelUpload,
+        fileName: FILE_IMAGE_ISO,
+      });
+      useUploadProgressStore.getState().startUpload(cdromUploadKey, {
+        cancelUpload: cdromCancelUpload,
+        fileName: FILE_IMAGE_ISO,
+      });
+      useUploadProgressStore.getState().startUpload(bootableVolumeUploadKey, {
+        cancelUpload: bootableCancelUpload,
+        fileName: FILE_IMAGE_ISO,
+      });
+      useUploadProgressStore.getState().startUpload(otherVmUploadKey, {
+        cancelUpload: otherVmCancelUpload,
+        fileName: FILE_IMAGE_ISO,
+      });
+
+      await useUploadProgressStore.getState().cancelUploadsForVm(CLUSTER, NAMESPACE, VM_NAME);
+
+      expect(diskCancelUpload).toHaveBeenCalledTimes(1);
+      expect(cdromCancelUpload).toHaveBeenCalledTimes(1);
+      expect(bootableCancelUpload).not.toHaveBeenCalled();
+      expect(otherVmCancelUpload).not.toHaveBeenCalled();
+      expect(useUploadProgressStore.getState().getUpload(diskUploadKey)).toBeUndefined();
+      expect(useUploadProgressStore.getState().getUpload(cdromUploadKey)).toBeUndefined();
+      expect(useUploadProgressStore.getState().getUpload(bootableVolumeUploadKey)?.status).toBe(
+        UPLOAD_PROGRESS_STATUS.UPLOADING,
+      );
+      expect(useUploadProgressStore.getState().getUpload(otherVmUploadKey)?.status).toBe(
+        UPLOAD_PROGRESS_STATUS.UPLOADING,
+      );
+    });
+
+    it('should no-op when no uploads match the VM', async () => {
+      await useUploadProgressStore.getState().cancelUploadsForVm(CLUSTER, NAMESPACE, VM_NAME);
+
+      expect(cancelUploadPVC).not.toHaveBeenCalled();
+    });
+
+    it('should not cancel completed uploads for the VM', async () => {
+      const diskUploadKey = getVmDiskUploadKey(CLUSTER, NAMESPACE, VM_NAME, VM_DISK_NAME);
+      const diskCancelUpload = jest.fn(async () => undefined);
+
+      useUploadProgressStore.getState().startUpload(diskUploadKey, {
+        cancelUpload: diskCancelUpload,
+        fileName: FILE_IMAGE_ISO,
+      });
+      useUploadProgressStore.getState().completeUpload(diskUploadKey);
+
+      await useUploadProgressStore.getState().cancelUploadsForVm(CLUSTER, NAMESPACE, VM_NAME);
+
+      expect(diskCancelUpload).not.toHaveBeenCalled();
+      expect(useUploadProgressStore.getState().getUpload(diskUploadKey)?.status).toBe(
+        UPLOAD_PROGRESS_STATUS.SUCCESS,
+      );
+    });
+
+    it('should cancel empty-cluster uploads when deleting an ACM fleet VM', async () => {
+      const emptyClusterUploadKey = getVmDiskUploadKey('', NAMESPACE, VM_NAME, VM_DISK_NAME);
+      const cancelUpload = jest.fn(async () => undefined);
+
+      useUploadProgressStore.getState().startUpload(emptyClusterUploadKey, {
+        cancelUpload,
+        fileName: FILE_IMAGE_ISO,
+      });
+
+      await useUploadProgressStore.getState().cancelUploadsForVm(CLUSTER, NAMESPACE, VM_NAME);
+
+      expect(cancelUpload).toHaveBeenCalledTimes(1);
+      expect(useUploadProgressStore.getState().getUpload(emptyClusterUploadKey)).toBeUndefined();
+    });
+  });
+
+  describe('cancelAllPendingUploads', () => {
+    it('should cancel and remove all in-progress uploads', async () => {
+      const diskUploadKey = getVmDiskUploadKey(CLUSTER, NAMESPACE, VM_NAME, VM_DISK_NAME);
+      const bootableVolumeUploadKey = getBootableVolumeUploadKey(
+        BOOTABLE_VOLUME_NAMESPACE,
+        BOOTABLE_VOLUME_NAME,
+      );
+      const completedUploadKey = 'completed-upload-key';
+      const diskCancelUpload = jest.fn(async () => undefined);
+      const bootableCancelUpload = jest.fn(async () => undefined);
+
+      useUploadProgressStore.getState().startUpload(diskUploadKey, {
+        cancelUpload: diskCancelUpload,
+        fileName: FILE_IMAGE_ISO,
+      });
+      useUploadProgressStore.getState().startUpload(bootableVolumeUploadKey, {
+        cancelUpload: bootableCancelUpload,
+        fileName: FILE_IMAGE_ISO,
+      });
+      useUploadProgressStore.getState().startUpload(completedUploadKey, {
+        fileName: FILE_IMAGE_ISO,
+      });
+      useUploadProgressStore.getState().completeUpload(completedUploadKey);
+
+      await useUploadProgressStore.getState().cancelAllPendingUploads();
+
+      expect(diskCancelUpload).toHaveBeenCalledTimes(1);
+      expect(bootableCancelUpload).toHaveBeenCalledTimes(1);
+      expect(useUploadProgressStore.getState().getUpload(diskUploadKey)).toBeUndefined();
+      expect(useUploadProgressStore.getState().getUpload(bootableVolumeUploadKey)).toBeUndefined();
+      expect(useUploadProgressStore.getState().getUpload(completedUploadKey)?.status).toBe(
+        UPLOAD_PROGRESS_STATUS.SUCCESS,
+      );
+    });
+  });
 });