From abbf93b37bf9ffcb8b5d58b2d8a677b916dfe351 Mon Sep 17 00:00:00 2001
From: Jones <jay.topher11@gmail.com>
Date: Tue, 26 Mar 2024 11:52:08 +0100
Subject: [PATCH] fix: enable deletion of images queued for download

---
 .../ImagesTable/ImagesTable.test.tsx          |  1 +
 .../components/ImagesTable/ImagesTable.tsx    | 42 ++++++++++++++++++-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/app/images/components/ImagesTable/ImagesTable.test.tsx b/src/app/images/components/ImagesTable/ImagesTable.test.tsx
index 7da03e16cbf..9c7a2b30e5f 100644
--- 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
index 5daa8d34c67..1da6187d3ac 100644
--- 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;
 
@@ -322,3 +324,41 @@ const ImagesTable = ({
 };
 
 export default ImagesTable;
+
+// queued
+// {
+//   "id": 25,
+//   "rtype": 0,
+//   "name": "ubuntu/impish",
+//   "title": "21.10",
+//   "arch": "amd64",
+//   "size": "593.8 MB",
+//   "complete": false,
+//   "status": "Queued for download",
+//   "icon": "queued",
+//   "downloading": false,
+//   "canDeployToMemory": true,
+//   "numberOfNodes": 0,
+//   "machineCount": 0,
+//   "lastUpdate": "Tue, 26 Mar. 2024 08:54:41",
+//   "lastDeployed": null
+// }
+
+// downloading
+// {
+//   "id": 25,
+//   "rtype": 0,
+//   "name": "ubuntu/impish",
+//   "title": "21.10",
+//   "arch": "amd64",
+//   "size": "593.8 MB",
+//   "complete": false,
+//   "status": "Downloading  29%",
+//   "icon": "in-progress",
+//   "downloading": true,
+//   "canDeployToMemory": true,
+//   "numberOfNodes": 0,
+//   "machineCount": 0,
+//   "lastUpdate": "Tue, 26 Mar. 2024 08:54:41",
+//   "lastDeployed": null
+// }