fix: enable deletion of images queued for download

canonical · Mar 26, 2024 · 84f1fc4 · 84f1fc4
1 parent bb3080b
commit 84f1fc4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/app/images/components/ImagesTable/ImagesTable.test.tsx b/src/app/images/components/ImagesTable/ImagesTable.test.tsx
@@ -274,6 +274,7 @@ it("disables delete action for images being downloaded", async () => {
       title: "18.04 LTS",
       complete: false,
       status: "Downloading 50%",
+      downloading: true,
     }),
   ];
   const image = {

diff --git a/src/app/images/components/ImagesTable/ImagesTable.tsx b/src/app/images/components/ImagesTable/ImagesTable.tsx
@@ -149,7 +149,9 @@ const generateResourceRow = ({
   const { os, release } = splitResourceName(resource.name);
   const isCommissioningImage =
     os === "ubuntu" && release === commissioningRelease;
-  const canBeDeleted = !isCommissioningImage && resource.complete;
+  const canBeDeleted =
+    (!isCommissioningImage && resource.complete) ||
+    (!isCommissioningImage && !resource.downloading);
   let statusIcon = <Spinner />;
   let statusText = resource.status;