From b3de6f43d5c38ad2ecf43418c945f9f8e41d08b8 Mon Sep 17 00:00:00 2001
From: "Francois (fge)" <fge@odoo.com>
Date: Fri, 23 Jul 2021 09:49:31 +0000
Subject: [PATCH] [FIX] web: display commands in the palette command

This commit avoids displaying commands associated with the wrong active
element in the palette command.

closes odoo/odoo#74149

Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
---
 .../src/webclient/commands/command_service.js |  4 ++-
 .../commands/command_service_tests.js         | 33 ++++++++++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/webclient/commands/command_service.js b/addons/web/static/src/webclient/commands/command_service.js
index f490182bd01..1c515f29539 100644
--- a/addons/web/static/src/webclient/commands/command_service.js
+++ b/addons/web/static/src/webclient/commands/command_service.js
@@ -39,7 +39,9 @@ export const commandService = {
             }
 
             const overlayModifier = registry.category("services").get("hotkey").overlayModifier;
-            const commands = [...registeredCommands.values()];
+            const commands = [...registeredCommands.values()].filter(
+                (command) => command.activeElement === ui.activeElement
+            );
 
             // Also retrieve all hotkeyables elements
             for (const el of ui.getVisibleElements("[data-hotkey]:not(:disabled)")) {
diff --git a/addons/web/static/tests/webclient/commands/command_service_tests.js b/addons/web/static/tests/webclient/commands/command_service_tests.js
index 2438272afba..86ef144c451 100644
--- a/addons/web/static/tests/webclient/commands/command_service_tests.js
+++ b/addons/web/static/tests/webclient/commands/command_service_tests.js
@@ -3,7 +3,7 @@
 import { browser } from "@web/core/browser/browser";
 import { dialogService } from "@web/core/dialog/dialog_service";
 import { registry } from "@web/core/registry";
-import { uiService } from "@web/core/ui/ui_service";
+import { uiService, useActiveElement } from "@web/core/ui/ui_service";
 import { useCommand } from "@web/webclient/commands/command_hook";
 import { commandService } from "@web/webclient/commands/command_service";
 import { hotkeyService } from "@web/core/hotkeys/hotkey_service";
@@ -113,6 +113,32 @@ QUnit.test("useCommand hook", async (assert) => {
     assert.containsNone(target, ".o_command");
 });
 
+QUnit.test("useCommand hook when the activeElement change", async (assert) => {
+    assert.expect(2);
+
+    class MyComponent extends TestComponent {
+        setup() {
+            useCommand("Take the throne", () => {});
+        }
+    }
+
+    class OtherComponent extends Component {
+        setup() {
+            useActiveElement();
+            useCommand("I'm taking the throne", () => {});
+        }
+    }
+    OtherComponent.template = xml`<div></div>`;
+
+    await mount(MyComponent, { env, target });
+    await mount(OtherComponent, { env, target });
+
+    triggerHotkey("control+k");
+    await nextTick();
+    assert.containsOnce(target, ".o_command");
+    assert.deepEqual(target.querySelector(".o_command").textContent, "I'm taking the throne");
+});
+
 QUnit.test("command with hotkey", async (assert) => {
     assert.expect(2);
 
@@ -255,6 +281,7 @@ QUnit.test("can be searched", async (assert) => {
     for (const name of names) {
         env.services.command.add(name, action);
     }
+    await nextTick();
 
     // Open palette
     triggerHotkey("control+k");
@@ -307,6 +334,7 @@ QUnit.test("navigate in the command palette with the arrows", async (assert) =>
     for (const name of names) {
         env.services.command.add(name, action);
     }
+    await nextTick();
 
     // Open palette
     triggerHotkey("control+k");
@@ -350,6 +378,7 @@ QUnit.test("command categories", async (assert) => {
     env.services.command.add("b", action, { category: "custom" });
     env.services.command.add("c", action);
     env.services.command.add("d", action, { category: "invalid-category" });
+    await nextTick();
 
     // Open palette
     triggerHotkey("control+k");
@@ -428,6 +457,7 @@ QUnit.test("display shortcuts correctly for non-MacOS ", async (assert) => {
     env.services.command.add("e", action, {
         hotkey: "alt+control+e",
     });
+    await nextTick();
 
     // Open palette
     triggerHotkey("control+k");
@@ -468,6 +498,7 @@ QUnit.test("display shortcuts correctly for MacOS ", async (assert) => {
     env.services.command.add("e", action, {
         hotkey: "alt+control+e",
     });
+    await nextTick();
 
     // Open palette
     triggerHotkey("control+k");