From 8bdb8d64e2886d3be7705506354bb481e300245c Mon Sep 17 00:00:00 2001
From: 01zulfi <85733202+01zulfi@users.noreply.github.com>
Date: Mon, 3 Mar 2025 11:05:42 +0500
Subject: [PATCH] web: improve getCommandById && improve remove from recents
 logic Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>

---
 .../src/dialogs/command-palette/command-palette-dialog.tsx | 4 +++-
 apps/web/src/dialogs/command-palette/commands.ts           | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/web/src/dialogs/command-palette/command-palette-dialog.tsx b/apps/web/src/dialogs/command-palette/command-palette-dialog.tsx
index f268fe923f..26bd67f33a 100644
--- a/apps/web/src/dialogs/command-palette/command-palette-dialog.tsx
+++ b/apps/web/src/dialogs/command-palette/command-palette-dialog.tsx
@@ -69,6 +69,7 @@ export const CommandPaletteDialog = DialogManager.register(
 
     const commands = usePromise(async () => {
       select(0);
+      if (!defaultCommands.current)
       defaultCommands.current = await getDefaultCommands();
       const commands = props.isCommandMode
         ? sortCommands(commandSearch(query, defaultCommands.current))
@@ -280,9 +281,10 @@ export const CommandPaletteDialog = DialogManager.register(
                   {command.group === "recent" && (
                     <Button
                       title={strings.removeFromRecents()}
-                      onClick={(e) => {
+                      onClick={async (e) => {
                         e.stopPropagation();
                         removeRecentCommand(command.id);
+                        defaultCommands.current = await getDefaultCommands();
                         commands.refresh();
                       }}
                       variant="secondary"
diff --git a/apps/web/src/dialogs/command-palette/commands.ts b/apps/web/src/dialogs/command-palette/commands.ts
index b5a5bf5f7d..7263654a5d 100644
--- a/apps/web/src/dialogs/command-palette/commands.ts
+++ b/apps/web/src/dialogs/command-palette/commands.ts
@@ -234,9 +234,10 @@ export async function getDefaultCommands(): Promise<Command[]> {
 }
 
 export function getCommandById(id: string): Command | undefined {
-  return staticCommands
-    .concat(getEditorCommands())
-    .find((command) => command.id === id);
+  return (
+    staticCommands.find((command) => command.id === id) ||
+    getEditorCommands().find((command) => command.id === id)
+  );
 }
 
 export async function resolveRecentCommand(