From 505282a3d8c7459f8e212a876b59314df1678455 Mon Sep 17 00:00:00 2001
From: MiriSafra <M0533175827@gmail.com>
Date: Thu, 19 Sep 2024 10:30:31 +0300
Subject: [PATCH] Fix: Cancel button disabled until active analysis selected

Signed-off-by: MiriSafra <M0533175827@gmail.com>
---
 .../applications-table/applications-table.tsx         | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/client/src/app/pages/applications/applications-table/applications-table.tsx b/client/src/app/pages/applications/applications-table/applications-table.tsx
index 747b91b22..6d2bc93a0 100644
--- a/client/src/app/pages/applications/applications-table/applications-table.tsx
+++ b/client/src/app/pages/applications/applications-table/applications-table.tsx
@@ -574,15 +574,14 @@ export const ApplicationsTable: React.FC = () => {
         >
           {t("actions.delete")}
         </DropdownItem>,
-        ...(tasksReadAccess &&
-        tasksWriteAccess &&
-        selectedRows.some((application: DecoratedApplication) =>
-          isTaskCancellable(application)
-        )
+        ...(tasksReadAccess && tasksWriteAccess
           ? [
               <DropdownItem
                 key="applications-bulk-cancel"
-                isDisabled={selectedRows.length < 1}
+                isDisabled={selectedRows.some(
+                  (application: DecoratedApplication) =>
+                    isTaskCancellable(application)
+                )}
                 onClick={() => {
                   handleCancelBulkAnalysis();
                 }}