From 754acdd7f7d6e75344e8802aa89b73d47898f469 Mon Sep 17 00:00:00 2001 From: Jones Ogolo <47540149+Jay-Topher@users.noreply.github.com> Date: Tue, 26 Mar 2024 14:51:33 +0100 Subject: [PATCH] fix: enable deletion of images queued for download (#5376) --- src/app/images/components/ImagesTable/ImagesTable.test.tsx | 1 + src/app/images/components/ImagesTable/ImagesTable.tsx | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/images/components/ImagesTable/ImagesTable.test.tsx b/src/app/images/components/ImagesTable/ImagesTable.test.tsx index 7da03e16cb..9c7a2b30e5 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 5daa8d34c6..f07c9122ec 100644 --- a/src/app/images/components/ImagesTable/ImagesTable.tsx +++ b/src/app/images/components/ImagesTable/ImagesTable.tsx @@ -149,7 +149,8 @@ const generateResourceRow = ({ const { os, release } = splitResourceName(resource.name); const isCommissioningImage = os === "ubuntu" && release === commissioningRelease; - const canBeDeleted = !isCommissioningImage && resource.complete; + const canBeDeleted = + !isCommissioningImage && (resource.complete || !resource.downloading); let statusIcon = ; let statusText = resource.status;