Handle errors from top action menu commands (#1432)

Comfy-Org · Nov 5, 2024 · 16f2e56 · 16f2e56
1 parent 75ffab2
commit 16f2e56
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/browser_tests/menu.spec.ts b/browser_tests/menu.spec.ts
@@ -494,6 +494,31 @@ test.describe('Menu', () => {
       })
       expect(await exportTag.count()).toBe(1)
     })
+
+    test('Can catch error when executing command', async ({ comfyPage }) => {
+      await comfyPage.page.evaluate(() => {
+        window['app'].registerExtension({
+          name: 'TestExtension1',
+          commands: [
+            {
+              id: 'foo',
+              label: 'foo-command',
+              function: () => {
+                throw new Error('foo!')
+              }
+            }
+          ],
+          menuCommands: [
+            {
+              path: ['ext'],
+              commands: ['foo']
+            }
+          ]
+        })
+      })
+      await comfyPage.menu.topbar.triggerTopbarCommand(['ext', 'foo-command'])
+      expect(await comfyPage.getVisibleToastCount()).toBe(1)
+    })
   })
 
   // Only test 'Top' to reduce test time.

diff --git a/src/stores/menuItemStore.ts b/src/stores/menuItemStore.ts
@@ -49,7 +49,7 @@ export const useMenuItemStore = defineStore('menuItem', () => {
       .map(
         (command) =>
           ({
-            command: command.function,
+            command: () => commandStore.execute(command.id),
             label: command.menubarLabel,
             icon: command.icon,
             tooltip: command.tooltip,