From 3bd43a732d71f16ff5f7e0c0d896163896189f64 Mon Sep 17 00:00:00 2001
From: sharma01ketan <sharma01ketan@gmail.com>
Date: Thu, 12 Sep 2024 21:00:15 +0530
Subject: [PATCH 1/3] fix logic check boolean then call function

---
 web/core/components/command-palette/command-palette.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/core/components/command-palette/command-palette.tsx b/web/core/components/command-palette/command-palette.tsx
index 29020219387..93e28f8f386 100644
--- a/web/core/components/command-palette/command-palette.tsx
+++ b/web/core/components/command-palette/command-palette.tsx
@@ -257,7 +257,8 @@ export const CommandPalette: FC = observer(() => {
       }
 
       if (deleteKey) {
-        if (performProjectBulkDeleteActions()) {
+        if(canPerformProjectAdminActions){
+          performProjectBulkDeleteActions()
           shortcutsList.project.delete.action();
         }
       } else if (cmdClicked) {

From dbf013eb00b13a34a7b6b823314cbb4019d082d2 Mon Sep 17 00:00:00 2001
From: sharma01ketan <sharma01ketan@gmail.com>
Date: Thu, 12 Sep 2024 21:06:03 +0530
Subject: [PATCH 2/3] minor code improvement

---
 web/core/components/command-palette/command-palette.tsx | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/web/core/components/command-palette/command-palette.tsx b/web/core/components/command-palette/command-palette.tsx
index 93e28f8f386..1990703bcb5 100644
--- a/web/core/components/command-palette/command-palette.tsx
+++ b/web/core/components/command-palette/command-palette.tsx
@@ -256,11 +256,9 @@ export const CommandPalette: FC = observer(() => {
         toggleShortcutModal(true);
       }
 
-      if (deleteKey) {
-        if(canPerformProjectAdminActions){
-          performProjectBulkDeleteActions()
-          shortcutsList.project.delete.action();
-        }
+      if (deleteKey && canPerformProjectAdminActions) {
+        performProjectBulkDeleteActions()
+        shortcutsList.project.delete.action();
       } else if (cmdClicked) {
         if (keyPressed === "c" && ((platform === "MacOS" && ctrlKey) || altKey)) {
           e.preventDefault();

From c6bd1eb320f393c8b997f31e28db56c12db2e946 Mon Sep 17 00:00:00 2001
From: sharma01ketan <sharma01ketan@gmail.com>
Date: Fri, 13 Sep 2024 17:45:14 +0530
Subject: [PATCH 3/3] fixed logic error

---
 .../components/command-palette/command-palette.tsx    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/web/core/components/command-palette/command-palette.tsx b/web/core/components/command-palette/command-palette.tsx
index 1990703bcb5..c38266c400c 100644
--- a/web/core/components/command-palette/command-palette.tsx
+++ b/web/core/components/command-palette/command-palette.tsx
@@ -129,7 +129,7 @@ export const CommandPalette: FC = observer(() => {
 
   const performProjectBulkDeleteActions = useCallback(
     (showToast: boolean = true) => {
-      if (!canPerformProjectAdminActions && showToast)
+      if (!canPerformProjectAdminActions && projectId && showToast)
         setToast({
           type: TOAST_TYPE.ERROR,
           title: "You don't have permission to perform this action.",
@@ -137,7 +137,7 @@ export const CommandPalette: FC = observer(() => {
 
       return canPerformProjectAdminActions;
     },
-    [canPerformProjectAdminActions]
+    [canPerformProjectAdminActions, projectId]
   );
 
   const performWorkspaceCreateActions = useCallback(
@@ -256,9 +256,10 @@ export const CommandPalette: FC = observer(() => {
         toggleShortcutModal(true);
       }
 
-      if (deleteKey && canPerformProjectAdminActions) {
-        performProjectBulkDeleteActions()
-        shortcutsList.project.delete.action();
+      if (deleteKey) {
+        if (performProjectBulkDeleteActions()) {
+          shortcutsList.project.delete.action();
+        }
       } else if (cmdClicked) {
         if (keyPressed === "c" && ((platform === "MacOS" && ctrlKey) || altKey)) {
           e.preventDefault();